[styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[Guðni Már Gilbert]

Guðni Már Gilbert (1):
  gnupg: remove obsolete patch

Wang Mingyu (1):
  gnupg: upgrade 2.5.1 -> 2.5.2

hongxu (1):
  gnupg: upgrade 2.5.0 -> 2.5.1

 ...erride-init-is-not-needed-with-gcc-9.patch |  2 +-
 ...-a-custom-value-for-the-location-of-.patch |  6 ++--
 .../0001-fix-compile-failure-with-musl.patch  | 36 -------------------
 ...use-pkgconfig-instead-of-npth-config.patch |  2 +-
 ...h-fix-find-version-for-beta-checking.patch |  2 +-
 .../gnupg/gnupg/relocate.patch                | 18 +++++-----
 .../gnupg/{gnupg_2.5.0.bb => gnupg_2.5.2.bb}  | 15 ++------
 7 files changed, 18 insertions(+), 63 deletions(-)
 delete mode 100644 meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
 rename meta/recipes-support/gnupg/{gnupg_2.5.0.bb => gnupg_2.5.2.bb} (85%)

-- 
2.43.0

[styhead][PATCH 1/3] gnupg: upgrade 2.5.0 -> 2.5.1

[Guðni Már Gilbert]

From: hongxu <hongxu.jia@eng.windriver.com>

Due to upstream [build: Remove configure option --enable-gpg-is-gpg2][1],
drop option --enable-gpg-is-gpg2 and remove gpg2/gpgv2 installation

Due to upsream [doc: Remove included yat2m and build HTML versions of
the man pages.][2], it used standard detection on yat2m other than build
it from source. Because no native recipe provide yat2m in Yocto,
explicitly disable doc via option --disable-doc

[1] https://github.com/gpg/gnupg/commit/2125f228d36c0882a87bce433a18253154653d50
[2] https://github.com/gpg/gnupg/commit/60c541f5880e8c603ca9372d3ca8b7ad68b97018

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...1-Woverride-init-is-not-needed-with-gcc-9.patch |  2 +-
 ...c-use-a-custom-value-for-the-location-of-.patch |  6 +++---
 .../gnupg/0001-fix-compile-failure-with-musl.patch | 11 ++++-------
 ...0002-use-pkgconfig-instead-of-npth-config.patch |  2 +-
 ...gen.sh-fix-find-version-for-beta-checking.patch |  2 +-
 meta/recipes-support/gnupg/gnupg/relocate.patch    |  4 ++--
 .../gnupg/{gnupg_2.5.0.bb => gnupg_2.5.1.bb}       | 14 +++-----------
 7 files changed, 15 insertions(+), 26 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.5.0.bb => gnupg_2.5.1.bb} (87%)

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 77d7507edc..024f4a9f10 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 6392cb71a23adfd601537049da4e5e06e51d2e50 Mon Sep 17 00:00:00 2001
+From 69d132c4cca738f148551af24932010fb1029ea1 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 12b1447138..702cba4b71 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 a0e986b487891ef8e3bb41b95f969e00edd4923f Mon Sep 17 00:00:00 2001
+From d9ef954b602c17839c52a1d7dc73e2354e5fbbbb 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,10 +13,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 e4f8c0e..fa75ec8 100644
+index 29592fd..7286862 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1925,7 +1925,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1911,7 +1911,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/0001-fix-compile-failure-with-musl.patch b/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
index fef05cf3c8..13c1a36366 100644
--- 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 4a7d4d6e45c68708ec95335b0f11d6596b23095a Mon Sep 17 00:00:00 2001
+From 2e7534f3f7694ba426615b2061c235908097bb9b 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,17 +20,14 @@ 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 926ab79..7bf58a2 100644
+index 525950e..7180178 100644
 --- a/scd/app.c
 +++ b/scd/app.c
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
+@@ -24,6 +24,7 @@
  #include <string.h>
+ #include <unistd.h>
  #include <npth.h>
 +#include <unistd.h>
  
  #include "scdaemon.h"
  #include "../common/exechelp.h"
--- 
-2.27.0
-
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 945abb55ff..a7a6f03c7d 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 fa93b5f7c2da0e5846b80de9c6296966ca2a3d83 Mon Sep 17 00:00:00 2001
+From d5fc05998d7260fd94a558c53f6e6c35a384d163 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/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
index 761fd6c608..8aeb87dfd4 100644
--- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
+++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
@@ -1,4 +1,4 @@
-From e8f67e3bbbdbaa17cfe88c1f7a8f488eb4936281 Mon Sep 17 00:00:00 2001
+From 21396a6e74d188a2198439aa27403c29c1dbcea8 Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Wed, 16 Aug 2017 11:23:22 +0800
 Subject: [PATCH] autogen.sh: fix find-version for beta checking
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 5c4d81f87a..6fcbc2d18f 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 4e556a5edde8a97312abae63f8e9b5f989ca5c91 Mon Sep 17 00:00:00 2001
+From 3c761174b0ec6f49f184f16a0b0eaade44264edc 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,7 +13,7 @@ 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 3929108..d3a7b8f 100644
+index a73182e..9994a9a 100644
 --- a/common/homedir.c
 +++ b/common/homedir.c
 @@ -1439,7 +1439,7 @@ gnupg_socketdir (void)
