mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

nettle: update to 3.4 and cleanup

Browse Source 
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>
This commit is contained in:
Armin Kuster
2017-11-21 12:01:33 -08:00
committed by Richard Purdie
parent 452fa2df2f
commit 4ab75023ff
7 changed files with 65 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
View File

@@ -1,46 +0,0 @@
From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Wed, 12 Aug 2015 23:27:27 +0300
Subject: [PATCH] Add target to only build tests (not run them)
Not sending upstream as this is only a start of a solution to
installable tests: It's useful for us already as is.
Upstream-Status: Inappropriate [not a complete solution]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
Makefile.in | 3 +++
testsuite/Makefile.in | 2 ++
2 files changed, 5 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index 08efb7d..7909342 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
$(MAKE) $@-here
+buildtest:
+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
+
check-here:
true
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 6bc1907..bb65bf0 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
# data.
VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
+buildtest: $(TS_ALL)
+
# The PATH update is for locating dlls on w*ndows.
check: $(TS_ALL)
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
--
2.1.4

38
meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch Normal file
View File

@@ -0,0 +1,38 @@
Add target to only build tests (not run them)
Not sending upstream as this is only a start of a solution to
installable tests: It's useful for us already as is.
Upstream-Status: Inappropriate [not a complete solution]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Refactored for 3.4
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: nettle-3.4/Makefile.in
===================================================================
--- nettle-3.4.orig/Makefile.in
+++ nettle-3.4/Makefile.in
@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c
echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
$(MAKE) $@-here
+buildtest:
+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
+
check-here:
true
Index: nettle-3.4/testsuite/Makefile.in
===================================================================
--- nettle-3.4.orig/testsuite/Makefile.in
+++ nettle-3.4/testsuite/Makefile.in
@@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$
# data.
VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
+buildtest: $(TS_ALL)
+
# The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX.
check: $(TS_ALL)
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \

26
meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch → meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
View File

@@ -10,29 +10,27 @@ building for nettle.
Upstream-Status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
---
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4ead52c..982760f 100644
--- a/configure.ac
+++ b/configure.ac
refactored for 3.4. pending not in as of 3.4
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: nettle-3.4/configure.ac
===================================================================
--- nettle-3.4.orig/configure.ac
+++ nettle-3.4/configure.ac
@@ -185,9 +185,11 @@ AC_HEADER_TIME
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(size_t)
-AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
+ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
+ [enable_openssl=no
+ break])
+ break])
+fi
# For use by the testsuite
AC_CHECK_HEADERS([valgrind/memcheck.h])
--
1.9.1

0
meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch → meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
View File

0
meta/recipes-support/nettle/files/run-ptest → meta/recipes-support/nettle/nettle-3.4/run-ptest
View File

19
meta/recipes-support/nettle/nettle_3.3.bb
View File

@@ -1,19 +0,0 @@
require nettle.inc
LICENSE = "LGPLv3+ | GPLv2+"
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"
SRC_URI += "\
file://check-header-files-of-openssl-only-if-enable_.patch \
"
SRC_URI_append_class-target = "\
file://dlopen-test.patch \
"
SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"

16
meta/recipes-support/nettle/nettle.inc → meta/recipes-support/nettle/nettle_3.4.bb
View File

@@ -1,14 +1,28 @@
SUMMARY = "A low level cryptographic library"
HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
SECTION = "libs"
LICENSE = "LGPLv3+ | GPLv2+"
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 = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
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_append_class-target = "\
file://dlopen-test.patch \
"
SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d"
SRC_URI[sha256sum] = "ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94"
UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
inherit autotools ptest