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

[Gaëtan Bisson]

    Date: Tuesday, January 24, 2017 @ 00:13:57
  Author: bisson
Revision: 287243

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/negation.patch
  gnupg/trunk/suffix.patch

----------------+
 PKGBUILD       |   14 ++++----------
 negation.patch |   20 --------------------
 suffix.patch   |   46 ----------------------------------------------
 3 files changed, 4 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-23 20:30:56 UTC (rev 287242)
+++ PKGBUILD	2017-01-24 00:13:57 UTC (rev 287243)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.1.17
-pkgrel=4
+pkgver=2.1.18
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,12 +20,8 @@
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'negation.patch'
-        'suffix.patch')
-sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
-          '92cb257c500e207a6b34406127192f5f9c5f5c0d'
-          '477569b1bb0bb9b1d839970bd143f3cbaa47b376')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP')
 
 install=install
 
@@ -36,8 +32,6 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-	patch -p1 -i ../negation.patch
-	patch -p1 -i ../suffix.patch
 }
 
 build() {

Deleted: negation.patch
===================================================================
--- negation.patch	2017-01-23 20:30:56 UTC (rev 287242)
+++ negation.patch	2017-01-24 00:13:57 UTC (rev 287243)
@@ -1,20 +0,0 @@
-diff -Naur old/dirmngr/dns.c new/dirmngr/dns.c
---- old/dirmngr/dns.c	2016-12-20 00:19:05.000000000 -1000
-+++ new/dirmngr/dns.c	2017-01-18 23:02:50.209471082 -1000
-@@ -6054,7 +6054,15 @@
- 			if ('[' == dns_anyconf_peek(fp)) {
- 				dns_anyconf_skip("[ \t", fp);
- 
--				while (dns_anyconf_scan(&cf, "%w_", fp, &error)) {
-+				for (;;) {
-+					if ('!' == dns_anyconf_peek(fp)) {
-+						dns_anyconf_skip("! \t", fp);
-+						/* FIXME: negating statuses; currently not implemented */
-+						dns_anyconf_skip("^#;]\n", fp); /* skip to end of criteria */
-+						break;
-+					}
-+
-+					if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) break;
- 					dns_anyconf_skip("= \t", fp);
- 					if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) {
- 						dns_anyconf_pop(&cf); /* discard status */

Deleted: suffix.patch
===================================================================
--- suffix.patch	2017-01-23 20:30:56 UTC (rev 287242)
+++ suffix.patch	2017-01-24 00:13:57 UTC (rev 287243)
@@ -1,46 +0,0 @@
-From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 2 Jan 2017 10:00:33 +0100
-Subject: [PATCH] dirmngr: Strip root zone suffix from libdns cname results.
-
-* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
-(get_dns_cname_libdns): Ditto.
---
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
----
- dirmngr/dns-stuff.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
-index a31b073..f2e1df9 100644
---- a/dirmngr/dns-stuff.c
-+++ b/dirmngr/dns-stuff.c
-@@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short port,
-               err = gpg_error_from_syserror ();
-               goto leave;
-             }
-+          /* Libdns appends the root zone part which is problematic
-+           * for most other functions - strip it.  */
-+          if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.')
-+            (*r_canonname)[strlen (*r_canonname)-1] = 0;
-         }
- 
-       dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1);
-@@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname)
-   *r_cname = xtrystrdup (cname.host);
-   if (!*r_cname)
-     err = gpg_error_from_syserror ();
-+  else
-+    {
-+      /* Libdns appends the root zone part which is problematic
-+       * for most other functions - strip it.  */
-+      if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.')
-+        (*r_cname)[strlen (*r_cname)-1] = 0;
-+    }
- 
-  leave:
-   dns_free (ans);
--- 
-2.8.0.rc3
-