[PATCH 07/24] gnupg: upgrade 2.3.3 -> 2.3.4

Otavio Salvador
2022-01-03T16:19:27Z

...-a-custom-value-for-the-location-of-.patch | 5 ++--
.../gnupg/gnupg/relocate.patch | 23 +++++++++----------
.../gnupg/{gnupg_2.3.3.bb => gnupg_2.3.4.bb} | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.3.3.bb => gnupg_2.3.4.bb} (97%)

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 b58fbfe6f5..d97adb1410 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,8 +1,9 @@
-From bdde1faa774753e29d582d79186e08a38597de9e Mon Sep 17 00:00:00 2001
+From 1dd6b8e97c101390a24c4de6d5e67ea835979a8f 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
gpg-agent socket in the filesystem
+Organization: O.S. Systems Software LTDA.

This should avoid clashes with the host gpg-agent observed on autobuilders.

@@ -14,7 +15,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 5cdd316..e5f2d6a 100644
+index 313b113..25ded07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1962,7 +1962,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 53679bf1d9..085726a15b 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,22 +1,24 @@
-From 766d37fe9acd9fdaaff9c094635e06b50c5902d7 Mon Sep 17 00:00:00 2001
+From a6e914220fa5b28e545122c992fefbbf6f8aa986 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
own files. Useful in native builds.
+Organization: O.S. Systems Software LTDA.

Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
---
common/homedir.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/homedir.c b/common/homedir.c
-index 455c188..55049db 100644
+index 174d961..f4c25fb 100644
--- a/common/homedir.c
+++ b/common/homedir.c
-@@ -1155,7 +1155,7 @@ gnupg_socketdir (void)
+@@ -1161,7 +1161,7 @@ gnupg_socketdir (void)
if (!name)
{
unsigned int dummy;
@@ -25,7 +27,7 @@ index 455c188..55049db 100644
gpgrt_annotate_leaked_object (name);
}

-@@ -1187,7 +1187,7 @@ gnupg_sysconfdir (void)
+@@ -1193,7 +1193,7 @@ gnupg_sysconfdir (void)
if (dir)
return dir;
else
@@ -34,7 +36,7 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

-@@ -1223,7 +1223,7 @@ gnupg_bindir (void)
+@@ -1229,7 +1229,7 @@ gnupg_bindir (void)
return name;
}
else
@@ -43,7 +45,7 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

-@@ -1250,7 +1250,7 @@ gnupg_libexecdir (void)
+@@ -1256,7 +1256,7 @@ gnupg_libexecdir (void)
return name;
}
else
@@ -52,7 +54,7 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

-@@ -1280,7 +1280,7 @@ gnupg_libdir (void)
+@@ -1286,7 +1286,7 @@ gnupg_libdir (void)
return name;
}
else
@@ -61,7 +63,7 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

-@@ -1311,7 +1311,7 @@ gnupg_datadir (void)
+@@ -1317,7 +1317,7 @@ gnupg_datadir (void)
return name;
}
else
@@ -70,7 +72,7 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

-@@ -1343,7 +1343,7 @@ gnupg_localedir (void)
+@@ -1349,7 +1349,7 @@ gnupg_localedir (void)
return name;
}
else
@@ -79,6 +81,3 @@ index 455c188..55049db 100644
#endif /*!HAVE_W32_SYSTEM*/
}

---
-2.20.1
-
diff --git a/meta/recipes-support/gnupg/gnupg_2.3.3.bb b/meta/recipes-support/gnupg/gnupg_2.3.4.bb
similarity index 97%
rename from meta/recipes-support/gnupg/gnupg_2.3.3.bb
rename to meta/recipes-support/gnupg/gnupg_2.3.4.bb
index 5614ac6473..7faaffbc27 100644
--- a/meta/recipes-support/gnupg/gnupg_2.3.3.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.3.4.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] = "5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937"
+SRC_URI[sha256sum] = "f3468ecafb1d7f9ad7b51fd1db7aebf17ceb89d2efa8a05cf2f39b4d405402ae"

EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
2.34.0