| 1 |
commit: 25dbda5817c9281c11f214be4a7e24f3d1ff24ed |
| 2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 4 12:43:27 2017 +0000 |
| 4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 4 12:43:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25dbda58 |
| 7 |
|
| 8 |
app-crypt/gnupg: Fix CNAME dns regression introduced in 2.1.17 |
| 9 |
|
| 10 |
Upstream patch to fix CNAME DNS regression introduced in released 2.1.17 |
| 11 |
relating to trailing dot in name. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 14 |
|
| 15 |
...ip-root-zone-suffix-from-libdns-cname-res.patch | 46 ++++++++++++++++++++++ |
| 16 |
...{gnupg-2.1.17.ebuild => gnupg-2.1.17-r1.ebuild} | 6 +-- |
| 17 |
2 files changed, 49 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000..4b71502 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch |
| 24 |
@@ -0,0 +1,46 @@ |
| 25 |
+From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Werner Koch <wk@×××××.org> |
| 27 |
+Date: Mon, 2 Jan 2017 10:00:33 +0100 |
| 28 |
+Subject: [PATCH] dirmngr: Strip root zone suffix from libdns cname results. |
| 29 |
+ |
| 30 |
+* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot. |
| 31 |
+(get_dns_cname_libdns): Ditto. |
| 32 |
+-- |
| 33 |
+ |
| 34 |
+Signed-off-by: Werner Koch <wk@×××××.org> |
| 35 |
+--- |
| 36 |
+ dirmngr/dns-stuff.c | 11 +++++++++++ |
| 37 |
+ 1 file changed, 11 insertions(+) |
| 38 |
+ |
| 39 |
+diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c |
| 40 |
+index a31b073..f2e1df9 100644 |
| 41 |
+--- a/dirmngr/dns-stuff.c |
| 42 |
++++ b/dirmngr/dns-stuff.c |
| 43 |
+@@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short port, |
| 44 |
+ err = gpg_error_from_syserror (); |
| 45 |
+ goto leave; |
| 46 |
+ } |
| 47 |
++ /* Libdns appends the root zone part which is problematic |
| 48 |
++ * for most other functions - strip it. */ |
| 49 |
++ if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.') |
| 50 |
++ (*r_canonname)[strlen (*r_canonname)-1] = 0; |
| 51 |
+ } |
| 52 |
+ |
| 53 |
+ dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1); |
| 54 |
+@@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname) |
| 55 |
+ *r_cname = xtrystrdup (cname.host); |
| 56 |
+ if (!*r_cname) |
| 57 |
+ err = gpg_error_from_syserror (); |
| 58 |
++ else |
| 59 |
++ { |
| 60 |
++ /* Libdns appends the root zone part which is problematic |
| 61 |
++ * for most other functions - strip it. */ |
| 62 |
++ if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.') |
| 63 |
++ (*r_cname)[strlen (*r_cname)-1] = 0; |
| 64 |
++ } |
| 65 |
+ |
| 66 |
+ leave: |
| 67 |
+ dns_free (ans); |
| 68 |
+-- |
| 69 |
+2.8.1 |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/app-crypt/gnupg/gnupg-2.1.17.ebuild b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
| 73 |
similarity index 95% |
| 74 |
rename from app-crypt/gnupg/gnupg-2.1.17.ebuild |
| 75 |
rename to app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
| 76 |
index 62dc0e9..d682e32 100644 |
| 77 |
--- a/app-crypt/gnupg/gnupg-2.1.17.ebuild |
| 78 |
+++ b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2016 Gentoo Foundation |
| 81 |
+# Copyright 1999-2017 Gentoo Foundation |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
# $Id$ |
| 84 |
|
| 85 |
@@ -50,7 +50,8 @@ S="${WORKDIR}/${MY_P}" |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
default |
| 89 |
- epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
| 90 |
+ epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" \ |
| 91 |
+ "${FILESDIR}/${P}-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch" |
| 92 |
epatch_user |
| 93 |
} |
| 94 |
|
| 95 |
@@ -81,7 +82,6 @@ src_configure() { |
| 96 |
--enable-gpg \ |
| 97 |
--enable-gpgsm \ |
| 98 |
--enable-large-secmem \ |
| 99 |
- --without-adns \ |
| 100 |
"${myconf[@]}" \ |
| 101 |
$(use_enable bzip2) \ |
| 102 |
$(use_enable gnutls) \ |
Archives