summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2020-03-15 18:13:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-08 23:07:12 (GMT)
commit0b55331e6338e7cbd0e521ed0e868502afefd42e (patch)
tree2cd1f784b0b35c8769e05f0db0c5933cc9a7d1f6
parentf12e9bf5055779a951f26594208d9f69a04a0afd (diff)
downloadpoky-0b55331e6338e7cbd0e521ed0e868502afefd42e.tar.gz
gnupg: update to 2.2.15
(From OE-Core rev: e60b3994d4bc282191302e1fd9b7d2106ee2f6cb) (From OE-Core rev: 431bd084f71f9479c2ff9f37237799ad1f02d289) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch13
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.2.15.bb (renamed from meta/recipes-support/gnupg/gnupg_2.2.13.bb)4
2 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
index 4a280f9..83195b5 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
@@ -1,4 +1,4 @@
1From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001 1From e3adc816d2d56dd929016073937ba24e01e03cb8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 20 Dec 2018 17:37:48 -0800 3Date: Thu, 20 Dec 2018 17:37:48 -0800
4Subject: [PATCH] Woverride-init is not needed with gcc 9 4Subject: [PATCH] Woverride-init is not needed with gcc 9
@@ -17,15 +17,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/dirmngr/dns.h b/dirmngr/dns.h 19diff --git a/dirmngr/dns.h b/dirmngr/dns.h
20index 30d0b45..98fe412 100644 20index 024d6dcc8..c6e141e16 100644
21--- a/dirmngr/dns.h 21--- a/dirmngr/dns.h
22+++ b/dirmngr/dns.h 22+++ b/dirmngr/dns.h
23@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void); 23@@ -139,7 +139,7 @@ DNS_PUBLIC int *dns_debug_p(void);
24 #define DNS_PRAGMA_QUIET _Pragma("clang diagnostic ignored \"-Winitializer-overrides\"")
25 #define DNS_PRAGMA_POP _Pragma("clang diagnostic pop")
24 26
25 #define dns_quietinit(...) \
26 DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
27-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 27-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
28+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9) 28+#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9)
29 #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push") 29 #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
30 #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"") 30 #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
31 #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop") 31 #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
32--
332.17.1
34
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.13.bb b/meta/recipes-support/gnupg/gnupg_2.2.15.bb
index 3ce2a38..06a2573 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.13.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.15.bb
@@ -20,8 +20,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
20 file://relocate.patch" 20 file://relocate.patch"
21 21
22 22
23SRC_URI[md5sum] = "563b959d0c3856e34526e9ca51c80d7b" 23SRC_URI[md5sum] = "3ab87e377aa0af2f463649515bf66508"
24SRC_URI[sha256sum] = "76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8" 24SRC_URI[sha256sum] = "cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454"
25 25
26EXTRA_OECONF = "--disable-ldap \ 26EXTRA_OECONF = "--disable-ldap \
27 --disable-ccid-driver \ 27 --disable-ccid-driver \