[PATCH 3/4] gnupg: upgrade 2.5.21 -> 2.5.22

[Jaipaul Cheernam <jaipaul.cheernam@est.tech>]

CompareLog: https://github.com/gpg/gnupg/compare/gnupg-2.5.21...gnupg-2.5.22

Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
 ...verride-init-is-not-needed-with-gcc-9.patch |  2 +-
 ...e-a-custom-value-for-the-location-of-.patch |  4 ++--
 ...-use-pkgconfig-instead-of-npth-config.patch |  2 +-
 .../recipes-support/gnupg/gnupg/relocate.patch | 18 +++++++++---------
 .../gnupg/{gnupg_2.5.21.bb => gnupg_2.5.22.bb} |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.5.21.bb => gnupg_2.5.22.bb} (97%)

diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
index 7a3fa59c54..52db780959 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
@@ -1,4 +1,4 @@
-From 46db1301b1b71f47aa131b9a3de9d1cf356cf408 Mon Sep 17 00:00:00 2001
+From 8b7d344ed35bc4bcfa0d531a0885fc1bea01ffda Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 20 Dec 2018 17:37:48 -0800
 Subject: [PATCH] Woverride-init is not needed with gcc 9
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 1c7cd7ba7b..04dd45e676 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,4 +1,4 @@
-From fd060f524e50c7c3f8694f71630ac151627235f1 Mon Sep 17 00:00:00 2001
+From f86e7337698debfe5152f4f4bc840bf56f868fab 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] configure.ac: use a custom value for the location of
@@ -13,7 +13,7 @@ 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 5ac4d0b..09615c5 100644
+index 9e2a42d..b48b88d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1909,7 +1909,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
index f4c9b2161a..7553bd9f3f 100644
--- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
+++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
@@ -1,4 +1,4 @@
-From b8a99b2d9caa05f54be25635e3b1687753fe7196 Mon Sep 17 00:00:00 2001
+From 3c1d201eace11d557eb6c589842e93b8bacbe8f9 Mon Sep 17 00:00:00 2001
 From: Saul Wold <sgw@linux.intel.com>
 Date: Wed, 16 Aug 2017 11:16:30 +0800
 Subject: [PATCH] use pkgconfig instead of npth config
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 02f03386ec..234afd16fe 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From c70694bd3e71cc1fec6ccb3ea0f694c3863ebd48 Mon Sep 17 00:00:00 2001
+From f49d102adf393f57e6ca7b6ec6969f60115055ef Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Wed, 19 Sep 2018 14:44:40 +0100
 Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/common/homedir.c b/common/homedir.c
-index 835f0ea..0a67a33 100644
+index 7538642..92e8125 100644
 --- a/common/homedir.c
 +++ b/common/homedir.c
-@@ -1526,7 +1526,7 @@ gnupg_socketdir (void)
+@@ -1575,7 +1575,7 @@ gnupg_socketdir (void)
    if (!name)
      {
        unsigned int dummy;
@@ -25,7 +25,7 @@ index 835f0ea..0a67a33 100644
        gpgrt_annotate_leaked_object (name);
      }
  
-@@ -1555,7 +1555,7 @@ gnupg_sysconfdir (void)
+@@ -1604,7 +1604,7 @@ gnupg_sysconfdir (void)
    if (dir)
      return dir;
    else
@@ -34,7 +34,7 @@ index 835f0ea..0a67a33 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1591,7 +1591,7 @@ gnupg_bindir (void)
+@@ -1640,7 +1640,7 @@ gnupg_bindir (void)
        return name;
      }
    else
@@ -43,7 +43,7 @@ index 835f0ea..0a67a33 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1618,7 +1618,7 @@ gnupg_libexecdir (void)
+@@ -1667,7 +1667,7 @@ gnupg_libexecdir (void)
        return name;
      }
    else
@@ -52,7 +52,7 @@ index 835f0ea..0a67a33 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1648,7 +1648,7 @@ gnupg_libdir (void)
+@@ -1697,7 +1697,7 @@ gnupg_libdir (void)
        return name;
      }
    else
@@ -61,7 +61,7 @@ index 835f0ea..0a67a33 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1679,7 +1679,7 @@ gnupg_datadir (void)
+@@ -1728,7 +1728,7 @@ gnupg_datadir (void)
        return name;
      }
    else
@@ -70,7 +70,7 @@ index 835f0ea..0a67a33 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1711,7 +1711,7 @@ gnupg_localedir (void)
+@@ -1760,7 +1760,7 @@ gnupg_localedir (void)
        return name;
      }
    else
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.21.bb b/meta/recipes-support/gnupg/gnupg_2.5.22.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.5.21.bb
rename to meta/recipes-support/gnupg/gnupg_2.5.22.bb
index dc77691bbd..803fb2765a 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.21.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.22.bb
@@ -25,7 +25,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-
                                 file://relocate.patch"
 SRC_URI:append:class-nativesdk = " file://relocate.patch"
 
-SRC_URI[sha256sum] = "e3af2c8caa46a66a9329fa7c6880af260451914d819595beabc2c26597b31352"
+SRC_URI[sha256sum] = "96e27b020ad26510388e06f5f07f3f70a4ed8916ee995f1b72b7a024e6d9d87e"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \