From 4f944dc84ac085c781ab07a217997650033bcade Mon Sep 17 00:00:00 2001
From: Zoltan Fridrich <zfridric@redhat.com>
Date: Wed, 20 Mar 2024 11:42:07 +0100
Subject: [PATCH] 3.8.4 upstream release

Upstream tag: 3.8.4
Upstream commit: 4a4cefef

Related: RHEL-35857
---
 .gitignore                              |  2 ++
 README.packit                           |  2 +-
 gnutls-3.8.3-fix-mingw-build.patch      | 12 ---------
 gnutls-3.8.3-kernel_version_check.patch | 36 -------------------------
 gnutls.spec                             |  4 +--
 sources                                 |  4 +--
 6 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 gnutls-3.8.3-fix-mingw-build.patch
 delete mode 100644 gnutls-3.8.3-kernel_version_check.patch

diff --git a/.gitignore b/.gitignore
index 35f93b3..8ce4710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,3 +150,5 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.8.2.tar.xz.sig
 /gnutls-3.8.3.tar.xz
 /gnutls-3.8.3.tar.xz.sig
+/gnutls-3.8.4.tar.xz
+/gnutls-3.8.4.tar.xz.sig
diff --git a/README.packit b/README.packit
index 8c508a5..31341b6 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.88.0.
+The file was generated using packit 0.93.0.
diff --git a/gnutls-3.8.3-fix-mingw-build.patch b/gnutls-3.8.3-fix-mingw-build.patch
deleted file mode 100644
index 3e3a149..0000000
--- a/gnutls-3.8.3-fix-mingw-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -ruNp a/lib/system/sockets.c b/lib/system/sockets.c
---- a/lib/system/sockets.c	2024-01-16 03:36:04.000000000 +0100
-+++ b/lib/system/sockets.c	2024-02-22 16:20:48.900495575 +0100
-@@ -208,7 +208,7 @@ int gnutls_system_recv_timeout(gnutls_tr
- 	} while (ret == -1 && errno == EINTR);
- #else
- 	fd_set rfds;
--	struct timeval _tv, *tv = NULL;
-+	TIMEVAL _tv, *tv = NULL;
- 
- 	FD_ZERO(&rfds);
- 	FD_SET(fd, &rfds);
diff --git a/gnutls-3.8.3-kernel_version_check.patch b/gnutls-3.8.3-kernel_version_check.patch
deleted file mode 100644
index e4495ed..0000000
--- a/gnutls-3.8.3-kernel_version_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 945c2f10eeda441f32404d1328761e311915add0 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Tue, 23 Jan 2024 11:54:32 +0900
-Subject: [PATCH] ktls: fix kernel version checking using utsname
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- lib/system/ktls.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/system/ktls.c b/lib/system/ktls.c
-index 8efb913cda..432c70c5a2 100644
---- a/lib/system/ktls.c
-+++ b/lib/system/ktls.c
-@@ -482,7 +482,7 @@ int _gnutls_ktls_set_keys(gnutls_session_t session,
- 		return GNUTLS_E_INTERNAL_ERROR;
- 	}
- 
--	if (strcmp(utsname.sysname, "Linux") == 0) {
-+	if (strcmp(utsname.sysname, "Linux") != 0) {
- 		return GNUTLS_E_INTERNAL_ERROR;
- 	}
- 
-@@ -495,6 +495,9 @@ int _gnutls_ktls_set_keys(gnutls_session_t session,
- 		return GNUTLS_E_INTERNAL_ERROR;
- 	}
- 
-+	_gnutls_debug_log("Linux kernel version %lu.%lu has been detected\n",
-+			  major, minor);
-+
- 	/* setsockopt(SOL_TLS, TLS_RX) support added in 5.10 */
- 	if (major < 5 || (major == 5 && minor < 10)) {
- 		return GNUTLS_E_UNIMPLEMENTED_FEATURE;
--- 
-GitLab
-
diff --git a/gnutls.spec b/gnutls.spec
index 27140bf..52bc74c 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -12,14 +12,12 @@ sha256sum:close()
 print(string.sub(hash, 0, 16))
 }
 
-Version: 3.8.3
+Version: 3.8.4
 Release: %{?autorelease}%{!?autorelease:1%{?dist}}
 Patch: gnutls-3.2.7-rpath.patch
 
 # follow https://gitlab.com/gnutls/gnutls/-/issues/1443
 Patch: gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch
-Patch: gnutls-3.8.3-kernel_version_check.patch
-Patch: gnutls-3.8.3-fix-mingw-build.patch
 
 %bcond_without bootstrap
 %bcond_without dane
diff --git a/sources b/sources
index b87713f..d3294e0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gnutls-3.8.3.tar.xz) = 74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84
-SHA512 (gnutls-3.8.3.tar.xz.sig) = 5b2ca0648ca5feeda1de933de2bbaf71fadb70e830a8f0d494d2f0380b6d0d7b79445257cc79e59bba1a7ff639ab4573da3e3e124eb80c20ac6141e29a4827ff
+SHA512 (gnutls-3.8.4.tar.xz) = af748610392b7eec8a6294d28d088f323450207cdcda1aa2138a0fd71023994c662f7aff72b2b3cd888e7b770750611981c2cde5f2ddc45f852fc0034cdebaff
+SHA512 (gnutls-3.8.4.tar.xz.sig) = 3e8ec406a0c736d8b208dd7396294a4bc6e6f0ffaf41d4ae16bc671da575fe6029de548a25fb0e824b2d6fb75b3e47e845b88d9dfa2f88397a48b8e270766d37
 SHA512 (gnutls-release-keyring.gpg) = 8c2b39239d1d8c5319757fcf669f28a11de7f8ec4a726f9904c57ba8105bea80240083c0de71b747115907bab46569f10cf58004137cc7884ac5c20f8319ae0a