gnupg: upgrade 2.2.8 -> 2.2.9

(From OE-Core rev: b7da8d50ebc2f44376d352d001371e03f465e3be)

(From OE-Core rev: 23043b5d94f1e126876143a47f87fa3baabd60e8)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 6 insertions, 9 deletions

diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index 5d9bbacb74..5f1dd30f87 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,7 +1,7 @@
-From 338d073cab7b94fd7ec66322b969e8772b5e8cd7 Mon Sep 17 00:00:00 2001
+From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 22 Jan 2018 18:00:21 +0200
-Subject: [PATCH 5/5] configure.ac: use a custom value for the location of
+Subject: [PATCH] configure.ac: use a custom value for the location of
  gpg-agent socket in the filesystem
 
 This should avoid clashes with the host gpg-agent observed on autobuilders.
@@ -14,10 +14,10 @@ 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 382ef1d..0570d7c 100644
+index 59a2e60..12d390b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
  
  AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
  
@@ -26,6 +26,3 @@ index 382ef1d..0570d7c 100644
                     [The name of the agent socket])
  AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra",
                     [The name of the agent socket for remote access])
--- 
-2.7.4
-
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.8.bb b/meta/recipes-support/gnupg/gnupg_2.2.9.bb
index 35a033c9b6..4f815dff20 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.8.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.9.bb
@@ -18,8 +18,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
 SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch"
 
 
-SRC_URI[md5sum] = "0db6d8ec569e260435a7d2bfb2ecfe5c"
-SRC_URI[sha256sum] = "777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd"
+SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a"
+SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164"
 
 EXTRA_OECONF = "--disable-ldap \
                 --disable-ccid-driver \