diff --git a/meta/recipes-support/gnupg/gnupg_2.5.0.bb b/meta/recipes-support/gnupg/gnupg_2.5.1.bb
similarity index 87%
rename from meta/recipes-support/gnupg/gnupg_2.5.0.bb
rename to meta/recipes-support/gnupg/gnupg_2.5.1.bb
index 9cfdbdf0a4..080056f74c 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.0.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.1.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] = "2222c827d4e7087f15e7f72739d004abc1d05c6c5f0a5a12b24c6a6cc5d173fb"
+SRC_URI[sha256sum] = "8a34bb318499867962c939e156666ada93ed81f01926590ac68f3ff79178375e"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
@@ -32,17 +32,14 @@ EXTRA_OECONF = "--disable-ldap \
 		--with-bzip2=${STAGING_LIBDIR}/.. \
 		--with-readline=${STAGING_LIBDIR}/.. \
 		--with-mailprog=${sbindir}/sendmail \
-		--enable-gpg-is-gpg2 \
 		--disable-tests \
+		--disable-doc \
                "
-# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise
-CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m"
 
 # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg)
 PACKAGES =+ "${PN}-gpg"
 FILES:${PN}-gpg = " \
 	${bindir}/gpg \
-	${bindir}/gpg2 \
 	${bindir}/gpg-agent \
 "
 
@@ -62,11 +59,6 @@ do_configure:prepend () {
 	rm -f ${S}/m4/libgcrypt.m4
 }
 
-do_install:append() {
-	ln -sf gpg2 ${D}${bindir}/gpg
-	ln -sf gpgv2 ${D}${bindir}/gpgv
-}
-
 do_install:append:class-native() {
 	create_wrappers ${STAGING_BINDIR_NATIVE}
 }
@@ -76,7 +68,7 @@ do_install:append:class-nativesdk() {
 }
 
 create_wrappers() {
-	for i in gpg2 gpgconf gpg-agent gpg-connect-agent; do
+	for i in gpg gpgconf gpg-agent gpg-connect-agent; do
 		create_wrapper ${D}${bindir}/$i GNUPG_BINDIR=$1
 	done
 }
-- 
2.43.0

[styhead][PATCH 2/3] gnupg: upgrade 2.5.1 -> 2.5.2

[Guðni Már Gilbert]

From: Wang Mingyu <wangmy@cn.fujitsu.com>

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>
---
 .../0001-fix-compile-failure-with-musl.patch   |  8 ++++----
 .../recipes-support/gnupg/gnupg/relocate.patch | 18 +++++++++---------
 .../gnupg/{gnupg_2.5.1.bb => gnupg_2.5.2.bb}   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.5.1.bb => gnupg_2.5.2.bb} (97%)

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 13c1a36366..ec99f4b10c 100644
--- 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 6fcbc2d18f..08e70fb444 100644
--- 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 080056f74c..64c63e31ce 100644
--- 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 \
-- 
2.43.0

[styhead][PATCH 3/3] gnupg: remove obsolete patch

[Guðni Már Gilbert]

Remove a patch which is already merged in v2.5.1

See for reference:
https://github.com/gpg/gnupg/commit/1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f
https://dev.gnupg.org/T7193

Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
---
 .../0001-fix-compile-failure-with-musl.patch  | 33 -------------------
 meta/recipes-support/gnupg/gnupg_2.5.2.bb     |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch

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
deleted file mode 100644
index ec99f4b10c..0000000000
--- a/meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
-```
-../../gnupg-2.5.0/scd/app.c:379:3: error: implicit declaration of function 'write'; did you mean 'fwrite'? [-Wimplicit-function-declaration]
-  379 |   write (card_list_lock.notify_pipe[1], "", 1);
-      |   ^~~~~
-      |   fwrite
-```
-To access the Posix low level file interface such as open, read,
-write and close, should include <unistd.h>.
-
-Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- scd/app.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scd/app.c b/scd/app.c
-index ba7bb23..7d41e53 100644
---- a/scd/app.c
-+++ b/scd/app.c
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <npth.h>
-+#include <unistd.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_2.5.2.bb b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
index 64c63e31ce..8e87382f12 100644
--- a/meta/recipes-support/gnupg/gnupg_2.5.2.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.5.2.bb
@@ -18,7 +18,6 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0002-use-pkgconfig-instead-of-npth-config.patch \
            file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
            file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
