From e02f67fadd6310e1ce9d2313b3b3f9cad59f3696 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Fri, 1 Aug 2025 16:27:44 +0200 Subject: [PATCH] nettle: upgrade 3.10.1 -> 3.10.2 dropped 0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch, as it is fixed in this release. Changelog: https://git.lysator.liu.se/nettle/nettle/-/blob/master/ChangeLog ptests passed: All 116 tests passed DURATION: 2 END: /usr/lib/nettle/ptest 2025-08-01T14:21 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...pt-getenv-signatures-in-declarations.patch | 44 ------------------- .../{nettle_3.10.1.bb => nettle_3.10.2.bb} | 3 +- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch rename meta/recipes-support/nettle/{nettle_3.10.1.bb => nettle_3.10.2.bb} (94%) diff --git a/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch b/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch deleted file mode 100644 index c6f75e9150..0000000000 --- a/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 20eb61eded3bf2ef03e1f37c8c1535b9c246d0f7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 22 Mar 2025 13:48:29 -0700 -Subject: [PATCH] getopt: Fix getopt/getenv signatures in declarations - -GCC-15 complains about this when trying to build on musl - -| ../nettle-3.10.1/getopt.c:139:14: error: conflicting types for 'getenv'; have 'char *(void)' -| 139 | extern char *getenv (); -| | ^~~~~~ - -Upstream-Status: Submitted [https://lists.lysator.liu.se/mailman/hyperkitty/list/nettle-bugs@lists.lysator.liu.se/thread/R6BDHRO44KSRDAOZQAREYICI2RG5PVNC/] -Signed-off-by: Khem Raj ---- - getopt.c | 2 +- - getopt.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/getopt.c b/getopt.c -index 9d29de7..5b89302 100644 ---- a/getopt.c -+++ b/getopt.c -@@ -136,7 +136,7 @@ static struct _getopt_data getopt_data; - whose names are inconsistent. */ - - #ifndef getenv --extern char *getenv (); -+extern char *getenv (const char *); - #endif - - #endif /* not __GNU_LIBRARY__ */ -diff --git a/getopt.h b/getopt.h -index da1a01f..ab50792 100644 ---- a/getopt.h -+++ b/getopt.h -@@ -166,7 +166,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv, - # endif - # endif - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+extern int getopt(int, char * const [], const char *); - #endif /* __GNU_LIBRARY__ */ - - #ifndef __need_getopt diff --git a/meta/recipes-support/nettle/nettle_3.10.1.bb b/meta/recipes-support/nettle/nettle_3.10.2.bb similarity index 94% rename from meta/recipes-support/nettle/nettle_3.10.1.bb rename to meta/recipes-support/nettle/nettle_3.10.2.bb index 267a6ed449..e651f68cb9 100644 --- a/meta/recipes-support/nettle/nettle_3.10.1.bb +++ b/meta/recipes-support/nettle/nettle_3.10.2.bb @@ -18,10 +18,9 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://Add-target-to-only-build-tests-not-run-them.patch \ file://run-ptest \ file://check-header-files-of-openssl-only-if-enable_.patch \ - file://0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch \ " -SRC_URI[sha256sum] = "b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132" +SRC_URI[sha256sum] = "fe9ff51cb1f2abb5e65a6b8c10a92da0ab5ab6eaf26e7fc2b675c45f1fb519b5" UPSTREAM_CHECK_REGEX = "nettle-(?P\d+(\.\d+)+)\.tar" -- 2.47.2