diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-04 13:55:49 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-16 12:11:24 +0000 |
| commit | 08fb2a4c2eaabdb2944cefefed51d1b95aedbde1 (patch) | |
| tree | cbe410edaebde581bf77cbcbf40a5dc208236455 /meta/recipes-support | |
| parent | b42779453b833aeabd4683fcb7c7a032928c4cbe (diff) | |
| download | openembedded-core-contrib-08fb2a4c2eaabdb2944cefefed51d1b95aedbde1.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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support')
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 @@ SUMMARY = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" -DEPENDS = "nettle" +DEPENDS = "nettle libidn" LICENSE = "GPLv3+ & LGPLv2.1+" LICENSE_${PN} = "LGPLv2.1+" @@ -26,6 +26,7 @@ EXTRA_OECONF="--disable-rpath \ --disable-guile \ --disable-crywrap \ --without-p11-kit \ + --enable-openssl-compatibility \ " do_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 @@ +From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 4 Dec 2015 13:19:28 +0200 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e634236..dc9e6a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -549,7 +549,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.6.2 + 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 @@ -From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Sat, 17 Jan 2015 17:02:15 +0000 -Subject: [PATCH] configure.ac: fix sed command - -The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors -when the S contains "bitbake", fix to "sed 's/\.bak$//'`" - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c6818a0..1c4582d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then - dnl replace libopts-generated files with distributed backups, if present - missing_baks= - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=`echo $i|sed 's/.bak//g'` -+ nam=`echo $i|sed 's/\.bak$//'` - if test -f $i;then - cp -f $i $nam - else --- -2.0.1 - 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 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - " -SRC_URI[md5sum] = "8d01c7e7f2cbc5871fdca832d2260b6b" -SRC_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 @@ +require gnutls.inc + +SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ + file://0001-configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ + " +SRC_URI[md5sum] = "e7556cec73c8b34fd2ff0b591e24e44c" +SRC_URI[sha256sum] = "c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a" |