diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-11-09 17:07:04 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-08 20:12:01 +0000 |
| commit | 5c8a8465d24b33f53a7e3bc4dc1d0dfbb14685d6 (patch) | |
| tree | 98f2182b4b59ed664b9d0aea51e345e673f5bfcc | |
| parent | 7c062c9d2c48cd758b3ca9a4c7a5b26d74b9c1e3 (diff) | |
| download | openembedded-core-5c8a8465d24b33f53a7e3bc4dc1d0dfbb14685d6.tar.gz openembedded-core-5c8a8465d24b33f53a7e3bc4dc1d0dfbb14685d6.tar.bz2 openembedded-core-5c8a8465d24b33f53a7e3bc4dc1d0dfbb14685d6.zip | |
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch | 4 | ||||
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 12 | ||||
| -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 @@ -From 7eb7efb9ce89c66e14c194773c4dcf6478a6ca4d Mon Sep 17 00:00:00 2001 +From e30c1d3f3bb40bfaa83f768b8651f587c9d17e6f 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 @@ -14,7 +14,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 59a2e60..12d390b 100644 +index f77317f..749fcaa 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ -Allow the environment to override where gnupg looks for its own files. Useful in native builds. +From 5a8258dde5ad17b4a53463d7184cf782a7594977 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. Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + common/homedir.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + diff --git a/common/homedir.c b/common/homedir.c -index e9e75d01e..19140aa0d 100644 +index e9e75d0..19140aa 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -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- file://relocate.patch" -SRC_URI[md5sum] = "52c895a81f514a65e08923736c38654a" -SRC_URI[sha256sum] = "6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164" +SRC_URI[md5sum] = "3ae8bd6246367602e72571f7a6588bcd" +SRC_URI[sha256sum] = "799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ |