sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnupg2: Update from 2.1.21 to 2.1.22

Browse Source
This commit is contained in:
Fredrik Fornwall 2017-07-29 21:38:22 +02:00
parent 1f58827643
commit 063fcb245c
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/gnupg2/build.sh
View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/
TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication" TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
TERMUX_PKG_VERSION=2.1.21 TERMUX_PKG_VERSION=2.1.22
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd TERMUX_PKG_SHA256=46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7
TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry" TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
# Remove non-english help files and man pages shipped with the gnupg (1) package: # Remove non-english help files and man pages shipped with the gnupg (1) package:

41
packages/gnupg2/dirmngr-dns.patch
View File

@ -1,7 +1,7 @@
diff -u -r ../gnupg-2.1.21/dirmngr/dns.c ./dirmngr/dns.c diff -u -r ../gnupg-2.1.22/dirmngr/dns.c ./dirmngr/dns.c
--- ../gnupg-2.1.21/dirmngr/dns.c 2017-05-15 14:13:22.000000000 +0200 --- ../gnupg-2.1.22/dirmngr/dns.c 2017-07-25 09:37:05.000000000 +0200
+++ ./dirmngr/dns.c 2017-05-18 14:02:06.625275461 +0200 +++ ./dirmngr/dns.c 2017-07-29 20:54:37.445647974 +0200
@@ -5414,7 +5414,7 @@ @@ -5424,7 +5424,7 @@
if (!(resconf = dns_resconf_open(&error))) if (!(resconf = dns_resconf_open(&error)))
goto error; goto error;
@ -10,7 +10,16 @@ diff -u -r ../gnupg-2.1.21/dirmngr/dns.c ./dirmngr/dns.c
/* /*
* NOTE: Both the glibc and BIND9 resolvers ignore a missing * NOTE: Both the glibc and BIND9 resolvers ignore a missing
* /etc/resolv.conf, defaulting to a nameserver of * /etc/resolv.conf, defaulting to a nameserver of
@@ -10211,7 +10211,7 @@ @@ -5436,7 +5436,7 @@
goto error;
}
- if ((error = dns_nssconf_loadpath(resconf, "/etc/nsswitch.conf"))) {
+ if ((error = dns_nssconf_loadpath(resconf, "@TERMUX_PREFIX@/etc/nsswitch.conf"))) {
if (error != ENOENT)
goto error;
}
@@ -10407,7 +10407,7 @@
panic("dns_resconf_open: %s", dns_strerror(error)); panic("dns_resconf_open: %s", dns_strerror(error));
if (!MAIN.resconf.count) if (!MAIN.resconf.count)
@ -19,15 +28,15 @@ diff -u -r ../gnupg-2.1.21/dirmngr/dns.c ./dirmngr/dns.c
for (i = 0; i < MAIN.resconf.count; i++) { for (i = 0; i < MAIN.resconf.count; i++) {
path = MAIN.resconf.path[i]; path = MAIN.resconf.path[i];
diff -u -r ../gnupg-2.1.21/dirmngr/dns-stuff.c ./dirmngr/dns-stuff.c diff -u -r ../gnupg-2.1.22/dirmngr/dns-stuff.c ./dirmngr/dns-stuff.c
--- ../gnupg-2.1.21/dirmngr/dns-stuff.c 2017-05-15 14:13:22.000000000 +0200 --- ../gnupg-2.1.22/dirmngr/dns-stuff.c 2017-05-25 20:24:30.000000000 +0200
+++ ./dirmngr/dns-stuff.c 2017-05-18 14:02:29.025024667 +0200 +++ ./dirmngr/dns-stuff.c 2017-07-29 20:54:00.414067929 +0200
@@ -496,7 +496,7 @@ @@ -114,7 +114,7 @@
#else /* Unix */ #define DEFAULT_TIMEOUT 30
const char *fname;
- fname = "/etc/resolv.conf";
+ fname = "@TERMUX_PREFIX@/etc/resolv.conf"; -#define RESOLV_CONF_NAME "/etc/resolv.conf"
err = libdns_error_to_gpg_error +#define RESOLV_CONF_NAME "@TERMUX_PREFIX@/etc/resolv.conf"
(dns_resconf_loadpath (ld.resolv_conf, fname));
if (err) /* Two flags to enable verbose and debug mode. */
static int opt_verbose;