diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 8 | ||||
| -rw-r--r-- | patches/gnutls-3.6.13_pre.local.patch | 20 | ||||
| -rw-r--r-- | patches/gnutls-3.6.6.local.patch | 14 |
3 files changed, 24 insertions, 18 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index b073f84b..c6c8e40c 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -59,11 +59,11 @@ pacman rsync socat thttpd w3m weechat wget whois")"; : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2}; : ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"}; : ${PKG_GNUTLS_DEPENDS:="libnettle libunistring"}; -: ${PKG_GNUTLS_SHA256SUM:=bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7}; -: ${PKG_GNUTLS_VERSION:=3.6.6}; +: ${PKG_GNUTLS_SHA256SUM:=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38}; +: ${PKG_GNUTLS_VERSION:=3.6.13}; : ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz}; -: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration --with-guile=no --enable-guile=no"}; -: ${PKG_GNUTLS_LIBTOOL:=slibtool-shared}; +: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-static --disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration --enable-guile=no"}; +: ${PKG_GNUTLS_LIBTOOL:=rdlibtool}; : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2}; : ${PKG_HTTPD_VERSION:=2.4.25}; : ${PKG_HTTPD_URL:=https://xyinn.org/gentoo/distfiles/httpd-${PKG_HTTPD_VERSION}.tar.bz2}; diff --git a/patches/gnutls-3.6.13_pre.local.patch b/patches/gnutls-3.6.13_pre.local.patch new file mode 100644 index 00000000..b214ccc0 --- /dev/null +++ b/patches/gnutls-3.6.13_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 diff --git a/patches/gnutls-3.6.6.local.patch b/patches/gnutls-3.6.6.local.patch deleted file mode 100644 index 599a52d5..00000000 --- a/patches/gnutls-3.6.6.local.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru gnutls-3.6.6.orig/lib/random.c gnutls-3.6.6/lib/random.c ---- gnutls-3.6.6.orig/lib/random.c 2018-04-01 13:56:13.000000000 +0200 -+++ gnutls-3.6.6/lib/random.c 2019-01-31 20:38:57.815274977 +0100 -@@ -36,8 +36,8 @@ - #endif - - /* Per thread context of random generator, and a flag to indicate initialization */ --static _Thread_local void *gnutls_rnd_ctx; --static _Thread_local unsigned rnd_initialized = 0; -+static __thread void *gnutls_rnd_ctx; -+static __thread unsigned rnd_initialized = 0; - - struct rnd_ctx_list_st { - void *ctx; |