summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-11-23 15:47:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-23 23:32:10 +0000
commit4a373ce7d718ee3299bcf7f9fa62e7337d41e40a (patch)
treebb3833c40dbcf61adebc5ac22b671112ca30dc6d
parent8748de4df5a4ece303f07f8bbb248920a199478a (diff)
downloadopenembedded-core-contrib-4a373ce7d718ee3299bcf7f9fa62e7337d41e40a.tar.gz
gnupg: upgrade 2.2.10 -> 2.2.11
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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-.patch4
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch2
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.11.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.10.bb)4
3 files changed, 5 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 26ac99eee3..ab0b6dccc4 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 e30c1d3f3bb40bfaa83f768b8651f587c9d17e6f Mon Sep 17 00:00:00 2001
+From 5f38f1276a3651c30bddc508122da2e7d2d3ca92 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 f77317f..749fcaa 100644
+index 8c80377..a66d393 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 616f32a443..860f7f1d96 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 5a8258dde5ad17b4a53463d7184cf782a7594977 Mon Sep 17 00:00:00 2001
+From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf 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
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.10.bb b/meta/recipes-support/gnupg/gnupg_2.2.11.bb
index fba2fdf5d3..d259ed5324 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.10.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.11.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] = "3ae8bd6246367602e72571f7a6588bcd"
-SRC_URI[sha256sum] = "799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915"
+SRC_URI[md5sum] = "e23a896d634e8b81681314780f5158a4"
+SRC_URI[sha256sum] = "496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \