From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 290F8139085 for ; Wed, 4 Jan 2017 12:43:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E228E0C81; Wed, 4 Jan 2017 12:43:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 360FBE0C81 for ; Wed, 4 Jan 2017 12:43:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 454F63412C1 for ; Wed, 4 Jan 2017 12:43:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DABB624EC for ; Wed, 4 Jan 2017 12:43:48 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1483533822.25dbda5817c9281c11f214be4a7e24f3d1ff24ed.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/files/, app-crypt/gnupg/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch app-crypt/gnupg/gnupg-2.1.17-r1.ebuild app-crypt/gnupg/gnupg-2.1.17.ebuild X-VCS-Directories: app-crypt/gnupg/ app-crypt/gnupg/files/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 25dbda5817c9281c11f214be4a7e24f3d1ff24ed X-VCS-Branch: master Date: Wed, 4 Jan 2017 12:43:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e2c0310c-8adf-465d-9c28-43664fc3372c X-Archives-Hash: 17b030494a323551cdce3a246af89506 commit: 25dbda5817c9281c11f214be4a7e24f3d1ff24ed Author: Kristian Fiskerstrand gentoo org> AuthorDate: Wed Jan 4 12:43:27 2017 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Wed Jan 4 12:43:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25dbda58 app-crypt/gnupg: Fix CNAME dns regression introduced in 2.1.17 Upstream patch to fix CNAME DNS regression introduced in released 2.1.17 relating to trailing dot in name. Package-Manager: Portage-2.3.3, Repoman-2.3.1 ...ip-root-zone-suffix-from-libdns-cname-res.patch | 46 ++++++++++++++++++++++ ...{gnupg-2.1.17.ebuild => gnupg-2.1.17-r1.ebuild} | 6 +-- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch b/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch new file mode 100644 index 00000000..4b71502 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch @@ -0,0 +1,46 @@ +From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001 +From: Werner Koch +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 +--- + 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.1 + diff --git a/app-crypt/gnupg/gnupg-2.1.17.ebuild b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild similarity index 95% rename from app-crypt/gnupg/gnupg-2.1.17.ebuild rename to app-crypt/gnupg/gnupg-2.1.17-r1.ebuild index 62dc0e9..d682e32 100644 --- a/app-crypt/gnupg/gnupg-2.1.17.ebuild +++ b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -50,7 +50,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" + epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" \ + "${FILESDIR}/${P}-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch" epatch_user } @@ -81,7 +82,6 @@ src_configure() { --enable-gpg \ --enable-gpgsm \ --enable-large-secmem \ - --without-adns \ "${myconf[@]}" \ $(use_enable bzip2) \ $(use_enable gnutls) \