summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-04 13:55:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:16 +0000
commit2d04c838e1ad57a0c789fcc7ddceb0bd7e96fd95 (patch)
tree1ec10dc4e8c140f175cb1393bb779997e6c453cf /meta/recipes-support
parentcf1eb2b8c0cb564eff6bd2346c40ebd7805ccfc1 (diff)
downloadpoky-2d04c838e1ad57a0c789fcc7ddceb0bd7e96fd95.tar.gz
gnutls: update to 3.4.7
libidn is needed by the new version to compare hostnames. Openssl compatibility is no longer enabled by default, but is required by other packages in oe-core. (From OE-Core rev: 08fb2a4c2eaabdb2944cefefed51d1b95aedbde1) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc3
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch32
-rw-r--r--meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch31
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.3.17.1.bb8
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.4.7.bb8
5 files changed, 42 insertions, 40 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index e9b138a03b..c1ec1207df 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,7 +1,7 @@
1SUMMARY = "GNU Transport Layer Security Library" 1SUMMARY = "GNU Transport Layer Security Library"
2HOMEPAGE = "http://www.gnu.org/software/gnutls/" 2HOMEPAGE = "http://www.gnu.org/software/gnutls/"
3BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" 3BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
4DEPENDS = "nettle" 4DEPENDS = "nettle libidn"
5 5
6LICENSE = "GPLv3+ & LGPLv2.1+" 6LICENSE = "GPLv3+ & LGPLv2.1+"
7LICENSE_${PN} = "LGPLv2.1+" 7LICENSE_${PN} = "LGPLv2.1+"
@@ -26,6 +26,7 @@ EXTRA_OECONF="--disable-rpath \
26 --disable-guile \ 26 --disable-guile \
27 --disable-crywrap \ 27 --disable-crywrap \
28 --without-p11-kit \ 28 --without-p11-kit \
29 --enable-openssl-compatibility \
29 " 30 "
30 31
31do_configure_prepend() { 32do_configure_prepend() {
diff --git a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
new file mode 100644
index 0000000000..c5b95eb5bf
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
@@ -0,0 +1,32 @@
1From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 4 Dec 2015 13:19:28 +0200
4Subject: [PATCH] configure.ac: fix sed command
5
6The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
7when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.ac b/configure.ac
18index e634236..dc9e6a8 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -549,7 +549,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then
22 dnl replace libopts-generated files with distributed backups, if present
23 missing_baks=
24 for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
25- nam=`echo $i|sed 's/.bak//g'`
26+ nam=`echo $i|sed 's/\.bak$//'`
27 if test -f $i;then
28 cp -f $i $nam
29 else
30--
312.6.2
32
diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
deleted file mode 100644
index 44a9934b5d..0000000000
--- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 17 Jan 2015 17:02:15 +0000
4Subject: [PATCH] configure.ac: fix sed command
5
6The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
7when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index c6818a0..1c4582d 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then
21 dnl replace libopts-generated files with distributed backups, if present
22 missing_baks=
23 for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
24- nam=`echo $i|sed 's/.bak//g'`
25+ nam=`echo $i|sed 's/\.bak$//'`
26 if test -f $i;then
27 cp -f $i $nam
28 else
29--
302.0.1
31
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb b/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
deleted file mode 100644
index 0185797521..0000000000
--- a/meta/recipes-support/gnutls/gnutls_3.3.17.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require gnutls.inc
2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
4 file://configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \
6 "
7SRC_URI[md5sum] = "8d01c7e7f2cbc5871fdca832d2260b6b"
8SRC_URI[sha256sum] = "b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4"
diff --git a/meta/recipes-support/gnutls/gnutls_3.4.7.bb b/meta/recipes-support/gnutls/gnutls_3.4.7.bb
new file mode 100644
index 0000000000..c90b44ab8a
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_3.4.7.bb
@@ -0,0 +1,8 @@
1require gnutls.inc
2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
4 file://0001-configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \
6 "
7SRC_URI[md5sum] = "e7556cec73c8b34fd2ff0b591e24e44c"
8SRC_URI[sha256sum] = "c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a"