groups/251.native_packages_lib.group: nettle: bump to v3.7.2

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>

4 files changed, 27 insertions, 24 deletions

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 22808ea4..c3a99bf7 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -5,10 +5,10 @@ GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
 glib jansson lame libarchive libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
 libevent libfastjson libfetch libffi libfirm libflac libgcrypt libgpg_error libidn2 libite
-libjpeg_turbo libksba libmad libmspack libmp3splt libnettle libogg libpcap libpipeline libpng libpsl
+libjpeg_turbo libksba libmad libmspack libmp3splt libogg libpcap libpipeline libpng libpsl
 libreadline libredwg libressl libsasl2 libshine libsndfile libsolv libssh libstrophe libtasn1
 libtelnet libtheora libtirpc libudns libunistring libuv libvorbis libxml2
-libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
+libxslt libz libzip lzo nettle sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf wolfssl")";
 : ${PKG_GLIB_DEPENDS:="libffi libz pcre"};
 : ${PKG_GLIB_SHA256SUM:=d64abd16813501c956c4e123ae79f47f1b58de573df9fdd3b0795f1e2c1aa789};
 : ${PKG_GLIB_VERSION:=2.56.2};
@@ -125,12 +125,6 @@ libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_t
 : ${PKG_LIBMP3SPLT_URL:=https://sources.voidlinux.org/libmp3splt-${PKG_LIBMP3SPLT_VERSION}/libmp3splt-${PKG_LIBMP3SPLT_VERSION}.tar.gz};
 : ${PKG_LIBMP3SPLT_CONFIGURE_ARGS_EXTRA:="--disable-cutter --disable-id3tag --disable-optimise --with-ogg=${PREFIX_NATIVE} --with-vorbis=${PREFIX_NATIVE} --with-mad=${PREFIX_NATIVE}"};
 : ${PKG_LIBMP3SPLT_FORCE_AUTORECONF:=1};
-: ${PKG_LIBNETTLE_SHA256SUM:=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1};
-: ${PKG_LIBNETTLE_VERSION:=3.6};
-: ${PKG_LIBNETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_LIBNETTLE_VERSION}.tar.gz};
-: ${PKG_LIBNETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
-: ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:="nettle_cv_asm_underscore=no --disable-static"};
-: ${PKG_LIBNETTLE_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_LIBOGG_SHA256SUM:=c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe};
 : ${PKG_LIBOGG_VERSION:=1.3.4};
 : ${PKG_LIBOGG_URL:=https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-${PKG_LIBOGG_VERSION}.tar.xz};
@@ -252,6 +246,12 @@ libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_t
 : ${PKG_LZO_SHA256SUM:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072};
 : ${PKG_LZO_VERSION:=2.10};
 : ${PKG_LZO_URL:=https://www.oberhumer.com/opensource/lzo/download/lzo-${PKG_LZO_VERSION}.tar.gz};
+: ${PKG_NETTLE_SHA256SUM:=8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162};
+: ${PKG_NETTLE_VERSION:=3.7.2};
+: ${PKG_NETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_NETTLE_VERSION}.tar.gz};
+: ${PKG_NETTLE_CONFIGURE_ARGS_EXTRA:=--disable-fat};
+: ${PKG_NETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
+: ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_SDL1_DEPENDS:="w32api w32lib"};
 : ${PKG_SDL1_SHA256SUM:=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00};
 : ${PKG_SDL1_VERSION:=1.2.15};
diff --git a/patches/libnettle-3.6.local.patch b/patches/nettle-3.7.2.local.patch
index b527661f..87596831 100644
--- a/patches/libnettle-3.6.local.patch
+++ b/patches/nettle-3.7.2.local.patch
@@ -1,3 +1,18 @@
+diff -ru nettle-3.7.2.orig/x86_64/salsa20-2core.asm nettle-3.7.2/x86_64/salsa20-2core.asm
+--- nettle-3.7.2.orig/x86_64/salsa20-2core.asm  2021-03-21 09:32:25.000000000 +0100
++++ nettle-3.7.2/x86_64/salsa20-2core.asm       2021-04-10 14:56:55.970009499 +0200
+@@ -316,3 +316,11 @@
+        W64_EXIT(3, 13)
+        ret
+ EPILOGUE(_nettle_salsa20_2core)
++
++#ifdef __midipix__
++        .section .got$_nettle_salsa20_2core,"r"
++        .global __imp__nettle_salsa20_2core
++__imp__nettle_salsa20_2core:
++        .quad   _nettle_salsa20_2core
++        .linkonce discard
++#endif
 diff -ru nettle-3.6.orig/x86_64/aes-decrypt-internal.asm nettle-3.6/x86_64/aes-decrypt-internal.asm
 --- nettle-3.6.orig/x86_64/aes-decrypt-internal.asm	2020-04-29 20:11:44.000000000 +0200
 +++ nettle-3.6/x86_64/aes-decrypt-internal.asm	2020-09-07 13:38:12.793134936 +0200
@@ -264,21 +279,6 @@ diff -ru nettle-3.6.orig/x86_64/salsa20-core-internal.asm nettle-3.6/x86_64/sals
 +	.quad   _nettle_salsa20_core
 +	.linkonce discard
 +#endif
-diff -ru nettle-3.6.orig/x86_64/salsa20-crypt.asm nettle-3.6/x86_64/salsa20-crypt.asm
---- nettle-3.6.orig/x86_64/salsa20-crypt.asm	2020-04-29 20:11:44.000000000 +0200
-+++ nettle-3.6/x86_64/salsa20-crypt.asm	2020-09-07 13:54:39.815792126 +0200
-@@ -245,3 +245,11 @@
- 	ret
- 
- EPILOGUE(nettle_salsa20_crypt)
-+
-+#ifdef __midipix__
-+	.section .got$nettle_salsa20_crypt,"r"
-+	.global __imp_nettle_salsa20_crypt
-+__imp_nettle_salsa20_crypt:
-+	.quad   nettle_salsa20_crypt
-+	.linkonce discard
-+#endif
 diff -ru nettle-3.6.orig/x86_64/serpent-decrypt.asm nettle-3.6/x86_64/serpent-decrypt.asm
 --- nettle-3.6.orig/x86_64/serpent-decrypt.asm	2020-04-29 20:11:44.000000000 +0200
 +++ nettle-3.6/x86_64/serpent-decrypt.asm	2020-09-07 13:55:28.667790597 +0200
diff --git a/patches/libnettle/nettle-conf-fix.patch b/patches/nettle/midipix-configure-support.patch
index 1e031668..1e031668 100644
--- a/patches/libnettle/nettle-conf-fix.patch
+++ b/patches/nettle/midipix-configure-support.patch
diff --git a/vars/libnettle.vars b/vars/nettle.vars
index 86e82816..faf43d64 100644
--- a/vars/libnettle.vars
+++ b/vars/nettle.vars
@@ -2,7 +2,10 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
-pkg_libnettle_install_make_post() {
+: ${PKG_NETTLE_CONFIG_CACHE_EXTRA:="
+nettle_cv_asm_underscore=no"};
+
+pkg_nettle_install_make_post() {
 	set +o noglob;
 	if ! rtl_fileop chmod +x "${PKG_DESTDIR}/lib/"lib*.so*; then
 		set -o noglob; return 1;