summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-17 16:39:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-06 16:26:52 (GMT)
commit77f078eebbd80d4aee69a02c256d14183886b144 (patch)
tree32675c7aff7ddccbbd99819a87a4fbb70474e38f
parent0232861cfd0c056bebf4302f5dab973490e2481b (diff)
downloadpoky-77f078eebbd80d4aee69a02c256d14183886b144.tar.gz
gnupg: upgrade 2.2.8 -> 2.2.9
(From OE-Core rev: b7da8d50ebc2f44376d352d001371e03f465e3be) (From OE-Core rev: 23043b5d94f1e126876143a47f87fa3baabd60e8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch11
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.9.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.8.bb)4
2 files changed, 6 insertions, 9 deletions
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 5d9bbac..5f1dd30 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,7 +1,7 @@
1From 338d073cab7b94fd7ec66322b969e8772b5e8cd7 Mon Sep 17 00:00:00 2001 1From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Jan 2018 18:00:21 +0200 3Date: Mon, 22 Jan 2018 18:00:21 +0200
4Subject: [PATCH 5/5] configure.ac: use a custom value for the location of 4Subject: [PATCH] configure.ac: use a custom value for the location of
5 gpg-agent socket in the filesystem 5 gpg-agent socket in the filesystem
6 6
7This should avoid clashes with the host gpg-agent observed on autobuilders. 7This should avoid clashes with the host gpg-agent observed on autobuilders.
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 382ef1d..0570d7c 100644 17index 59a2e60..12d390b 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1818,7 +1818,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", 20@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
21 21
22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) 22 AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
23 23
@@ -26,6 +26,3 @@ index 382ef1d..0570d7c 100644
26 [The name of the agent socket]) 26 [The name of the agent socket])
27 AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra", 27 AC_DEFINE_UNQUOTED(GPG_AGENT_EXTRA_SOCK_NAME, "S.gpg-agent.extra",
28 [The name of the agent socket for remote access]) 28 [The name of the agent socket for remote access])
29--
302.7.4
31
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.8.bb b/meta/recipes-support/gnupg/gnupg_2.2.9.bb
index 35a033c..4f815df 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.8.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.9.bb
@@ -18,8 +18,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
18SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch" 18SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch"
19 19
20 20
21SRC_URI[md5sum] = "0db6d8ec569e260435a7d2bfb2ecfe5c" 21SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a"
22SRC_URI[sha256sum] = "777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd" 22SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164"
23 23
24EXTRA_OECONF = "--disable-ldap \ 24EXTRA_OECONF = "--disable-ldap \
25 --disable-ccid-driver \ 25 --disable-ccid-driver \