diff options
-rw-r--r-- | groups/251.native_packages_lib.group | 4 | ||||
-rw-r--r-- | patches/nettle-3.8.1.local.patch (renamed from patches/nettle-3.7.3.local.patch) | 33 |
2 files changed, 20 insertions, 17 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 2bc71f0a..913db683 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -369,8 +369,8 @@ gl_cv_ld_output_def=no"}; : ${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:=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0}; -: ${PKG_NETTLE_VERSION:=3.7.3}; +: ${PKG_NETTLE_SHA256SUM:=364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe}; +: ${PKG_NETTLE_VERSION:=3.8.1}; : ${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}; diff --git a/patches/nettle-3.7.3.local.patch b/patches/nettle-3.8.1.local.patch index 87596831..8bf6312d 100644 --- a/patches/nettle-3.7.3.local.patch +++ b/patches/nettle-3.8.1.local.patch @@ -1,3 +1,21 @@ +diff -ru nettle-3.8.1.orig/x86_64/ghash-update.asm nettle-3.8.1/x86_64/ghash-update.asm +--- nettle-3.8.1.orig/x86_64/ghash-update.asm 2022-07-27 21:23:20.000000000 +0200 ++++ nettle-3.8.1/x86_64/ghash-update.asm 2023-02-17 11:58:31.875634006 +0100 +@@ -164,6 +164,14 @@ + ret + EPILOGUE(_nettle_ghash_update) + ++#ifdef __midipix__ ++ .section .got$_nettle_ghash_update,"r" ++ .global __imp__nettle_ghash_update ++__imp__nettle_ghash_update: ++ .quad _nettle_ghash_update ++ .linkonce discard ++#endif ++ + define(`W', `0x$2$1') + RODATA + ALIGN(2) 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 @@ -178,21 +196,6 @@ diff -ru nettle-3.6.orig/x86_64/ecc-secp521r1-modp.asm nettle-3.6/x86_64/ecc-sec + .quad _nettle_ecc_secp521r1_modp + .linkonce discard +#endif -diff -ru nettle-3.6.orig/x86_64/gcm-hash8.asm nettle-3.6/x86_64/gcm-hash8.asm ---- nettle-3.6.orig/x86_64/gcm-hash8.asm 2020-04-29 20:11:44.000000000 +0200 -+++ nettle-3.6/x86_64/gcm-hash8.asm 2020-09-07 13:42:31.107641232 +0200 -@@ -238,3 +238,11 @@ - .value W(a7,d0),W(a6,12),W(a4,54),W(a5,96),W(a0,d8),W(a1,1a),W(a3,5c),W(a2,9e) - .value W(b5,e0),W(b4,22),W(b6,64),W(b7,a6),W(b2,e8),W(b3,2a),W(b1,6c),W(b0,ae) - .value W(bb,f0),W(ba,32),W(b8,74),W(b9,b6),W(bc,f8),W(bd,3a),W(bf,7c),W(be,be) -+ -+#ifdef __midipix__ -+ .section .got$_nettle_gcm_hash8,"r" -+ .global __imp__nettle_gcm_hash8 -+__imp__nettle_gcm_hash8: -+ .quad _nettle_gcm_hash8 -+ .linkonce discard -+#endif diff -ru nettle-3.6.orig/x86_64/md5-compress.asm nettle-3.6/x86_64/md5-compress.asm --- nettle-3.6.orig/x86_64/md5-compress.asm 2020-04-29 20:11:44.000000000 +0200 +++ nettle-3.6/x86_64/md5-compress.asm 2020-09-07 13:44:12.135638069 +0200 |