From 1de5ad22422168ef0701f4afac45c60cc427a4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20B=C3=A4r?= Date: Sat, 30 Aug 2025 17:05:50 +0200 Subject: [PATCH] nettle: fix nettle port - added stdlib.h to nettle-internal - added missing end of line in testutils-patch - renamed nettle_random-prime.run to nettle-random-prime.run --- ports/nettle.hash | 2 +- ports/nettle.port | 3 ++- ...ettle_random-prime.run => nettle-random-prime.run} | 0 src/lib/nettle/nettle-internal.patch | 11 +++++++++++ src/lib/nettle/testutils.patch | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) rename run/{nettle_random-prime.run => nettle-random-prime.run} (100%) create mode 100644 src/lib/nettle/nettle-internal.patch diff --git a/ports/nettle.hash b/ports/nettle.hash index d885a2cdc..1b3e02961 100644 --- a/ports/nettle.hash +++ b/ports/nettle.hash @@ -1 +1 @@ -dcaf0a5debed2d68fa5253bd6d8780b0659234b9 +062dc5bae7a651cc6622127cc8a0152b3a261899 diff --git a/ports/nettle.port b/ports/nettle.port index 28f4034e6..acf8f6051 100644 --- a/ports/nettle.port +++ b/ports/nettle.port @@ -7,7 +7,8 @@ SHA(nettle) := f001f64eb444bf13dd91bceccbc20acbc60c4311d6e2b20878452eb9a9cec75a DIR(nettle) := src/lib/nettle PATCHES := src/lib/nettle/timing.patch \ - src/lib/nettle/testutils.patch + src/lib/nettle/testutils.patch \ + src/lib/nettle/nettle-internal.patch DIRS := include/nettle DIR_CONTENT(include/nettle) := src/lib/nettle/aes.h \ diff --git a/run/nettle_random-prime.run b/run/nettle-random-prime.run similarity index 100% rename from run/nettle_random-prime.run rename to run/nettle-random-prime.run diff --git a/src/lib/nettle/nettle-internal.patch b/src/lib/nettle/nettle-internal.patch new file mode 100644 index 000000000..bc2a4433c --- /dev/null +++ b/src/lib/nettle/nettle-internal.patch @@ -0,0 +1,11 @@ +--- src/lib/nettle/nettle-internal.h.orig 2025-08-30 16:44:03.404100116 +0200 ++++ src/lib/nettle/nettle-internal.h 2025-06-01 20:59:41.819681876 +0200 +@@ -36,7 +36,7 @@ + #define NETTLE_INTERNAL_H_INCLUDED + + #include +- ++#include + #include "nettle-meta.h" + + /* For definition of NETTLE_MAX_HASH_CONTEXT_SIZE. */ diff --git a/src/lib/nettle/testutils.patch b/src/lib/nettle/testutils.patch index db94ca973..869eb8139 100644 --- a/src/lib/nettle/testutils.patch +++ b/src/lib/nettle/testutils.patch @@ -16,4 +16,4 @@ -# include "gmp-glue.h" # if NETTLE_USE_MINI_GMP # include "knuth-lfib.h" - # endif \ No newline at end of file + # endif