From 039e7b25f0018e6923d14b40c35252f99e1d3ea3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 12 Apr 2019 23:00:00 +0100 Subject: Revert "nettle: fix ptest failure" This reverts commit 83faaf7b2a5f4fc4ae504b300134409e90389770. This should never have merged as the change was rejected upstream and adding a library to the ptest package resulted in it providing that SONAME which led to being included in images like core-image-sato. This in turn led to a ton of ptest failures in the 2.7 r1 QA report. Signed-off-by: Richard Purdie --- ...kdf2.c-change-the-initialization-for-salt.patch | 39 ---------------------- .../nettle/nettle-3.4.1/dlopen-test.patch | 20 +++++++++++ meta/recipes-support/nettle/nettle_3.4.1.bb | 9 +++-- 3 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch create mode 100644 meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch diff --git a/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch b/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch deleted file mode 100644 index 713823e294..0000000000 --- a/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7510ee2877368464ecce7de515ce056e08c75245 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 12 Apr 2019 10:30:14 +0800 -Subject: [PATCH] nettle-pbkdf2.c: change the initialization for salt - -use malloc and strncpy altogether to replace -strdup for salt initialization to fix below -Segmentation fault: - # echo -n passwd| nettle-pbkdf2 -i 1 -l 16 salt - [65534.886509] nettle-pbkdf2[708]: segfault at 1f594260 ip 00007f3332256998 sp 00007fff60d44410 error 4 in libnettle.so.6.5[7f3332244000+1d00] - [65534.887525] Code: e8 6d db fe ff 44 01 6d 68 48 83 c4 08 5b 5d 41 5c 41 5d 41 5e 41 5f c3 66 2e 0f 1f 84 00 00 00 00 00 49 89 dc e9 68 ff f - Segmentation fault - -Upstream-Status: Submitted[http://lists.lysator.liu.se/pipermail/nettle-bugs/2019/007467.html] - -Signed-off-by: Mingli Yu ---- - tools/nettle-pbkdf2.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/nettle-pbkdf2.c b/tools/nettle-pbkdf2.c -index 1f0a301..000acd3 100644 ---- a/tools/nettle-pbkdf2.c -+++ b/tools/nettle-pbkdf2.c -@@ -141,7 +141,10 @@ main (int argc, char **argv) - return EXIT_FAILURE; - } - -- salt = strdup (argv[0]); -+ salt = malloc (strlen(argv[0]) + 1); -+ if (! salt) -+ die ("Failed to allocate memory for salt\n"); -+ strncpy(salt, argv[0], sizeof(salt) - 1); - salt_length = strlen(argv[0]); - - if (hex_salt) --- -2.7.4 - diff --git a/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch new file mode 100644 index 0000000000..c4f0b7ea1c --- /dev/null +++ b/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch @@ -0,0 +1,20 @@ +Replace relative path of libnettle.so with absolute path so the test +program can find it. +Relative paths are not suitable, as the folder strucure for ptest +is different from the one expected by the nettle testsuite. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Juro Bystricky + +--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700 ++++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700 +@@ -9,7 +9,7 @@ + main (int argc UNUSED, char **argv UNUSED) + { + #if HAVE_LIBDL +- void *handle = dlopen ("../libnettle.so", RTLD_NOW); ++ void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW); + int (*get_version)(void); + if (!handle) + { diff --git a/meta/recipes-support/nettle/nettle_3.4.1.bb b/meta/recipes-support/nettle/nettle_3.4.1.bb index 612e058862..dd49c30c84 100644 --- a/meta/recipes-support/nettle/nettle_3.4.1.bb +++ b/meta/recipes-support/nettle/nettle_3.4.1.bb @@ -14,9 +14,12 @@ 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-nettle-pbkdf2.c-change-the-initialization-for-salt.patch \ " +SRC_URI_append_class-target = "\ + file://dlopen-test.patch \ + " + SRC_URI[md5sum] = "9bdebb0e2f638d3b9d91f7fc264b70c1" SRC_URI[sha256sum] = "f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad" @@ -44,10 +47,6 @@ do_install_ptest() { # tools can be found in PATH, not in ../tools/ sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ - # libnettle.so is needed for dlopen-test - if [ -f ${D}${libdir}/libnettle.so.6.* ]; then - cp ${D}${libdir}/libnettle.so.6.* ${D}${PTEST_PATH}/libnettle.so - fi } BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg