[OE-core] [PATCH 14/16] gnutls: update to 3.6.11.1

Alexander Kanavin alex.kanavin at gmail.com
Thu Dec 19 13:22:59 UTC 2019


Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
---
 .../gnutls/gnutls/posix-shell.patch                | 14 ++++++++++++--
 .../gnutls/{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls_3.6.8.bb => gnutls_3.6.11.1.bb} (94%)

diff --git a/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/meta/recipes-support/gnutls/gnutls/posix-shell.patch
index 938e2d1e18f..eda1c6c300e 100644
--- a/meta/recipes-support/gnutls/gnutls/posix-shell.patch
+++ b/meta/recipes-support/gnutls/gnutls/posix-shell.patch
@@ -1,3 +1,8 @@
+From 0fce96e7d702d8f3bdbea57c1e77027446a91d37 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton at intel.com>
+Date: Thu, 25 Jul 2019 16:20:23 +0100
+Subject: [PATCH] gnutls: don't use HOSTTOOLS_DIR/bash as a shell on target
+
 Don't embed the path to the build-time POSIX shell as this will be
 $TMPDIR/hosttools/bash, which is no good on the target.
 
@@ -10,16 +15,21 @@ integrated.
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton at intel.com>
 
+---
+ src/libopts/m4/libopts.m4 | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
 diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4
-index c6ad738..a62faca 100644
+index 23738ca..b47c0da 100644
 --- a/src/libopts/m4/libopts.m4
 +++ b/src/libopts/m4/libopts.m4
-@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
+@@ -105,22 +105,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
    AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \
                   strrchr strsignal fchmod fstat chmod])
    AC_PROG_SED
 -  [while :
 -  do
+-      test -x "$POSIX_SHELL" && break
 -      POSIX_SHELL=`which bash`
 -      test -x "$POSIX_SHELL" && break
 -      POSIX_SHELL=`which dash`
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
similarity index 94%
rename from meta/recipes-support/gnutls/gnutls_3.6.8.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
index c927063f0a3..14c858eaec2 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.8.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
            file://posix-shell.patch \
 "
 
-SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8"
-SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83"
+SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7"
+SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
 
-- 
2.17.1



More information about the Openembedded-core mailing list