From 600b09449d24cafc9507736ea8d3aad641a77fb7 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 16 May 2017 00:05:14 +0200
Subject: [PATCH] gnupg2: Update from 2.1.20 to 2.1.21

Also remove workarounds for libgpg-error on Android < 7 as detailed
in https://github.com/termux/termux-packages/issues/933.
---
 packages/gnupg2/build.sh              |  4 ++--
 packages/gnupg2/g10-gpg.c.patch       | 13 -------------
 packages/gnupg2/tools-gpgconf.c.patch | 12 ------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 packages/gnupg2/g10-gpg.c.patch
 delete mode 100644 packages/gnupg2/tools-gpgconf.c.patch

diff --git a/packages/gnupg2/build.sh b/packages/gnupg2/build.sh
index 9229aa530..f4665d592 100755
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
-TERMUX_PKG_VERSION=2.1.20
+TERMUX_PKG_VERSION=2.1.21
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d
+TERMUX_PKG_SHA256=7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
 # Remove non-english help files and man pages shipped with the gnupg (1) package:
diff --git a/packages/gnupg2/g10-gpg.c.patch b/packages/gnupg2/g10-gpg.c.patch
deleted file mode 100644
index f698b1206..000000000
--- a/packages/gnupg2/g10-gpg.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r ../gnupg-2.1.11/g10/gpg.c ./g10/gpg.c
---- ../gnupg-2.1.11/g10/gpg.c	2016-01-26 07:05:55.000000000 -0500
-+++ ./g10/gpg.c	2016-04-14 21:42:15.168898294 -0400
-@@ -4669,6 +4669,9 @@
-   if (opt.debug)
-     gcry_control (GCRYCTL_DUMP_SECMEM_STATS );
- 
-+  /* XXX: Workaround for libgpg-error atexit()-callback not working. */
-+  es_fflush(NULL);
-+
-   emergency_cleanup ();
- 
-   rc = rc? rc : log_get_errorcount(0)? 2 : g10_errors_seen? 1 : 0;
diff --git a/packages/gnupg2/tools-gpgconf.c.patch b/packages/gnupg2/tools-gpgconf.c.patch
deleted file mode 100644
index 9b2c28350..000000000
--- a/packages/gnupg2/tools-gpgconf.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../gnupg-2.1.11/tools/gpgconf.c ./tools/gpgconf.c
---- ../gnupg-2.1.11/tools/gpgconf.c	2016-01-18 02:14:56.000000000 -0500
-+++ ./tools/gpgconf.c	2016-04-14 20:06:56.058590579 -0400
-@@ -393,5 +395,8 @@
-     if (es_fclose (outfp))
-       gc_error (1, errno, "error closing '%s'", opt.outfile);
- 
-+  /* XXX: Workaround for libgpg-error atexit()-callback not working. */
-+  es_fflush(NULL);
-+
-   return 0;
- }