From 0c2365540ae61fe6fab61fb076ddb976ca26ce47 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Sep 2023 18:56:28 +0200 Subject: [PATCH] gnupg: upgrade 2.4.2 -> 2.4.3 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-a-custom-value-for-the-location-of-.patch | 4 +-- .../gnupg/gnupg/fix-ldap.patch | 34 +++++++++++++++++++ .../gnupg/gnupg/relocate.patch | 2 +- .../gnupg/{gnupg_2.4.2.bb => gnupg_2.4.3.bb} | 3 +- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-support/gnupg/gnupg/fix-ldap.patch rename meta/recipes-support/gnupg/{gnupg_2.4.2.bb => gnupg_2.4.3.bb} (96%) 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 81aeaf5d3a6..561616584c9 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 8b9e3d286e87bc978ec6bb9cfd790d8d253b79c3 Mon Sep 17 00:00:00 2001 +From acdb7e1d2844cd4088f099617e25352b3dc5b075 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 @@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index a547401..60bc2c5 100644 +index e68b779..eec9f89 100644 --- a/configure.ac +++ b/configure.ac @@ -1922,7 +1922,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", diff --git a/meta/recipes-support/gnupg/gnupg/fix-ldap.patch b/meta/recipes-support/gnupg/gnupg/fix-ldap.patch new file mode 100644 index 00000000000..47547815656 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/fix-ldap.patch @@ -0,0 +1,34 @@ +From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 5 Jul 2023 09:29:54 +0900 +Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when + USE_LDAP. + +* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. + +-- + +Upstream-Status: Backport +Signed-off-by: NIIBE Yutaka +Signed-off-by: Alexander Kanavin +--- + dirmngr/server.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/server.c b/dirmngr/server.c +index 51a149cb2..ee61f63d6 100644 +--- a/dirmngr/server.c ++++ b/dirmngr/server.c +@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) + + if (opt_help) + { ++#if USE_LDAP + ks_ldap_help_variables (ctrl); ++#endif + err = 0; + goto leave; + } +-- +2.11.0 + diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index f7dd12fbcc1..d540e9edbb0 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From c4ddea8e6070d1df51058aac08088e27c37e7e73 Mon Sep 17 00:00:00 2001 +From 0e4b325c199354ce54cc4687532cced1440fd496 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 diff --git a/meta/recipes-support/gnupg/gnupg_2.4.2.bb b/meta/recipes-support/gnupg/gnupg_2.4.3.bb similarity index 96% rename from meta/recipes-support/gnupg/gnupg_2.4.2.bb rename to meta/recipes-support/gnupg/gnupg_2.4.3.bb index 631df8ac9d7..e91ef34b7d3 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.2.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.3.bb @@ -18,12 +18,13 @@ 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://fix-ldap.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] = "97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49" +SRC_URI[sha256sum] = "a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ -- 2.47.2