gnupg: upgrade 2.5.1 -> 2.5.2

0001-fix-compile-failure-with-musl.patch
relocate.patch
refreshed for 2.5.2

Changelog:
============
* gpg: Add option 16 to --full-gen-key to create ECC+Kyber.
* gpg: For composite algos add the algo string to the colons listings.
* gpg: Validate the trustdb after the import of a trusted key.
* gpg: Exclude expired trusted keys from the key validation process.
* gpg: Fix a wrong decryption failed status for signed and OCB
  encrypted messages without a signature verification key.
* gpg: Retain binary representation for import->export with Ed25519
  key signatures.
* gpg: Fix comparing ed448 to ed25519 with --assert-pubkey-algo.
* gpg: Avoid a failure exit code for expired ultimately trusted keys.
* gpg: Emit status error for an invalid ADSK.
* gpg: Allow the use of an ADSK subkey as ADSK subkey.
* gpg: Fix --quick-set-expire for V5 subkey fingerprints.
* gpg: Robust error handling for SCD READKEY.
* gpg: Fix cv25519 v5 export regression.
* gpgsm: Nearly fourfold speedup of validated certificate listings.
* gpgsm: Improvement for some rare P12 files.
* gpgsm: Terminate key listing on output write error.
* agent: Add option --status to the LISTRUSTED command.
* agent: Fix detection of the yet unused trustflag de-vs.
* agent: Allow ssh to sign data larger than the Assuan line length.
* keyboxd: Fix a race condition on the database handle.
* dirmngr: A list of used URLs for loaded CRLs is printed first in
  the output of the LISTCRL command.
* scd: More mitigations against lock ups with multiple cards or apps.
* gpgtar: Use log-file from common.conf only in --batch mode.
* gpgtar: Fix directory creation during extraction.
* gpg-mail-tube: Minor fixes.
* gpgconf: Add list flag to trusted-key et al.
* Implement GNUPG_ASSUME_COMPLIANCE envvar and registry key for
  testing de-vs compliance mode.
* Enable additional runtime protections in speedo builds for windows.
* Fix a race condition in creating the socket directory.
* Fix a build problem on macOS (missing unistd.h).

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
index 13c1a36366bffdcb18657a4a4b4b73180789bbdf..ec99f4b10c310b89e724550863485d3a4068e829 100644 (file)
--- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
@@ -1,4 +1,4 @@
-From 2e7534f3f7694ba426615b2061c235908097bb9b Mon Sep 17 00:00:00 2001
+From 81c222ea179ef73fcae4b50c56342bdad4787a28 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 22 Aug 2024 15:31:16 +0800
 Subject: [PATCH] fix compile failure with musl
@@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/scd/app.c b/scd/app.c
-index 525950e..7180178 100644
+index ba7bb23..7d41e53 100644
 --- a/scd/app.c
 +++ b/scd/app.c
 @@ -24,6 +24,7 @@
@@ -29,5 +29,5 @@ index 525950e..7180178 100644
  #include <npth.h>
 +#include <unistd.h>
  
- #include "scdaemon.h"
- #include "../common/exechelp.h"
+ #ifndef HAVE_W32_SYSTEM
+ #include <fcntl.h>            /* F_SETFD F_GETFL F_SETFL O_NONBLOCK fcntl(2) */

diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 6fcbc2d18fdbde320f20032e98ffce470e838e96..08e70fb444ef75f724ee5320a612ad81bb14028d 100644 (file)
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 3c761174b0ec6f49f184f16a0b0eaade44264edc Mon Sep 17 00:00:00 2001
+From 93fef8f493ee66856ef02351da25583eea94202d 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 a73182e..9994a9a 100644
+index d26ddd9..24224c0 100644
 --- a/common/homedir.c
 +++ b/common/homedir.c
-@@ -1439,7 +1439,7 @@ gnupg_socketdir (void)
+@@ -1451,7 +1451,7 @@ gnupg_socketdir (void)
    if (!name)
      {
        unsigned int dummy;
@@ -25,7 +25,7 @@ index a73182e..9994a9a 100644
        gpgrt_annotate_leaked_object (name);
      }
  
-@@ -1468,7 +1468,7 @@ gnupg_sysconfdir (void)
+@@ -1480,7 +1480,7 @@ gnupg_sysconfdir (void)
    if (dir)
      return dir;
    else
@@ -34,7 +34,7 @@ index a73182e..9994a9a 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1504,7 +1504,7 @@ gnupg_bindir (void)
+@@ -1516,7 +1516,7 @@ gnupg_bindir (void)
        return name;
      }
    else
@@ -43,7 +43,7 @@ index a73182e..9994a9a 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1531,7 +1531,7 @@ gnupg_libexecdir (void)
+@@ -1543,7 +1543,7 @@ gnupg_libexecdir (void)
        return name;
      }
    else
@@ -52,7 +52,7 @@ index a73182e..9994a9a 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1561,7 +1561,7 @@ gnupg_libdir (void)
+@@ -1573,7 +1573,7 @@ gnupg_libdir (void)
        return name;
      }
    else
@@ -61,7 +61,7 @@ index a73182e..9994a9a 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1592,7 +1592,7 @@ gnupg_datadir (void)
+@@ -1604,7 +1604,7 @@ gnupg_datadir (void)
        return name;
      }
    else
@@ -70,7 +70,7 @@ index a73182e..9994a9a 100644
  #endif /*!HAVE_W32_SYSTEM*/
  }
  
-@@ -1624,7 +1624,7 @@ gnupg_localedir (void)
+@@ -1636,7 +1636,7 @@ gnupg_localedir (void)
        return name;
      }
    else

diff --git a/meta/recipes-support/gnupg/gnupg_2.5.1.bb b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.5.1.bb
rename to meta/recipes-support/gnupg/gnupg_2.5.2.bb
index 080056f74c379ccceb36c8600bdcc3d6a711968a..64c63e31ce789909ea4ba9523626e54082444882 100644 (file)
--- a/meta/recipes-support/gnupg/gnupg_2.5.1.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
@@ -24,7 +24,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] = "8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e"
+SRC_URI[sha256sum] = "7f404ccc6a58493fedc15faef59f3ae914831cff866a23f0bf9d66cfdd0fea29"
 
 EXTRA_OECONF = "--disable-ldap \
                --disable-ccid-driver \