-           file://0001-fix-compile-failure-with-musl.patch \
            "
 SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
                                 file://relocate.patch"
-- 
2.43.0

Re: [OE-core] [styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[Steve Sakoman]

I'm getting a build failure with this series:

| configure:
| ***
| *** You need libgpg-error to build this program.
| **  This library is for example available at
| ***   https://gnupg.org/ftp/gcrypt/gpgrt
| *** (at least version 1.51 is required.)
| ***
| configure: error:
| ***
| *** Required libraries not found. Please consult the above messages
| *** and install them before running configure again.
| ***
| NOTE: The following config.log files may provide further information.
| NOTE: /home/steve/builds/poky-contrib-styhead/build/tmp/work/core2-64-poky-linux/gnupg/2.5.2/build/config.log
| ERROR: configure failed
| WARNING: exit code 1 from a shell command.
ERROR: Task (/home/steve/builds/poky-contrib-styhead/meta/recipes-support/gnupg/gnupg_2.5.2.bb:do_configure)
failed with exit code '1'

Steve

On Sat, Jan 25, 2025 at 7:42 AM Guðni Már Gilbert via
lists.openembedded.org <gudni.m.g=gmail.com@lists.openembedded.org>
wrote:
>
>
> Guðni Már Gilbert (1):
>   gnupg: remove obsolete patch
>
> Wang Mingyu (1):
>   gnupg: upgrade 2.5.1 -> 2.5.2
>
> hongxu (1):
>   gnupg: upgrade 2.5.0 -> 2.5.1
>
>  ...erride-init-is-not-needed-with-gcc-9.patch |  2 +-
>  ...-a-custom-value-for-the-location-of-.patch |  6 ++--
>  .../0001-fix-compile-failure-with-musl.patch  | 36 -------------------
>  ...use-pkgconfig-instead-of-npth-config.patch |  2 +-
>  ...h-fix-find-version-for-beta-checking.patch |  2 +-
>  .../gnupg/gnupg/relocate.patch                | 18 +++++-----
>  .../gnupg/{gnupg_2.5.0.bb => gnupg_2.5.2.bb}  | 15 ++------
>  7 files changed, 18 insertions(+), 63 deletions(-)
>  delete mode 100644 meta/recipes-support/gnupg/gnupg/0001-fix-compile-failure-with-musl.patch
>  rename meta/recipes-support/gnupg/{gnupg_2.5.0.bb => gnupg_2.5.2.bb} (85%)
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#210265): https://lists.openembedded.org/g/openembedded-core/message/210265
> Mute This Topic: https://lists.openembedded.org/mt/110808443/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[Guðni Már Gilbert]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Looks like we need to cherry pick this also: https://git.openembedded.org/openembedded-core/commit/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb?id=d6d4ddf023dcda0345e0ca646d6774c964c7917c

I’ll send a v2 once I have tested locally. Sorry for the trouble.

[-- Attachment #2: Type: text/html, Size: 517 bytes --]

Re: [OE-core] [styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[Alexander Kanavin]

Sadly we made a mistake in updating gnupg recipe to 2.5.0 which is a
development release, and further 2.5.x releases do add new features.

Gnupg follows the odd-even scheme, as seen here:
https://www.gnupg.org/download/index.html

or here:
https://dev.gnupg.org/source/gnupg/branches/master/

Updating to point releases in stable 2.4.x or 2.2.x series would've
been fine, but this isn't.

Alex

On Wed, 29 Jan 2025 at 19:11, Guðni Már Gilbert via
lists.openembedded.org <gudni.m.g=gmail.com@lists.openembedded.org>
wrote:
>
> Looks like we need to cherry pick this also: https://git.openembedded.org/openembedded-core/commit/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb?id=d6d4ddf023dcda0345e0ca646d6774c964c7917c
>
> I’ll send a v2 once I have tested locally. Sorry for the trouble.
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#210403): https://lists.openembedded.org/g/openembedded-core/message/210403
> Mute This Topic: https://lists.openembedded.org/mt/110808443/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [styhead][PATCH 0/3] Cherry pick commits from master to sync styhead's gnupg recipe.

[Guðni Már Gilbert]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

Hi Alexander, thanks for this info, I didn't know this.

I will look into upgrading Scarthgap's 2.4.x then instead to latest patch release. :)

[-- Attachment #2: Type: text/html, Size: 185 bytes --]