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 b48db40970..7a3fa59c54 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 9b7ef8aa1a5d71fc95f36a92874d3faa4579fc4e Mon Sep 17 00:00:00 2001 +From 46db1301b1b71f47aa131b9a3de9d1cf356cf408 Mon Sep 17 00:00:00 2001 From: Khem Raj 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 bfee9c9904..1c7cd7ba7b 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 84a16d46a72a2501cbe3a4a83ea7f8393ada4038 Mon Sep 17 00:00:00 2001 +From fd060f524e50c7c3f8694f71630ac151627235f1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 023604b..c84442c 100644 +index 5ac4d0b..09615c5 100644 --- a/configure.ac +++ b/configure.ac -@@ -1908,7 +1908,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1909,7 +1909,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) 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 90d53674d4..f4c9b2161a 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 0c3a09a95875e5744a910a0d3c93fa2e9dbe8c69 Mon Sep 17 00:00:00 2001 +From b8a99b2d9caa05f54be25635e3b1687753fe7196 Mon Sep 17 00:00:00 2001 From: Saul Wold 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/CVE-2026-57062.patch b/meta/recipes-support/gnupg/gnupg/CVE-2026-57062.patch deleted file mode 100644 index f298b6e9a8..0000000000 --- a/meta/recipes-support/gnupg/gnupg/CVE-2026-57062.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d586f50ee849c8cbeaea47b50c64446c1becbf9b Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Thu, 18 Jun 2026 10:51:34 +0200 -Subject: [PATCH] gpgsm: Require a minimum tag length for GCM decryption. - -* sm/decrypt.c (gpgsm_decrypt): Require a minimum authtaglen. --- - -Reported-by: Thai Duong -This is similar to OpenSSL's -CVE-id: CVE-2026-34182 - -CVE: CVE-2026-57062 -Upstream-Status: Backport [https://github.com/gpg/gnupg/commit/4c7e68cf3d335328821bdbb70db309a60d0e4fd4] - -Signed-off-by: Roland Kovacs ---- - sm/decrypt.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/sm/decrypt.c b/sm/decrypt.c -index 20fb96060..92a33c6e6 100644 ---- a/sm/decrypt.c -+++ b/sm/decrypt.c -@@ -1447,7 +1447,14 @@ gpgsm_decrypt (ctrl_t ctrl, estream_t in_fp, estream_t out_fp) - } - if (DBG_CRYPTO) - log_printhex (authtag, authtaglen, "Authtag ...:"); -- rc = gcry_cipher_checktag (dfparm.hd, authtag, authtaglen); -+ if (authtaglen < 12) -+ { -+ log_info ("authentication tag is too short (%zu octets)\n", -+ authtaglen); -+ rc = gpg_error (GPG_ERR_CHECKSUM); -+ } -+ else -+ rc = gcry_cipher_checktag (dfparm.hd, authtag, authtaglen); - xfree (authtag); - if (rc) - log_error ("data is not authentic: %s\n", gpg_strerror (rc)); --- -2.34.1 - diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index fedb7f6407..02f03386ec 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 8d7658741da050f604bcf26f8a6c24a0b15df94b Mon Sep 17 00:00:00 2001 +From c70694bd3e71cc1fec6ccb3ea0f694c3863ebd48 Mon Sep 17 00:00:00 2001 From: Ross Burton 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 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index d26ddd9..24224c0 100644 +index 835f0ea..0a67a33 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -1451,7 +1451,7 @@ gnupg_socketdir (void) +@@ -1526,7 +1526,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -25,7 +25,7 @@ index d26ddd9..24224c0 100644 gpgrt_annotate_leaked_object (name); } -@@ -1480,7 +1480,7 @@ gnupg_sysconfdir (void) +@@ -1555,7 +1555,7 @@ gnupg_sysconfdir (void) if (dir) return dir; else @@ -34,7 +34,7 @@ index d26ddd9..24224c0 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1516,7 +1516,7 @@ gnupg_bindir (void) +@@ -1591,7 +1591,7 @@ gnupg_bindir (void) return name; } else @@ -43,7 +43,7 @@ index d26ddd9..24224c0 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1543,7 +1543,7 @@ gnupg_libexecdir (void) +@@ -1618,7 +1618,7 @@ gnupg_libexecdir (void) return name; } else @@ -52,7 +52,7 @@ index d26ddd9..24224c0 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1573,7 +1573,7 @@ gnupg_libdir (void) +@@ -1648,7 +1648,7 @@ gnupg_libdir (void) return name; } else @@ -61,7 +61,7 @@ index d26ddd9..24224c0 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1604,7 +1604,7 @@ gnupg_datadir (void) +@@ -1679,7 +1679,7 @@ gnupg_datadir (void) return name; } else @@ -70,7 +70,7 @@ index d26ddd9..24224c0 100644 #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1636,7 +1636,7 @@ gnupg_localedir (void) +@@ -1711,7 +1711,7 @@ gnupg_localedir (void) return name; } else diff --git a/meta/recipes-support/gnupg/gnupg_2.5.20.bb b/meta/recipes-support/gnupg/gnupg_2.5.21.bb similarity index 95% rename from meta/recipes-support/gnupg/gnupg_2.5.20.bb rename to meta/recipes-support/gnupg/gnupg_2.5.21.bb index 4a72d8c8f0..e34c09fc8c 100644 --- a/meta/recipes-support/gnupg/gnupg_2.5.20.bb +++ b/meta/recipes-support/gnupg/gnupg_2.5.21.bb @@ -20,13 +20,13 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/ftp/gcrypt/gnupg/" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ - file://CVE-2026-57062.patch \ + file://relocate.patch \ " SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "6461266e99c308419a379abe6c356d54c214136c4589bd65951091138989ffc6" +SRC_URI[sha256sum] = "e3af2c8caa46a66a9329fa7c6880af260451914d819595beabc2c26597b31352" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \