From 8323b5d263c2f9084271cfae4e3d2229091a5bed Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Sun, 22 Nov 2020 16:28:53 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnupg2.git#1aa575af619ba57855fce80cea5b7be65c8f53aa
---
 .gitignore                  | 2 ++
 gnupg-2.2.21-coverity.patch | 2 +-
 gnupg2.spec                 | 5 ++++-
 sources                     | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e31a6c..8816d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,5 @@ gnupg-2.0.16.tar.bz2.sig
 /gnupg-2.2.21.tar.bz2.sig
 /gnupg-2.2.23.tar.bz2
 /gnupg-2.2.23.tar.bz2.sig
+/gnupg-2.2.24.tar.bz2
+/gnupg-2.2.24.tar.bz2.sig
diff --git a/gnupg-2.2.21-coverity.patch b/gnupg-2.2.21-coverity.patch
index 4d781a5..b4e65b6 100644
--- a/gnupg-2.2.21-coverity.patch
+++ b/gnupg-2.2.21-coverity.patch
@@ -173,7 +173,7 @@ diff -up gnupg-2.2.21/kbx/keybox-dump.c.coverity gnupg-2.2.21/kbx/keybox-dump.c
 +        }
        if (recno >= from)
          {
-           if ((rc = _keybox_write_blob (blob, outfp)))
+           if ((rc = _keybox_write_blob (blob, NULL, outfp)))
              {
 +              _keybox_release_blob (blob);
                fprintf (stderr, "error writing output: %s\n",
diff --git a/gnupg2.spec b/gnupg2.spec
index 70a71b6..fc1e243 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,7 +6,7 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.2.23
+Version: 2.2.24
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -223,6 +223,9 @@ make -k check
 
 
 %changelog
+* Thu Nov 19 2020 Jakub Jelen <jjelen@redhat.com> - 2.2.24-1
+- Update to 2.2.24 (#1898504)
+
 * Fri Sep  4 2020 Tomáš Mráz <tmraz@redhat.com> - 2.2.23-1
 - upgrade to 2.2.23
 
diff --git a/sources b/sources
index 7c8ee1a..7092420 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gnupg-2.2.23.tar.bz2) = 736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90
-SHA512 (gnupg-2.2.23.tar.bz2.sig) = e2c43ffd38613c3ac3b684887fb40facd99bf77f7c20e2d649318902813490716c786a00e00e86031420596424334877209a3b3547ef326d7daf1802ad75f935
+SHA512 (gnupg-2.2.24.tar.bz2) = b72fb12da95c1c62f013e1ffdbf2983b4185f0de59edba6061209904e5f63525e23a406529fafcd1b0b50ccbad45980c1db293601e8db84d5cbf65a7228834fb
+SHA512 (gnupg-2.2.24.tar.bz2.sig) = 231d52b4a18a59ccc39c8713ce70110a34201c83731b45cc177577ee208f12b130fde3aa6eb875ccfdea04765c33b8e6f6c8d3fbcfbcc8fb117f270667104e9b