From a2cfaa4b5cf1426004e977dcd15693b25b4bf39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sat, 30 Mar 2024 17:11:27 +0100 Subject: groups.d/241.native_packages_inet.group: gnutls: bump to v3.8.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/241.native_packages_inet.group | 8 ++++---- patches/gnutls-3.8.3.local.patch | 12 ------------ patches/gnutls-3.8.3_pre.local.patch | 20 -------------------- patches/gnutls-3.8.4.local.patch | 12 ++++++++++++ patches/gnutls-3.8.4_pre.local.patch | 20 ++++++++++++++++++++ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 patches/gnutls-3.8.3.local.patch delete mode 100644 patches/gnutls-3.8.3_pre.local.patch create mode 100644 patches/gnutls-3.8.4.local.patch create mode 100644 patches/gnutls-3.8.4_pre.local.patch diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index 35ce6d28..9e1aa4f9 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -88,14 +88,14 @@ ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"}; : ${PKG_GPGME_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_GPGME_CONFIG_CACHE_EXTRA:=" ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"}; -: ${PKG_GNUTLS_DEPENDS:="libunistring libtasn1 nettle"}; -: ${PKG_GNUTLS_SHA256SUM:=f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e}; -: ${PKG_GNUTLS_VERSION:=3.8.3}; +: ${PKG_GNUTLS_DEPENDS:="libunistring libtasn1 nettle zstd"}; +: ${PKG_GNUTLS_SHA256SUM:=2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b}; +: ${PKG_GNUTLS_VERSION:=3.8.4}; : ${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 --without-zstd"}; +: ${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_LIBTOOL:=rlibtool}; : ${PKG_HTTPD_SHA256SUM:=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9}; : ${PKG_HTTPD_VERSION:=2.4.52}; diff --git a/patches/gnutls-3.8.3.local.patch b/patches/gnutls-3.8.3.local.patch deleted file mode 100644 index 968143cf..00000000 --- a/patches/gnutls-3.8.3.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.3_pre.local.patch b/patches/gnutls-3.8.3_pre.local.patch deleted file mode 100644 index b214ccc0..00000000 --- a/patches/gnutls-3.8.3_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.4.local.patch b/patches/gnutls-3.8.4.local.patch new file mode 100644 index 00000000..968143cf --- /dev/null +++ b/patches/gnutls-3.8.4.local.patch @@ -0,0 +1,12 @@ +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.4_pre.local.patch b/patches/gnutls-3.8.4_pre.local.patch new file mode 100644 index 00000000..b214ccc0 --- /dev/null +++ b/patches/gnutls-3.8.4_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