[arch-commits] Commit in gnupg/trunk (PKGBUILD libdns.patch)

[Gaëtan Bisson]

    Date: Friday, December 23, 2016 @ 07:20:38
  Author: bisson
Revision: 284518

fix FS#52234

Added:
  gnupg/trunk/libdns.patch
Modified:
  gnupg/trunk/PKGBUILD

--------------+
 PKGBUILD     |   10 +++++++---
 libdns.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-12-23 07:19:01 UTC (rev 284517)
+++ PKGBUILD    2016-12-23 07:20:38 UTC (rev 284518)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.17
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,8 +20,10 @@
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+        'libdns.patch')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
+          '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
 
 install=install
 
@@ -32,6 +34,7 @@
 prepare() {
        cd "${srcdir}/${pkgname}-${pkgver}"
        sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+       patch -p1 -i ../libdns.patch
 }
 
 build() {
@@ -43,6 +46,7 @@
                --libexecdir=/usr/lib/gnupg \
                --enable-maintainer-mode \
                --enable-symcryptrun \
+               --disable-libdns # FS#52234
 
        make
 }

Added: libdns.patch
===================================================================
--- libdns.patch                                (rev 0)
+++ libdns.patch        2016-12-23 07:20:38 UTC (rev 284518)
@@ -0,0 +1,50 @@
+diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
+--- old/dirmngr/dns-stuff.c    2016-12-20 00:19:05.000000000 -1000
++++ new/dirmngr/dns-stuff.c    2016-12-22 21:14:41.123388787 -1000
+@@ -181,7 +181,9 @@
+ enable_recursive_resolver (int yes)
+ {
+   recursive_resolver = yes;
++#ifdef USE_LIBDNS
+   libdns_reinit_pending = 1;
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -251,8 +253,10 @@
+   strncpy (tor_nameserver, ipaddr? ipaddr : DEFAULT_NAMESERVER,
+            sizeof tor_nameserver -1);
+   tor_nameserver[sizeof tor_nameserver -1] = 0;
++#ifdef USE_LIBDNS
+   libdns_reinit_pending = 1;
+   libdns_tor_port = 0;  /* Start again with the default port.  */
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -534,15 +538,15 @@
+ void
+ reload_dns_stuff (int force)
+ {
++#ifdef USE_LIBDNS
+   if (force)
+     {
+-#ifdef USE_LIBDNS
+       libdns_deinit ();
+-#endif
+       libdns_reinit_pending = 0;
+     }
+   else
+     libdns_reinit_pending = 1;
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -1745,7 +1749,6 @@
+ 
+   if (err)
+     {
+-      if (gpg_err_code (err) == GPG_ERR_NO_NAME)
+         err = 0;
+       goto leave;
+     }