Skip to contentSkip to conversation

gnupg: update to 2.2.15

PATCH In review Adrian Bunk 2 participants 5 messages Mar 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 gnupg: update to 2.2.15

From: Oleksandr Kravchuk <[email protected]>

(From OE-Core rev: e60b3994d4bc282191302e1fd9b7d2106ee2f6cb)

---
 ...01-Woverride-init-is-not-needed-with-gcc-9.patch | 13 ++++++++-----
 .../gnupg/{gnupg_2.2.13.bb => gnupg_2.2.15.bb}      |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.2.13.bb => gnupg_2.2.15.bb} (93%)
meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch +8 -5
index 4a280f9d5c..83195b5bd4 100644
@@ -1,4 +1,4 @@
-From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001
+From e3adc816d2d56dd929016073937ba24e01e03cb8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 20 Dec 2018 17:37:48 -0800
 Subject: [PATCH] Woverride-init is not needed with gcc 9
@@ -17,15 +17,18 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dirmngr/dns.h b/dirmngr/dns.h
-index 30d0b45..98fe412 100644
+index 024d6dcc8..c6e141e16 100644
 --- a/dirmngr/dns.h
 +++ b/dirmngr/dns.h
-@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void);
+@@ -139,7 +139,7 @@ DNS_PUBLIC int *dns_debug_p(void);
+ #define DNS_PRAGMA_QUIET _Pragma("clang diagnostic ignored \"-Winitializer-overrides\"")
+ #define DNS_PRAGMA_POP _Pragma("clang diagnostic pop")
  
- #define dns_quietinit(...) \
- 	DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
 -#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
 +#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9)
  #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
  #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
  #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
+-- 
+2.17.1
+
meta/recipes-support/gnupg/gnupg_2.2.15.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.13.bb +2 -2
similarity index 93%
rename from meta/recipes-support/gnupg/gnupg_2.2.13.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.15.bb
index 3ce2a38c0e..06a257333d 100644
@@ -20,8 +20,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
                                 file://relocate.patch"
 
 
-SRC_URI[md5sum] = "563b959d0c3856e34526e9ca51c80d7b"
-SRC_URI[sha256sum] = "76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8"
+SRC_URI[md5sum] = "3ab87e377aa0af2f463649515bf66508"
+SRC_URI[sha256sum] = "cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 gnupg: upgrade 2.2.15 -> 2.2.16

From: Zang Ruochen <[email protected]>

(From OE-Core rev: 825be9d66ae9f503f1dd2dce0fac530554057613)

---
 .../gnupg/{gnupg_2.2.15.bb => gnupg_2.2.16.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.2.15.bb => gnupg_2.2.16.bb} (93%)
meta/recipes-support/gnupg/gnupg_2.2.16.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.15.bb +2 -2
similarity index 93%
rename from meta/recipes-support/gnupg/gnupg_2.2.15.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.16.bb
index 06a257333d..cb7c6c5c62 100644
@@ -20,8 +20,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
                                 file://relocate.patch"
 
 
-SRC_URI[md5sum] = "3ab87e377aa0af2f463649515bf66508"
-SRC_URI[sha256sum] = "cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454"
+SRC_URI[md5sum] = "d90e186df1c06845880ea58a318f070b"
+SRC_URI[sha256sum] = "6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/3 gnupg: upgrade 2.2.16 -> 2.2.17

In reply to Adrian Bunk

From: Anuj Mittal <[email protected]>

Also fixes CVE-2019-13050. Announcement:

https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html

(From OE-Core rev: c6e46323f0d62daf8bd424e642581fdcba920ef7)

---
 .../gnupg/{gnupg_2.2.16.bb => gnupg_2.2.17.bb}               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.2.16.bb => gnupg_2.2.17.bb} (92%)
meta/recipes-support/gnupg/gnupg_2.2.17.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.16.bb +2 -3
similarity index 92%
rename from meta/recipes-support/gnupg/gnupg_2.2.16.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.17.bb
index cb7c6c5c62..e5456dd9b9 100644
@@ -19,9 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
 SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
                                 file://relocate.patch"
 
-
-SRC_URI[md5sum] = "d90e186df1c06845880ea58a318f070b"
-SRC_URI[sha256sum] = "6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb"
+SRC_URI[md5sum] = "1ba2d9b70c377f8e967742064c27a19c"
+SRC_URI[sha256sum] = "afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
Signature · 1 line
2.17.1
#3 lore raw

Re: [warrior][PATCH 3/3] gnupg: upgrade 2.2.16 -> 2.2.17

Quoted 11 lines · Adrian Bunk

From: Anuj Mittal <[email protected]>

Also fixes CVE-2019-13050. Announcement:

https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html

(From OE-Core rev: c6e46323f0d62daf8bd424e642581fdcba920ef7)

are these bug fix only updates?

Quoted 24 lines
---
 .../gnupg/{gnupg_2.2.16.bb => gnupg_2.2.17.bb}               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.2.16.bb => gnupg_2.2.17.bb} (92%)
meta/recipes-support/gnupg/gnupg_2.2.17.bb renamed from meta/recipes-support/gnupg/gnupg_2.2.16.bb +2 -3
similarity index 92%
rename from meta/recipes-support/gnupg/gnupg_2.2.16.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.17.bb
index cb7c6c5c62..e5456dd9b9 100644
@@ -19,9 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
 SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
                                 file://relocate.patch"
 
-
-SRC_URI[md5sum] = "d90e186df1c06845880ea58a318f070b"
-SRC_URI[sha256sum] = "6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb"
+SRC_URI[md5sum] = "1ba2d9b70c377f8e967742064c27a19c"
+SRC_URI[sha256sum] = "afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
#4 lore raw

Re: [warrior][PATCH 3/3] gnupg: upgrade 2.2.16 -> 2.2.17

Quoted 9 lines · On Sun, Mar 15, 2020 at 11:56:09AM -0700, akuster808 wrote:
Quoted 6 lines · Adrian Bunk

From: Anuj Mittal <[email protected]>

Also fixes CVE-2019-13050. Announcement:

https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html

Quoted 7 lines
Quoted 5 lines

(From OE-Core rev: c6e46323f0d62daf8bd424e642581fdcba920ef7)

are these bug fix only updates?

Mostly just bugfixes, no major functionality changes.

Backporting only the bugfixes gives you a patch list like Debian stable:
https://sources.debian.org/src/gnupg2/2.2.12-1+deb10u1/debian/patches/series/

cu
Adrian