[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4836/8267] gnutls: update to 3.5.9

[Emmanuele Bassi <ebassi src gnome org>]

commit c8f21b5a1ec909877aa91f5b6c032f93152c5602
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Wed Feb 22 16:51:12 2017 +0200

    gnutls: update to 3.5.9
    
    Drop 0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch, it's merged upstream.
    Rebase 0001-configure.ac-fix-sed-command.patch.
    
    (From OE-Core rev: bed7c85e9ed77ae961c4588d4f7eca6b20d2f1e8)
    
    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>

 ...cli-args.h-to-cli-args.stamp-Makefile-tar.patch |   27 --------------------
 .../gnutls/0001-configure.ac-fix-sed-command.patch |   26 +++++++++---------
 .../gnutls/{gnutls_3.5.7.bb => gnutls_3.5.9.bb}    |    5 +--
 3 files changed, 15 insertions(+), 43 deletions(-)
---
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
index c5b95eb..f0b7ca2 100644
--- 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
@@ -1,6 +1,6 @@
-From 67c638c7e209554d9b19627e9402a20fdabead21 Mon Sep 17 00:00:00 2001
+From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex kanavin gmail com>
-Date: Fri, 4 Dec 2015 13:19:28 +0200
+Date: Tue, 21 Feb 2017 17:10:07 +0200
 Subject: [PATCH] configure.ac: fix sed command
 
 The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
@@ -15,18 +15,18 @@ Signed-off-by: Alexander Kanavin <alex kanavin gmail com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index e634236..dc9e6a8 100644
+index 6907b21..7c70d9e 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
+@@ -948,7 +948,7 @@ YEAR=`date +%Y`
+ AC_SUBST([YEAR], $YEAR)
+ 
+ for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+-      nam=$(basename $i|sed 's/.bak//g')
++      nam=$(basename $i|sed 's/\.bak$//')
+       if test "$create_libopts_links" = "yes";then
+               rm -f "src/$nam"
+               AC_CONFIG_LINKS([src/$nam:$i])
 -- 
-2.6.2
+2.11.0
 
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.7.bb b/meta/recipes-support/gnutls/gnutls_3.5.9.bb
similarity index 52%
rename from meta/recipes-support/gnutls/gnutls_3.5.7.bb
rename to meta/recipes-support/gnutls/gnutls_3.5.9.bb
index 9508a8e..8f84dbb 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.7.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.9.bb
@@ -3,9 +3,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 \
-            file://0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch \
             file://arm_eabi.patch \
            "
-SRC_URI[md5sum] = "08ad2c539bc1d91283f610539deef34e"
-SRC_URI[sha256sum] = "60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a"
+SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951"
+SRC_URI[sha256sum] = "82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951"