diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-12-26 12:09:46 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-27 22:52:58 +0000 |
commit | ad4177229ba93a2061c9bfce7bd9e1b609e672e8 (patch) | |
tree | 44af750403d8f958514ee1fac4ee80b69864c409 /meta/recipes-support/gnupg | |
parent | 549854c05ed8e21691c4076b29b92ee998cf6e72 (diff) | |
download | poky-ad4177229ba93a2061c9bfce7bd9e1b609e672e8.tar.gz |
gnupg: Upgrade to 2.2.12 release
(From OE-Core rev: af3e1bbcc615adfc1f915448afe9c794ad938522)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.2.12.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.11.bb) | 4 |
3 files changed, 6 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 ab0b6dccc4..3f1c3abaeb 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 @@ | |||
1 | From 5f38f1276a3651c30bddc508122da2e7d2d3ca92 Mon Sep 17 00:00:00 2001 | 1 | From 8eb4d25c25a1c1323797d94e0727a3e42b7f3287 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 22 Jan 2018 18:00:21 +0200 | 3 | Date: Mon, 22 Jan 2018 18:00:21 +0200 |
4 | Subject: [PATCH] configure.ac: use a custom value for the location of | 4 | Subject: [PATCH] configure.ac: use a custom value for the location of |
@@ -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 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 8c80377..a66d393 100644 | 17 | index 4d66af9..b9ef235 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 | @@ -1848,7 +1848,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 | ||
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 860f7f1d96..c494ef80b7 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf Mon Sep 17 00:00:00 2001 | 1 | From f9fc214b0bf2f67b515ca8a5333f39c497d1b518 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 | 3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 |
4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its | 4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its |
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.11.bb b/meta/recipes-support/gnupg/gnupg_2.2.12.bb index d259ed5324..1f381c2d91 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.11.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.12.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 | ||
22 | SRC_URI[md5sum] = "e23a896d634e8b81681314780f5158a4" | 22 | SRC_URI[md5sum] = "421b17028878b253c5acfef056bc6141" |
23 | SRC_URI[sha256sum] = "496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9" | 23 | SRC_URI[sha256sum] = "db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb" |
24 | 24 | ||
25 | EXTRA_OECONF = "--disable-ldap \ | 25 | EXTRA_OECONF = "--disable-ldap \ |
26 | --disable-ccid-driver \ | 26 | --disable-ccid-driver \ |