groups.d/241.native_packages_inet.d/gnutls.package: bump to v3.8.8

Signed-off-by: Ørjan Malde <red@foxi.me>

4 files changed, 35 insertions, 15 deletions

diff --git a/groups.d/241.native_packages_inet.d/gnutls.package b/groups.d/241.native_packages_inet.d/gnutls.package
index 24f39a77..cb6a90c8 100644
--- a/groups.d/241.native_packages_inet.d/gnutls.package
+++ b/groups.d/241.native_packages_inet.d/gnutls.package
@@ -1,11 +1,13 @@
 : ${PKG_GNUTLS_DEPENDS:="libunistring libtasn1 nettle zstd"};
-: ${PKG_GNUTLS_SHA256SUM:=66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc};
-: ${PKG_GNUTLS_VERSION:=3.8.5};
+: ${PKG_GNUTLS_SHA256SUM:=ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb};
+: ${PKG_GNUTLS_VERSION:=3.8.8};
 : ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
 : ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:="
 gl_cv_func_working_getdelim=yes
 gl_cv_ld_output_def=no"};
-: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="PYTHON=python3 --disable-static --disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --without-p11-kit --disable-hardware-acceleration --enable-guile=no --with-default-trust-store-dir=/etc/ssl/certs"};
+: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="PYTHON=python3 --disable-static --disable-ssl3-support --disable-ssl2-support --disable-cxx
+--enable-local-libopts --without-p11-kit --disable-hardware-acceleration --enable-guile=no --with-default-trust-store-dir=/etc/ssl/certs
+--with-libdl-prefix=${PREFIX_NATIVE} --with-brotli=no --with-liboqs=no"};
 : ${PKG_GNUTLS_LIBTOOL:=rlibtool};
 
 ex_pkg_register "gnutls" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
diff --git a/patches/gnutls-3.8.5.local.patch b/patches/gnutls-3.8.5.local.patch
deleted file mode 100644
index 968143cf..00000000
--- a/patches/gnutls-3.8.5.local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gnutls-3.6.14.orig/lib/system/sockets.c gnutls-3.6.14/lib/system/sockets.c
---- gnutls-3.6.14.orig/lib/system/sockets.c	2020-06-01 11:48:13.000000000 +0200
-+++ gnutls-3.6.14/lib/system/sockets.c	2020-06-28 22:12:02.485455741 +0200
-@@ -117,7 +117,7 @@
- system_writev(gnutls_transport_ptr_t ptr, const giovec_t * iovec,
- 	      int iovec_cnt)
- {
--	return _system_writev(ptr, iovec, iovec_cnt, 0);
-+	return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt);
- }
- 
- #endif
diff --git a/patches/gnutls-3.8.8.local.patch b/patches/gnutls-3.8.8.local.patch
new file mode 100644
index 00000000..85b6b8f7
--- /dev/null
+++ b/patches/gnutls-3.8.8.local.patch
@@ -0,0 +1,30 @@
+diff -ru gnutls-3.8.8.orig/lib/algorithms/groups.c gnutls-3.8.8/lib/algorithms/groups.c
+--- gnutls-3.8.8.orig/lib/algorithms/groups.c	2024-10-30 05:41:21.000000000 +0100
++++ gnutls-3.8.8/lib/algorithms/groups.c	2024-11-13 19:12:22.032377871 +0100
+@@ -90,7 +90,13 @@
+ 		.tls_id = 25,
+ 		.pk = GNUTLS_PK_ECDSA,
+ 	},
+-	group_x25519,
++	{
++	.name = "X25519",
++	.id = GNUTLS_GROUP_X25519,
++	.curve = GNUTLS_ECC_CURVE_X25519,
++	.tls_id = 29,
++	.pk = GNUTLS_PK_ECDH_X25519,
++	},
+ #ifdef ENABLE_GOST
+ 	/* draft-smyshlyaev-tls12-gost-suites-06, Section 6 */
+ 	{
+diff -ru gnutls-3.8.8.orig/lib/system/sockets.c gnutls-3.8.8/lib/system/sockets.c
+--- gnutls-3.8.8.orig/lib/system/sockets.c	2024-06-03 01:16:18.000000000 +0200
++++ gnutls-3.8.8/lib/system/sockets.c	2024-11-13 19:02:28.738122921 +0100
+@@ -161,7 +161,7 @@
+ ssize_t system_writev(gnutls_transport_ptr_t ptr, const giovec_t *iovec,
+ 		      int iovec_cnt)
+ {
+-	return _system_writev(ptr, iovec, iovec_cnt, 0);
++	return writev(GNUTLS_POINTER_TO_INT(ptr), (struct iovec *) iovec, iovec_cnt);
+ }
+ 
+ #endif
diff --git a/patches/gnutls-3.8.5_pre.local.patch b/patches/gnutls-3.8.8_pre.local.patch
index b214ccc0..b214ccc0 100644
--- a/patches/gnutls-3.8.5_pre.local.patch
+++ b/patches/gnutls-3.8.8_pre.local.patch