diff --git a/.gitignore b/.gitignore index 5f3d104..15c2dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ gnupg-2.0.16.tar.bz2.sig /gnupg-2.3.1.tar.bz2.sig /gnupg-2.3.2.tar.bz2 /gnupg-2.3.2.tar.bz2.sig +/gnupg-2.3.3.tar.bz2 +/gnupg-2.3.3.tar.bz2.sig diff --git a/gnupg-2.3.2-agent-crash.patch b/gnupg-2.3.2-agent-crash.patch deleted file mode 100644 index edf8716..0000000 --- a/gnupg-2.3.2-agent-crash.patch +++ /dev/null @@ -1,31 +0,0 @@ -From af3b1901549baa8fbe8140d9fa75a4a2b7a77a7e Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Tue, 7 Sep 2021 08:57:44 +0200 -Subject: [PATCH GnuPG] agent: Fix segv in GET_PASSPHRASE (regression) - -* agent/command.c (cmd_get_passphrase): Do not deref PI. PI is always -NULL. --- - -Fixes-commit: b89b1f35c29ceaebe39b31444936aa66c9297f2c -GnuPG-bug-id: 5577 ---- - agent/command.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/agent/command.c b/agent/command.c -index 5e2dbc809..3e074443a 100644 ---- a/agent/command.c -+++ b/agent/command.c -@@ -1955,7 +1955,7 @@ cmd_get_passphrase (assuan_context_t ctx, char *line) - opt_qualbar, cacheid, CACHE_MODE_USER, NULL); - xfree (entry_errtext); - entry_errtext = NULL; -- is_generated = !!(pi->status & PINENTRY_STATUS_PASSWORD_GENERATED); -+ is_generated = 0; - - if (!rc) - { --- -2.31.1 - diff --git a/gnupg2.spec b/gnupg2.spec index dcae5bc..9b174da 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -6,8 +6,8 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 2.3.2 -Release: 3%{?dist} +Version: 2.3.3 +Release: 1%{?dist} License: GPLv3+ Source0: https://gnupg.org/ftp/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2 @@ -27,7 +27,6 @@ Patch21: gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI. Patch22: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch # Fixes for issues found in Coverity scan - reported upstream Patch30: gnupg-2.2.21-coverity.patch -Patch31: gnupg-2.3.2-agent-crash.patch URL: https://www.gnupg.org/ @@ -111,7 +110,6 @@ to the base GnuPG package %patch22 -p1 -b .good_revoc %patch30 -p1 -b .coverity -%patch31 -p1 -b .agent-crash # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) # Note: this is just the name of the default shared lib to load in scdaemon, @@ -225,6 +223,9 @@ make -k check %changelog +* Wed Oct 13 2021 Jakub Jelen - 2.3.3-1 +- New upstream release (2013388) + * Wed Oct 06 2021 Jakub Jelen - 2.3.2-3 - Fix crash in agent when deciphering (#2009978) - Recommend pcsc-lite-ccid to support USB smart cards (#2007923) diff --git a/sources b/sources index 8bbb45b..f03302b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gnupg-2.3.2.tar.bz2) = 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73 -SHA512 (gnupg-2.3.2.tar.bz2.sig) = 5ac9c1a2bdb8cb9189e5385a17558beed537f49628f092b97d0b5e974932997d856bd02de237b5e5f4a4a3123a48ab93c5bb21edd8723641ea6916e89e2f4444 +SHA512 (gnupg-2.3.3.tar.bz2) = 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102 +SHA512 (gnupg-2.3.3.tar.bz2.sig) = 87bcf668c13ffad35c0815a237669b9e3cc002604a11937e7d303d80e7ec6f32669422d217c2c403306bc84d4e0a36adba3e5967c48356c4cab835463a344e50