From ab08f2b57f8553b472818b5b5bb2093f4ab178aa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Jan 2025 10:34:18 +0000 Subject: nettle: upgrade 3.10 -> 3.10.1 (From OE-Core rev: 601327a0c8a66226877f03b21bad0c7e67ee14de) Signed-off-by: Richard Purdie --- ...d-target-to-only-build-tests-not-run-them.patch | 9 ++-- ...k-header-files-of-openssl-only-if-enable_.patch | 7 +-- meta/recipes-support/nettle/nettle_3.10.1.bb | 62 ++++++++++++++++++++++ meta/recipes-support/nettle/nettle_3.10.bb | 62 ---------------------- 4 files changed, 67 insertions(+), 73 deletions(-) create mode 100644 meta/recipes-support/nettle/nettle_3.10.1.bb delete mode 100644 meta/recipes-support/nettle/nettle_3.10.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch index 345fc43ebe..ee3e74c43b 100644 --- a/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch +++ b/meta/recipes-support/nettle/nettle/Add-target-to-only-build-tests-not-run-them.patch @@ -1,4 +1,4 @@ -From e9fcb2177fda228ac065d189240e2d992e86e5bf Mon Sep 17 00:00:00 2001 +From 3ea3eaf5bda21529fc8a8da3d8b07ebc3875ba7e Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Fri, 2 Aug 2024 09:48:43 -0400 Subject: [PATCH] Makefile.in: Add target to only build tests (not run them) @@ -21,7 +21,7 @@ Signed-off-by: Trevor Gamblin 2 files changed, 5 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 2bf7f1e8..403a868a 100644 +index 71ad761..0f239f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,6 +53,9 @@ clean distclean mostlyclean maintainer-clean tags: @@ -35,7 +35,7 @@ index 2bf7f1e8..403a868a 100644 true diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in -index 0699fa0d..8ac9983c 100644 +index 0699fa0..8ac9983 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -137,6 +137,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../non-nettle.$(OBJEXT) \ @@ -47,6 +47,3 @@ index 0699fa0d..8ac9983c 100644 check: $(TS_ALL) $(TS_ALL:sc-%=%) TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \ srcdir="$(srcdir)" \ --- -2.39.2 - diff --git a/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch index 49d633b5f7..89b5c7bec4 100644 --- a/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch +++ b/meta/recipes-support/nettle/nettle/check-header-files-of-openssl-only-if-enable_.patch @@ -1,4 +1,4 @@ -From 5f7cdd2b878298577accade43a38e1a0951d17b4 Mon Sep 17 00:00:00 2001 +From ec2ca7e505e6bfe1fff2a7d6e6bb39b60b93e19a Mon Sep 17 00:00:00 2001 From: Haiqing Bai Date: Fri, 9 Dec 2016 15:23:17 +0800 Subject: [PATCH] nettle: check header files of openssl only if @@ -23,7 +23,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 4f27e663..673c1492 100644 +index 7c003bb..779f7ff 100644 --- a/configure.ac +++ b/configure.ac @@ -197,9 +197,11 @@ AC_TYPE_SIZE_T @@ -41,6 +41,3 @@ index 4f27e663..673c1492 100644 # For use by the testsuite AC_CHECK_HEADERS([valgrind/memcheck.h]) --- -2.39.2 - diff --git a/meta/recipes-support/nettle/nettle_3.10.1.bb b/meta/recipes-support/nettle/nettle_3.10.1.bb new file mode 100644 index 0000000000..85c470b10d --- /dev/null +++ b/meta/recipes-support/nettle/nettle_3.10.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "A low level cryptographic library" +DESCRIPTION = "Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space." +HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" +DESCRIPTION = "It tries to solve a problem of providing a common set of \ +cryptographic algorithms for higher-level applications by implementing a \ +context-independent set of cryptographic algorithms" +SECTION = "libs" +LICENSE = "LGPL-3.0-or-later | GPL-2.0-or-later" + +LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \ + file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e" + +DEPENDS += "gmp" + +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 \ + " + +SRC_URI[sha256sum] = "b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132" + +UPSTREAM_CHECK_REGEX = "nettle-(?P\d+(\.\d+)+)\.tar" + +inherit autotools ptest multilib_header lib_package + +EXTRA_AUTORECONF += "--exclude=aclocal" + +EXTRA_OECONF = "--disable-openssl" + +EXTRA_OECONF:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" +EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" + +do_compile_ptest() { + oe_runmake buildtest +} + +do_install:append() { + oe_multilib_header nettle/version.h +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/testsuite/ + install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ + install ${S}/testsuite/sc-valgrind.sh ${D}${PTEST_PATH}/testsuite/ + + # Install a symlink for dlopen-test + ln -sr ${D}${libdir}/libnettle.so.*.* ${D}${PTEST_PATH}/libnettle.so + # These examples are needed for pkcs1-conv-test + install ${B}/examples/rsa-sign ${B}/examples/rsa-verify ${D}${PTEST_PATH}/testsuite/ + # Fix build-time relative paths + sed -i -e 's|../tools/|${bindir}/|g' ${D}${PTEST_PATH}/testsuite/*-test + sed -i -e 's|../examples/|./|g' ${D}${PTEST_PATH}/testsuite/*-test +} + +RDEPENDS:${PN}-ptest += "${PN}-bin" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/nettle/nettle_3.10.bb b/meta/recipes-support/nettle/nettle_3.10.bb deleted file mode 100644 index 92bc78263c..0000000000 --- a/meta/recipes-support/nettle/nettle_3.10.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "A low level cryptographic library" -DESCRIPTION = "Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space." -HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" -DESCRIPTION = "It tries to solve a problem of providing a common set of \ -cryptographic algorithms for higher-level applications by implementing a \ -context-independent set of cryptographic algorithms" -SECTION = "libs" -LICENSE = "LGPL-3.0-or-later | GPL-2.0-or-later" - -LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \ - file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e" - -DEPENDS += "gmp" - -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 \ - " - -SRC_URI[sha256sum] = "b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c" - -UPSTREAM_CHECK_REGEX = "nettle-(?P\d+(\.\d+)+)\.tar" - -inherit autotools ptest multilib_header lib_package - -EXTRA_AUTORECONF += "--exclude=aclocal" - -EXTRA_OECONF = "--disable-openssl" - -EXTRA_OECONF:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" -EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," --disable-arm-neon --disable-fat",d)}" - -do_compile_ptest() { - oe_runmake buildtest -} - -do_install:append() { - oe_multilib_header nettle/version.h -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/testsuite/ - install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/ - install ${S}/testsuite/sc-valgrind.sh ${D}${PTEST_PATH}/testsuite/ - - # Install a symlink for dlopen-test - ln -sr ${D}${libdir}/libnettle.so.*.* ${D}${PTEST_PATH}/libnettle.so - # These examples are needed for pkcs1-conv-test - install ${B}/examples/rsa-sign ${B}/examples/rsa-verify ${D}${PTEST_PATH}/testsuite/ - # Fix build-time relative paths - sed -i -e 's|../tools/|${bindir}/|g' ${D}${PTEST_PATH}/testsuite/*-test - sed -i -e 's|../examples/|./|g' ${D}${PTEST_PATH}/testsuite/*-test -} - -RDEPENDS:${PN}-ptest += "${PN}-bin" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf