From b2a6480826f3bd9799100341b761808f51077fcd Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Tue, 18 Jun 2024 22:25:45 +0800 Subject: [PATCH] security/nettle: Update to 3.9.1 Changes: https://git.lysator.liu.se/nettle/nettle/-/blob/nettle_3.10_release_20240616/NEWS --- security/nettle/Makefile | 2 +- security/nettle/distinfo | 6 +++--- security/nettle/files/patch-fat-arm64.c | 20 +++++++++---------- ...atch-powerpc64-p8-aes-decrypt-internal.asm | 10 +++++----- security/nettle/pkg-plist | 5 +++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/security/nettle/Makefile b/security/nettle/Makefile index c8ba2ed6e855..d31d21c9d051 100644 --- a/security/nettle/Makefile +++ b/security/nettle/Makefile @@ -1,5 +1,5 @@ PORTNAME= nettle -PORTVERSION= 3.9.1 +PORTVERSION= 3.10 CATEGORIES= security MASTER_SITES= GNU \ https://www.lysator.liu.se/~nisse/archive/ diff --git a/security/nettle/distinfo b/security/nettle/distinfo index 9896b862e6a8..5a2c64715488 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685792186 -SHA256 (nettle-3.9.1.tar.gz) = ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 -SIZE (nettle-3.9.1.tar.gz) = 2396741 +TIMESTAMP = 1718690460 +SHA256 (nettle-3.10.tar.gz) = b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c +SIZE (nettle-3.10.tar.gz) = 2640485 diff --git a/security/nettle/files/patch-fat-arm64.c b/security/nettle/files/patch-fat-arm64.c index 21b0a1e31bf9..3bb786e1d5fe 100644 --- a/security/nettle/files/patch-fat-arm64.c +++ b/security/nettle/files/patch-fat-arm64.c @@ -1,23 +1,23 @@ ---- fat-arm64.c.orig 2022-07-27 19:23:20 UTC +--- fat-arm64.c.orig 2024-06-16 15:27:54 UTC +++ fat-arm64.c -@@ -50,6 +50,9 @@ - # include - # include - # include +@@ -51,6 +51,9 @@ + #if USE_GETAUXVAL + # include + # include +#elif defined(__FreeBSD__) +# define USE_GETAUXVAL 1 +# include - #endif - - #include "nettle-types.h" -@@ -117,7 +120,14 @@ get_arm64_features (struct arm64_features *features) + #elif defined(__OpenBSD__) + # include + # include +@@ -134,7 +137,14 @@ get_arm64_features (struct arm64_features *features) else { #if USE_GETAUXVAL +#if defined (__FreeBSD__) + unsigned long hwcap; + if(elf_aux_info(AT_HWCAP, &hwcap, sizeof(unsigned long)) != 0) { -+ hwcap = 0; ++ hwcap = 0; + } +#else unsigned long hwcap = getauxval(AT_HWCAP); diff --git a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm index 6ec80f833cc9..67ceabec79c5 100644 --- a/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm +++ b/security/nettle/files/patch-powerpc64-p8-aes-decrypt-internal.asm @@ -1,15 +1,15 @@ ---- powerpc64/p8/aes-decrypt-internal.asm.orig 2022-06-02 17:57:16 UTC +--- powerpc64/p8/aes-decrypt-internal.asm.orig 2024-06-16 15:27:54 UTC +++ powerpc64/p8/aes-decrypt-internal.asm -@@ -71,7 +71,7 @@ define(`FUNC_ALIGN', `5') - PROLOGUE(_nettle_aes_decrypt) - vxor ZERO,ZERO,ZERO +@@ -64,7 +64,7 @@ PROLOGUE(_nettle_aes_decrypt) + define(`FUNC_ALIGN', `5') + PROLOGUE(_nettle_aes_decrypt) - DATA_LOAD_VEC(SWAP_MASK,.swap_mask,r5) + DATA_LOAD_VEC(SWAP_MASK,.swap_data,r5) subi ROUNDS,ROUNDS,1 srdi LENGTH,LENGTH,4 -@@ -351,6 +351,6 @@ EPILOGUE(_nettle_aes_decrypt) +@@ -269,6 +269,6 @@ EPILOGUE(_nettle_aes_decrypt) .data .align 4 diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist index a55f056f8e35..5ff413a53f18 100644 --- a/security/nettle/pkg-plist +++ b/security/nettle/pkg-plist @@ -25,6 +25,7 @@ include/nettle/ctr.h include/nettle/curve25519.h include/nettle/curve448.h include/nettle/des.h +include/nettle/drbg-ctr.h include/nettle/dsa-compat.h include/nettle/dsa.h include/nettle/eax.h @@ -78,11 +79,11 @@ include/nettle/yarrow.h lib/libhogweed.a lib/libhogweed.so lib/libhogweed.so.6 -lib/libhogweed.so.6.8 +lib/libhogweed.so.6.9 lib/libnettle.a lib/libnettle.so lib/libnettle.so.8 -lib/libnettle.so.8.8 +lib/libnettle.so.8.9 libdata/pkgconfig/hogweed.pc libdata/pkgconfig/nettle.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS