diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-07-25 16:10:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-01 16:27:29 +0100 |
commit | 4f2f86189582c95e1aca12eec1e832b17e04cb86 (patch) | |
tree | 1733352a7c604fd10bf487294fd303689bcec7bb | |
parent | 63aeff6e16b8e24e21f7b2331d53214fbdc97e3c (diff) | |
download | poky-4f2f86189582c95e1aca12eec1e832b17e04cb86.tar.gz |
gnupg: update 2.3.4 -> 2.3.6
Remove 0003-dirmngr-uses-libgpg-error.patch
(upstream addressed the issue).
(From OE-Core rev: 4e9c180baf5fea79a2ca472651b782038051b837)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Yue Tao <yue.tao@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.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-.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 18 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.3.6.bb (renamed from meta/recipes-support/gnupg/gnupg_2.3.4.bb) | 3 |
4 files changed, 13 insertions, 43 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 b58fbfe6f5..c4ede9ea5e 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 bdde1faa774753e29d582d79186e08a38597de9e Mon Sep 17 00:00:00 2001 | 1 | From 89b98553084fbefe1ef2c7cbff9e72cf43144c49 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 5cdd316..e5f2d6a 100644 | 17 | index d86c60e..65c22b2 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -1962,7 +1962,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", | 20 | @@ -1955,7 +1955,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/0003-dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch deleted file mode 100644 index b4106d3620..0000000000 --- a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 9ace8f1b68ab708c44dce4c0152b975fbceb0398 Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 | ||
4 | Subject: [PATCH] dirmngr uses libgpg error | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
8 | |||
9 | Rebase to 2.1.23 | ||
10 | |||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | |||
13 | --- | ||
14 | dirmngr/Makefile.am | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am | ||
18 | index 77ca3f5..1446775 100644 | ||
19 | --- a/dirmngr/Makefile.am | ||
20 | +++ b/dirmngr/Makefile.am | ||
21 | @@ -86,7 +86,7 @@ endif | ||
22 | dirmngr_LDADD = $(libcommonpth) \ | ||
23 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ | ||
24 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ | ||
25 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) | ||
26 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) $(GPG_ERROR_LIBS) | ||
27 | if USE_LDAP | ||
28 | dirmngr_LDADD += $(ldaplibs) | ||
29 | endif | ||
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 74f48e9582..43999b8a6d 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1e34e1d477f843c0ee2f1a3fddc20201f0233e81 Mon Sep 17 00:00:00 2001 | 1 | From 89ae4f03307104689e1857d9857d452af6b35ac4 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 |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
14 | 1 file changed, 7 insertions(+), 7 deletions(-) | 14 | 1 file changed, 7 insertions(+), 7 deletions(-) |
15 | 15 | ||
16 | diff --git a/common/homedir.c b/common/homedir.c | 16 | diff --git a/common/homedir.c b/common/homedir.c |
17 | index 174d961..f4c25fb 100644 | 17 | index 260aeb2..1aeb08d 100644 |
18 | --- a/common/homedir.c | 18 | --- a/common/homedir.c |
19 | +++ b/common/homedir.c | 19 | +++ b/common/homedir.c |
20 | @@ -1161,7 +1161,7 @@ gnupg_socketdir (void) | 20 | @@ -1143,7 +1143,7 @@ gnupg_socketdir (void) |
21 | if (!name) | 21 | if (!name) |
22 | { | 22 | { |
23 | unsigned int dummy; | 23 | unsigned int dummy; |
@@ -26,7 +26,7 @@ index 174d961..f4c25fb 100644 | |||
26 | gpgrt_annotate_leaked_object (name); | 26 | gpgrt_annotate_leaked_object (name); |
27 | } | 27 | } |
28 | 28 | ||
29 | @@ -1193,7 +1193,7 @@ gnupg_sysconfdir (void) | 29 | @@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void) |
30 | if (dir) | 30 | if (dir) |
31 | return dir; | 31 | return dir; |
32 | else | 32 | else |
@@ -35,7 +35,7 @@ index 174d961..f4c25fb 100644 | |||
35 | #endif /*!HAVE_W32_SYSTEM*/ | 35 | #endif /*!HAVE_W32_SYSTEM*/ |
36 | } | 36 | } |
37 | 37 | ||
38 | @@ -1229,7 +1229,7 @@ gnupg_bindir (void) | 38 | @@ -1211,7 +1211,7 @@ gnupg_bindir (void) |
39 | return name; | 39 | return name; |
40 | } | 40 | } |
41 | else | 41 | else |
@@ -44,7 +44,7 @@ index 174d961..f4c25fb 100644 | |||
44 | #endif /*!HAVE_W32_SYSTEM*/ | 44 | #endif /*!HAVE_W32_SYSTEM*/ |
45 | } | 45 | } |
46 | 46 | ||
47 | @@ -1256,7 +1256,7 @@ gnupg_libexecdir (void) | 47 | @@ -1238,7 +1238,7 @@ gnupg_libexecdir (void) |
48 | return name; | 48 | return name; |
49 | } | 49 | } |
50 | else | 50 | else |
@@ -53,7 +53,7 @@ index 174d961..f4c25fb 100644 | |||
53 | #endif /*!HAVE_W32_SYSTEM*/ | 53 | #endif /*!HAVE_W32_SYSTEM*/ |
54 | } | 54 | } |
55 | 55 | ||
56 | @@ -1286,7 +1286,7 @@ gnupg_libdir (void) | 56 | @@ -1268,7 +1268,7 @@ gnupg_libdir (void) |
57 | return name; | 57 | return name; |
58 | } | 58 | } |
59 | else | 59 | else |
@@ -62,7 +62,7 @@ index 174d961..f4c25fb 100644 | |||
62 | #endif /*!HAVE_W32_SYSTEM*/ | 62 | #endif /*!HAVE_W32_SYSTEM*/ |
63 | } | 63 | } |
64 | 64 | ||
65 | @@ -1317,7 +1317,7 @@ gnupg_datadir (void) | 65 | @@ -1299,7 +1299,7 @@ gnupg_datadir (void) |
66 | return name; | 66 | return name; |
67 | } | 67 | } |
68 | else | 68 | else |
@@ -71,7 +71,7 @@ index 174d961..f4c25fb 100644 | |||
71 | #endif /*!HAVE_W32_SYSTEM*/ | 71 | #endif /*!HAVE_W32_SYSTEM*/ |
72 | } | 72 | } |
73 | 73 | ||
74 | @@ -1349,7 +1349,7 @@ gnupg_localedir (void) | 74 | @@ -1331,7 +1331,7 @@ gnupg_localedir (void) |
75 | return name; | 75 | return name; |
76 | } | 76 | } |
77 | else | 77 | else |
diff --git a/meta/recipes-support/gnupg/gnupg_2.3.4.bb b/meta/recipes-support/gnupg/gnupg_2.3.6.bb index d27bddb8bd..f35eb8c75a 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.6.bb | |||
@@ -16,7 +16,6 @@ inherit autotools gettext texinfo pkgconfig | |||
16 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | 16 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" |
17 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 17 | SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
18 | file://0002-use-pkgconfig-instead-of-npth-config.patch \ | 18 | file://0002-use-pkgconfig-instead-of-npth-config.patch \ |
19 | file://0003-dirmngr-uses-libgpg-error.patch \ | ||
20 | file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ | 19 | file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ |
21 | file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ | 20 | file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ |
22 | " | 21 | " |
@@ -24,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- | |||
24 | file://relocate.patch" | 23 | file://relocate.patch" |
25 | SRC_URI:append:class-nativesdk = " file://relocate.patch" | 24 | SRC_URI:append:class-nativesdk = " file://relocate.patch" |
26 | 25 | ||
27 | SRC_URI[sha256sum] = "f3468ecafb1d7f9ad7b51fd1db7aebf17ceb89d2efa8a05cf2f39b4d405402ae" | 26 | SRC_URI[sha256sum] = "21f7fe2fc5c2f214184ab050977ec7a8e304e58bfae2ab098fec69f8fabda9c1" |
28 | 27 | ||
29 | EXTRA_OECONF = "--disable-ldap \ | 28 | EXTRA_OECONF = "--disable-ldap \ |
30 | --disable-ccid-driver \ | 29 | --disable-ccid-driver \ |