From 570f525c4bbb80df8f5ec7912780c628e0f761ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Wed, 13 Nov 2024 19:27:45 +0100 Subject: groups.d/241.native_packages_inet.d/gnutls.package: bump to v3.8.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- patches/gnutls-3.8.5.local.patch | 12 ------------ patches/gnutls-3.8.5_pre.local.patch | 20 -------------------- patches/gnutls-3.8.8.local.patch | 30 ++++++++++++++++++++++++++++++ patches/gnutls-3.8.8_pre.local.patch | 20 ++++++++++++++++++++ 4 files changed, 50 insertions(+), 32 deletions(-) delete mode 100644 patches/gnutls-3.8.5.local.patch delete mode 100644 patches/gnutls-3.8.5_pre.local.patch create mode 100644 patches/gnutls-3.8.8.local.patch create mode 100644 patches/gnutls-3.8.8_pre.local.patch (limited to 'patches') 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.5_pre.local.patch b/patches/gnutls-3.8.5_pre.local.patch deleted file mode 100644 index b214ccc0..00000000 --- a/patches/gnutls-3.8.5_pre.local.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ru gnutls-3.6.13.orig/configure gnutls-3.6.13/configure ---- gnutls-3.6.13.orig/configure 2020-03-30 20:56:14.000000000 +0200 -+++ gnutls-3.6.13/configure 2020-04-12 15:19:56.629453170 +0200 -@@ -58313,6 +58313,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no 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.8_pre.local.patch b/patches/gnutls-3.8.8_pre.local.patch new file mode 100644 index 00000000..b214ccc0 --- /dev/null +++ b/patches/gnutls-3.8.8_pre.local.patch @@ -0,0 +1,20 @@ +diff -ru gnutls-3.6.13.orig/configure gnutls-3.6.13/configure +--- gnutls-3.6.13.orig/configure 2020-03-30 20:56:14.000000000 +0200 ++++ gnutls-3.6.13/configure 2020-04-12 15:19:56.629453170 +0200 +@@ -58313,6 +58313,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no -- cgit v1.2.3