gnupg2: Make gpgconf output correctly (see #152)

diff --git a/packages/gnupg2/build.sh b/packages/gnupg2/build.sh
index 7a564b6d4ce82ffc7a2bdcb07ec80cfb7ce1ee53..d6ffefaa7a1f733dc407ce666ee26c50a9cda4d6 100755 (executable)
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.11
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.11

-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2

 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"

diff --git a/packages/gnupg2/tools-gpgconf.c.patch b/packages/gnupg2/tools-gpgconf.c.patch
new file mode 100644 (file)
index 0000000..9b2c283
--- /dev/null
+++ b/packages/gnupg2/tools-gpgconf.c.patch
@@ -0,0 +1,12 @@
+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;
+ }