diff options
-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 | 18 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_2.2.26.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.23.bb) | 2 |
4 files changed, 13 insertions, 15 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 c641a19616..a0af2d48dc 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 56343af532389c31eab32c096c9a989c53c78ce0 Mon Sep 17 00:00:00 2001 | 1 | From abc5c396aaddaef2e6811362e3e0cc0da28c2b34 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 1d05d39..eaaf33c 100644 | 17 | index 64cb8c6..3fe9027 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -1858,7 +1858,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", | 20 | @@ -1824,7 +1824,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 index 607a09f188..a13b4d5fb5 100644 --- a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch +++ b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9a901dbb1c48685f2db6d7b55916c9484e871f16 Mon Sep 17 00:00:00 2001 | 1 | From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 | 3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 |
4 | Subject: [PATCH] dirmngr uses libgpg error | 4 | Subject: [PATCH] dirmngr uses libgpg error |
@@ -11,20 +11,18 @@ Rebase to 2.1.23 | |||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | dirmngr/Makefile.am | 3 ++- | 14 | dirmngr/Makefile.am | 1 + |
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+) |
16 | 16 | ||
17 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am | 17 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am |
18 | index 208a813..292c036 100644 | 18 | index 00d3c42..450d873 100644 |
19 | --- a/dirmngr/Makefile.am | 19 | --- a/dirmngr/Makefile.am |
20 | +++ b/dirmngr/Makefile.am | 20 | +++ b/dirmngr/Makefile.am |
21 | @@ -90,7 +90,8 @@ endif | 21 | @@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \ |
22 | dirmngr_LDADD = $(libcommonpth) \ | ||
23 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ | 22 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ |
24 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ | 23 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ |
25 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) | 24 | $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ |
26 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ | 25 | + $(GPG_ERROR_LIBS) \ |
27 | + $(GPG_ERROR_LIBS) | 26 | $(dirmngr_robj) |
28 | if USE_LDAP | 27 | if USE_LDAP |
29 | dirmngr_LDADD += $(ldaplibs) | 28 | dirmngr_LDADD += $(ldaplibs) |
30 | endif | ||
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index aa8d1e3cc2..7f7812cd46 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4005b3342db06749453835720b5a5c2392a90810 Mon Sep 17 00:00:00 2001 | 1 | From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b 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.23.bb b/meta/recipes-support/gnupg/gnupg_2.2.26.bb index c624b67a0b..1c6e68b4b1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.2.23.bb +++ b/meta/recipes-support/gnupg/gnupg_2.2.26.bb | |||
@@ -20,7 +20,7 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for- | |||
20 | file://relocate.patch" | 20 | file://relocate.patch" |
21 | SRC_URI_append_class-nativesdk = " file://relocate.patch" | 21 | SRC_URI_append_class-nativesdk = " file://relocate.patch" |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c" | 23 | SRC_URI[sha256sum] = "517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d" |
24 | 24 | ||
25 | EXTRA_OECONF = "--disable-ldap \ | 25 | EXTRA_OECONF = "--disable-ldap \ |
26 | --disable-ccid-driver \ | 26 | --disable-ccid-driver \ |