diff mbox series

[05/24] gnupg: upgrade 2.5.22 -> 2.5.24

Message ID 20260930-mathieu-upgrades-2026-02-29-v1-5-102c38be04df@bootlin.com
State Under Review
Headers show
Series 2026-09-29 upgrades | expand

Commit Message

Mathieu Dubois-Briand Sept. 30, 2026, 8:16 a.m. UTC 
Noteworthy changes in version 2.5.24 (2026-09-23)
- Bug fixes:
 - scd: Fix for regression in 2.5.23 related to the new Nitrokey
   detection.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
 .../gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch    | 2 +-
 .../0001-configure.ac-use-a-custom-value-for-the-location-of-.patch   | 4 ++--
 .../gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch       | 2 +-
 meta/recipes-support/gnupg/gnupg/relocate.patch                       | 2 +-
 meta/recipes-support/gnupg/{gnupg_2.5.23.bb => gnupg_2.5.24.bb}       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

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 707bba9faf94..4d6e364a65c9 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 1c8f78f659e094aa924e1a84326a086701e803c9 Mon Sep 17 00:00:00 2001
+From abe388c8f38df7cd2f0641f17c6f872dd847c330 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 94120195a781..95f62ff26d0f 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 ff6e519a6034d331a82d8018772db940191a3887 Mon Sep 17 00:00:00 2001
+From f8d096e62c06085e93a339bc2d7421a65c437e6f 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 59e2bce..4eff4a8 100644
+index 51ffbc6..39924db 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1910,7 +1910,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 c30677e80de3..6b2cfc250397 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 a0a9afc96bcf352324109496a3c5419133002afe Mon Sep 17 00:00:00 2001
+From 7d42cbba53eddce53d1763d7ffe70e728d7b0445 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 2775967303dd..0bffeb0a69e4 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@ 
-From 4d15672a7dadaa0d21ef9339a065af20a49b5348 Mon Sep 17 00:00:00 2001
+From 4c4068e6f8a180737d1b28c6914387bc0a485df3 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
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.23.bb b/meta/recipes-support/gnupg/gnupg_2.5.24.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.5.23.bb
rename to meta/recipes-support/gnupg/gnupg_2.5.24.bb
index 139e1c9ef2e6..3e562250d70a 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.23.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.24.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] = "97ebba329ed0aa1ed24395b6a485a3626680f4c19232c62a0c0f0433c726e2bd"
+SRC_URI[sha256sum] = "bf149d01a2b9fcc0e4589b8ae8697d3d5c557ea48ed95a3fa55dd3b1187e6039"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \