summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-03-30 02:46:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commit38f1d8b32cda3d3bf8c0d73769ee93dc13c5090f (patch)
tree67456d823e43209357d96bb47bae5bb309fa8412 /meta
parent5e161f426676ade20a213b07c1fd69a8c3cf5ece (diff)
downloadpoky-38f1d8b32cda3d3bf8c0d73769ee93dc13c5090f.tar.gz
gnupg: upgrade 2.2.4 -> 2.2.5
(From OE-Core rev: 37b17c45e643171e3cfb9a4b1f84c6f0ee934a94) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch7
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.5.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.4.bb)4
2 files changed, 6 insertions, 5 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 3e3a64df2f..5d9bbacb74 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,13 +1,14 @@
1From 0b97148c3aad0993a9aeb088596fa63a2fec5328 Mon Sep 17 00:00:00 2001 1From 338d073cab7b94fd7ec66322b969e8772b5e8cd7 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] configure.ac: use a custom value for the location of 4Subject: [PATCH 5/5] 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.
8 8
9Upstream-Status: Inappropriate [oe-core specific, and only for -native] 9Upstream-Status: Inappropriate [oe-core specific, and only for -native]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
11--- 12---
12 configure.ac | 2 +- 13 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -26,5 +27,5 @@ index 382ef1d..0570d7c 100644
26 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",
27 [The name of the agent socket for remote access]) 28 [The name of the agent socket for remote access])
28-- 29--
292.15.1 302.7.4
30 31
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/meta/recipes-support/gnupg/gnupg_2.2.5.bb
index d3f1a8f4c4..f6d5dad254 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.4.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.5.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] = "709e5af5bba84d251c520222e720972f" 21SRC_URI[md5sum] = "567cd2d41fa632903066fde73d2005cb"
22SRC_URI[sha256sum] = "401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec" 22SRC_URI[sha256sum] = "3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57"
23 23
24EXTRA_OECONF = "--disable-ldap \ 24EXTRA_OECONF = "--disable-ldap \
25 --disable-ccid-driver \ 25 --disable-ccid-driver \