summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nettle
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2017-11-21 12:01:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:32 +0000
commit4ab75023ff4be058995630fecdc1fd4a11118607 (patch)
treeb0b7ebd5ee22b46dfe47a444aebcb73cd586b89f /meta/recipes-support/nettle
parent452fa2df2f2d12e8675925cb04dc4ad9311667a1 (diff)
downloadpoky-4ab75023ff4be058995630fecdc1fd4a11118607.tar.gz
nettle: update to 3.4 and cleanup
merge .inc forward ported two patches to work with 3.4 for more info see: http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00007.html Change SRC_URI to use GNU download instead of liu.se, which interacts badly with wget 1.19.2 and downloads uncompressed tarballs (RB). (From OE-Core rev: 0b5d971a4e8e6904d2f4641fd5f3647d23ff4fa0) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> XX nettle: update SRC_URI Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle')
-rw-r--r--meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch46
-rw-r--r--meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch38
-rw-r--r--meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch (renamed from meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch)26
-rw-r--r--meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch (renamed from meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch)0
-rw-r--r--meta/recipes-support/nettle/nettle-3.4/run-ptest (renamed from meta/recipes-support/nettle/files/run-ptest)0
-rw-r--r--meta/recipes-support/nettle/nettle_3.3.bb19
-rw-r--r--meta/recipes-support/nettle/nettle_3.4.bb (renamed from meta/recipes-support/nettle/nettle.inc)16
7 files changed, 65 insertions, 80 deletions
diff --git a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
deleted file mode 100644
index 23da777921..0000000000
--- a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 12 Aug 2015 23:27:27 +0300
4Subject: [PATCH] Add target to only build tests (not run them)
5
6Not sending upstream as this is only a start of a solution to
7installable tests: It's useful for us already as is.
8
9Upstream-Status: Inappropriate [not a complete solution]
10
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12---
13 Makefile.in | 3 +++
14 testsuite/Makefile.in | 2 ++
15 2 files changed, 5 insertions(+)
16
17diff --git a/Makefile.in b/Makefile.in
18index 08efb7d..7909342 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
22 echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
23 $(MAKE) $@-here
24
25+buildtest:
26+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
27+
28 check-here:
29 true
30
31diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
32index 6bc1907..bb65bf0 100644
33--- a/testsuite/Makefile.in
34+++ b/testsuite/Makefile.in
35@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
36 # data.
37 VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
38
39+buildtest: $(TS_ALL)
40+
41 # The PATH update is for locating dlls on w*ndows.
42 check: $(TS_ALL)
43 LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
44--
452.1.4
46
diff --git a/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
new file mode 100644
index 0000000000..c007060ee6
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
@@ -0,0 +1,38 @@
1Add target to only build tests (not run them)
2
3Not sending upstream as this is only a start of a solution to
4installable tests: It's useful for us already as is.
5
6Upstream-Status: Inappropriate [not a complete solution]
7
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Refactored for 3.4
10Signed-off-by: Armin Kuster <akuster@mvista.com>
11
12Index: nettle-3.4/Makefile.in
13===================================================================
14--- nettle-3.4.orig/Makefile.in
15+++ nettle-3.4/Makefile.in
16@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c
17 echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
18 $(MAKE) $@-here
19
20+buildtest:
21+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
22+
23 check-here:
24 true
25
26Index: nettle-3.4/testsuite/Makefile.in
27===================================================================
28--- nettle-3.4.orig/testsuite/Makefile.in
29+++ nettle-3.4/testsuite/Makefile.in
30@@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$
31 # data.
32 VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
33
34+buildtest: $(TS_ALL)
35+
36 # The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX.
37 check: $(TS_ALL)
38 LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \
diff --git a/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
index e7216bac28..d5f266681e 100644
--- a/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch
+++ b/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
@@ -10,29 +10,27 @@ building for nettle.
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> 12Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
13---
14 configure.ac | 8 +++++---
15 1 file changed, 5 insertions(+), 3 deletions(-)
16 13
17diff --git a/configure.ac b/configure.ac 14refactored for 3.4. pending not in as of 3.4
18index 4ead52c..982760f 100644 15
19--- a/configure.ac 16Signed-off-by: Armin Kuster <akuster@mvista.com>
20+++ b/configure.ac 17
18Index: nettle-3.4/configure.ac
19===================================================================
20--- nettle-3.4.orig/configure.ac
21+++ nettle-3.4/configure.ac
21@@ -185,9 +185,11 @@ AC_HEADER_TIME 22@@ -185,9 +185,11 @@ AC_HEADER_TIME
22 AC_CHECK_SIZEOF(long) 23 AC_CHECK_SIZEOF(long)
23 AC_CHECK_SIZEOF(size_t) 24 AC_CHECK_SIZEOF(size_t)
24 25
25-AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],, 26-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
26-[enable_openssl=no 27-[enable_openssl=no
27- break]) 28- break])
28+if test "x$enable_openssl" = "xyes"; then 29+if test "x$enable_openssl" = "xyes"; then
29+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],, 30+ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
30+ [enable_openssl=no 31+ [enable_openssl=no
31+ break]) 32+ break])
32+fi 33+fi
33 34
35 # For use by the testsuite
34 AC_CHECK_HEADERS([valgrind/memcheck.h]) 36 AC_CHECK_HEADERS([valgrind/memcheck.h])
35
36--
371.9.1
38
diff --git a/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
index c4f0b7ea1c..c4f0b7ea1c 100644
--- a/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch
+++ b/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
diff --git a/meta/recipes-support/nettle/files/run-ptest b/meta/recipes-support/nettle/nettle-3.4/run-ptest
index b90bed66d2..b90bed66d2 100644
--- a/meta/recipes-support/nettle/files/run-ptest
+++ b/meta/recipes-support/nettle/nettle-3.4/run-ptest
diff --git a/meta/recipes-support/nettle/nettle_3.3.bb b/meta/recipes-support/nettle/nettle_3.3.bb
deleted file mode 100644
index 39516781bc..0000000000
--- a/meta/recipes-support/nettle/nettle_3.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require nettle.inc
2
3LICENSE = "LGPLv3+ | GPLv2+"
4
5LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
6 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
8 file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
9
10SRC_URI += "\
11 file://check-header-files-of-openssl-only-if-enable_.patch \
12 "
13
14SRC_URI_append_class-target = "\
15 file://dlopen-test.patch \
16 "
17
18SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
19SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle_3.4.bb
index af51fb6c77..e88dba3989 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/meta/recipes-support/nettle/nettle_3.4.bb
@@ -1,14 +1,28 @@
1SUMMARY = "A low level cryptographic library" 1SUMMARY = "A low level cryptographic library"
2HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/" 2HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "LGPLv3+ | GPLv2+"
5
6LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
7 file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
9 file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
4 10
5DEPENDS += "gmp" 11DEPENDS += "gmp"
6 12
7SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
8 file://Add-target-to-only-build-tests-not-run-them.patch \ 14 file://Add-target-to-only-build-tests-not-run-them.patch \
9 file://run-ptest \ 15 file://run-ptest \
16 file://check-header-files-of-openssl-only-if-enable_.patch \
10 " 17 "
11 18
19SRC_URI_append_class-target = "\
20 file://dlopen-test.patch \
21 "
22
23SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d"
24SRC_URI[sha256sum] = "ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94"
25
12UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" 26UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
13 27
14inherit autotools ptest 28inherit autotools ptest