summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-11-09 17:07:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:39 +0000
commitec206ffe9eb0a45380d4c8d4d1ad9c69a32db9d3 (patch)
tree4c4125ec1542d1824c8da347fbe34987686e89a2 /meta/recipes-support
parent14898aa4750f13bbfa4c9c7719bcdeb5f7f457c5 (diff)
downloadpoky-ec206ffe9eb0a45380d4c8d4d1ad9c69a32db9d3.tar.gz
gnupg: upgrade 2.2.9 -> 2.2.10
(From OE-Core rev: 5efe9eb79ac325f55fc52f67b522afaf7ebb847a) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch4
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch12
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.10.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.9.bb)4
3 files changed, 14 insertions, 6 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 5f1dd30f87..26ac99eee3 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 @@
1From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001 1From e30c1d3f3bb40bfaa83f768b8651f587c9d17e6f 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] configure.ac: use a custom value for the location of
@@ -14,7 +14,7 @@ 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 59a2e60..12d390b 100644 17index f77317f..749fcaa 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", 20@@ -1841,7 +1841,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 87ec409ca3..616f32a443 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,10 +1,18 @@
1Allow the environment to override where gnupg looks for its own files. Useful in native builds. 1From 5a8258dde5ad17b4a53463d7184cf782a7594977 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 19 Sep 2018 14:44:40 +0100
4Subject: [PATCH] Allow the environment to override where gnupg looks for its
5 own files. Useful in native builds.
2 6
3Upstream-Status: Inappropriate [OE-specific] 7Upstream-Status: Inappropriate [OE-specific]
4Signed-off-by: Ross Burton <ross.burton@intel.com> 8Signed-off-by: Ross Burton <ross.burton@intel.com>
5 9
10---
11 common/homedir.c | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-)
13
6diff --git a/common/homedir.c b/common/homedir.c 14diff --git a/common/homedir.c b/common/homedir.c
7index e9e75d01e..19140aa0d 100644 15index e9e75d0..19140aa 100644
8--- a/common/homedir.c 16--- a/common/homedir.c
9+++ b/common/homedir.c 17+++ b/common/homedir.c
10@@ -760,7 +760,7 @@ gnupg_socketdir (void) 18@@ -760,7 +760,7 @@ gnupg_socketdir (void)
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.9.bb b/meta/recipes-support/gnupg/gnupg_2.2.10.bb
index b7d23b8d39..fba2fdf5d3 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.9.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.10.bb
@@ -19,8 +19,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
19 file://relocate.patch" 19 file://relocate.patch"
20 20
21 21
22SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a" 22SRC_URI[md5sum] = "3ae8bd6246367602e72571f7a6588bcd"
23SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164" 23SRC_URI[sha256sum] = "799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915"
24 24
25EXTRA_OECONF = "--disable-ldap \ 25EXTRA_OECONF = "--disable-ldap \
26 --disable-ccid-driver \ 26 --disable-ccid-driver \