From 10d597d8d6c3683f546f899a3dbdec2182e18ec5 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Tue, 21 Dec 2021 11:53:46 +0100
Subject: [PATCH] gnupg-2.3.4-1

---
 .gitignore                  |  2 +
 gnupg-2.2.21-coverity.patch | 78 -------------------------------------
 gnupg2.spec                 |  7 +++-
 sources                     |  4 +-
 4 files changed, 9 insertions(+), 82 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15c2dc8..cc0e095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,5 @@ gnupg-2.0.16.tar.bz2.sig
 /gnupg-2.3.2.tar.bz2.sig
 /gnupg-2.3.3.tar.bz2
 /gnupg-2.3.3.tar.bz2.sig
+/gnupg-2.3.4.tar.bz2
+/gnupg-2.3.4.tar.bz2.sig
diff --git a/gnupg-2.2.21-coverity.patch b/gnupg-2.2.21-coverity.patch
index 7fe92ad..f7419ff 100644
--- a/gnupg-2.2.21-coverity.patch
+++ b/gnupg-2.2.21-coverity.patch
@@ -11,55 +11,6 @@ diff -up gnupg-2.2.21/common/server-help.c.coverity gnupg-2.2.21/common/server-h
    return 0;
  }
 
-
-From 912e77f07d8a42d7ad001eb3df76f6932ccfa857 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Wed, 7 Apr 2021 17:37:51 +0200
-Subject: [PATCH GnuPG 01/19] agent: Avoid memory leaks
-
-* agent/command.c (cmd_genkey): use goto leave instead of return
-* agent/cvt-openpgp.c (convert_from_openpgp_main): use goto leave
-  instead of return
-* agent/genkey.c (agent_ask_new_passphrase): fix typo to free correct
-  pointer
-  (agent_genkey): release memory
-* agent/gpg-agent.c (check_own_socket): free sockname
-* agent/protect-tool.c (read_key): free buf
-  (agent_askpin): free passphrase
-* agent/protect.c (merge_lists): free newlist
-
---
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
----
- agent/command.c      |  2 +-
- agent/cvt-openpgp.c  |  5 ++++-
- agent/genkey.c       |  7 +++++--
- agent/gpg-agent.c    | 10 ++++++++--
- agent/protect-tool.c |  6 +++++-
- agent/protect.c      |  5 ++++-
- 6 files changed, 27 insertions(+), 8 deletions(-)
-
-diff --git a/agent/protect.c b/agent/protect.c
-index 76ead444b..50b10eb26 100644
---- a/agent/protect.c
-+++ b/agent/protect.c
-@@ -949,7 +949,10 @@ merge_lists (const unsigned char *protectedkey,
-   /* Copy the cleartext.  */
-   s = cleartext;
-   if (*s != '(' && s[1] != '(')
--    return gpg_error (GPG_ERR_BUG);  /*we already checked this */
-+    {
-+      xfree (newlist);
-+      return gpg_error (GPG_ERR_BUG);  /*we already checked this */
-+    }
-   s += 2;
-   startpos = s;
-   while ( *s == '(' )
--- 
-2.30.2
-
-
 From 7a707a3eff1c3fbe17a74337776871f408377cee Mon Sep 17 00:00:00 2001
 From: Jakub Jelen <jjelen@redhat.com>
 Date: Fri, 9 Apr 2021 16:13:07 +0200
@@ -127,35 +78,6 @@ index f49083844..83786a08d 100644
 -- 
 2.30.2
 
-From febbe77870b51e4e1158ae9efeaa0f3aad69a495 Mon Sep 17 00:00:00 2001
-From: Jakub Jelen <jjelen@redhat.com>
-Date: Mon, 12 Apr 2021 14:48:59 +0200
-Subject: [PATCH GnuPG 05/19] tools: Avoid memory leak sfrom gpgspilt
-
-* tools/gpgsplit.c (write_part): free blob
-
---
-
-Signed-off-by: Jakub Jelen <jjelen@redhat.com>
----
- tools/gpgsplit.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
-index cc7bf8ef5..93458068c 100644
---- a/tools/gpgsplit.c
-+++ b/tools/gpgsplit.c
-@@ -620,6 +620,7 @@ write_part (FILE *fpin, unsigned long pktlen,
-             }
-         }
- 
-+      xfree (blob);
-       goto ready;
-     }
- 
--- 
-2.30.2
-
 
 From 7c8048b686a6e811d0b24febf3c5e2528e7881f1 Mon Sep 17 00:00:00 2001
 From: Jakub Jelen <jjelen@redhat.com>
diff --git a/gnupg2.spec b/gnupg2.spec
index 31b7b9f..52010d4 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,8 +6,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.3.3
-Release: 2%{?dist}
+Version: 2.3.4
+Release: 1%{?dist}
 
 License: GPLv3+
 Source0: https://gnupg.org/ftp/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2
@@ -223,6 +223,9 @@ make -k check
 
 
 %changelog
+* Tue Dec 21 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.4-1
+- New upstream release (#2034437)
+
 * Mon Nov 15 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.3-2
 - Fix file-is-digest patch (#2022904)
 
diff --git a/sources b/sources
index f03302b..4f70b02 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gnupg-2.3.3.tar.bz2) = 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
-SHA512 (gnupg-2.3.3.tar.bz2.sig) = 87bcf668c13ffad35c0815a237669b9e3cc002604a11937e7d303d80e7ec6f32669422d217c2c403306bc84d4e0a36adba3e5967c48356c4cab835463a344e50
+SHA512 (gnupg-2.3.4.tar.bz2) = a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758
+SHA512 (gnupg-2.3.4.tar.bz2.sig) = ec098b74b860cb6f9fbaf526183b3c8bd5d5447ad5cc257cb34f7d4afe2d4f408593d966afb953100516d8496d6540b3f8ff93d82c7ef64d9387a92929f2a4d1