| 1 |
commit: f880165f3ad8531f8b185108094f46a47c9e2fb4 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 14 23:57:39 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 14 23:57:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f880165f |
| 7 |
|
| 8 |
app-crypt/gnupg: fix dirmngr for non-IPv6 enabled hosts |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
...20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch | 35 ++++++++++++++++++++++ |
| 14 |
...{gnupg-2.2.20.ebuild => gnupg-2.2.20-r1.ebuild} | 1 + |
| 15 |
2 files changed, 36 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-crypt/gnupg/files/gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch b/app-crypt/gnupg/files/gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..14a1913b3a0 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-crypt/gnupg/files/gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch |
| 22 |
@@ -0,0 +1,35 @@ |
| 23 |
+From 109d16e8f644da97ed9c00e6f9010a53097f587a Mon Sep 17 00:00:00 2001 |
| 24 |
+From: NIIBE Yutaka <gniibe@××××.org> |
| 25 |
+Date: Mon, 13 Jul 2020 10:00:58 +0900 |
| 26 |
+Subject: [PATCH] dirmngr: Handle EAFNOSUPPORT at connect_server. |
| 27 |
+ |
| 28 |
+* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT. |
| 29 |
+ |
| 30 |
+-- |
| 31 |
+ |
| 32 |
+GnuPG-bug-id: 4977 |
| 33 |
+Signed-off-by: NIIBE Yutaka <gniibe@××××.org> |
| 34 |
+--- |
| 35 |
+ dirmngr/http.c | 9 +++++++++ |
| 36 |
+ 1 file changed, 9 insertions(+) |
| 37 |
+ |
| 38 |
+diff --git a/dirmngr/http.c b/dirmngr/http.c |
| 39 |
+index f26675f9b..50b9b732b 100644 |
| 40 |
+--- a/dirmngr/http.c |
| 41 |
++++ b/dirmngr/http.c |
| 42 |
+@@ -3005,6 +3005,15 @@ connect_server (ctrl_t ctrl, const char *server, unsigned short port, |
| 43 |
+ sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol); |
| 44 |
+ if (sock == ASSUAN_INVALID_FD) |
| 45 |
+ { |
| 46 |
++ if (errno == EAFNOSUPPORT) |
| 47 |
++ { |
| 48 |
++ if (ai->family == AF_INET) |
| 49 |
++ v4_valid = 0; |
| 50 |
++ if (ai->family == AF_INET6) |
| 51 |
++ v6_valid = 0; |
| 52 |
++ continue; |
| 53 |
++ } |
| 54 |
++ |
| 55 |
+ err = gpg_err_make (default_errsource, |
| 56 |
+ gpg_err_code_from_syserror ()); |
| 57 |
+ log_error ("error creating socket: %s\n", gpg_strerror (err)); |
| 58 |
|
| 59 |
diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild |
| 60 |
similarity index 98% |
| 61 |
rename from app-crypt/gnupg/gnupg-2.2.20.ebuild |
| 62 |
rename to app-crypt/gnupg/gnupg-2.2.20-r1.ebuild |
| 63 |
index 35dc9274af9..ec52f664069 100644 |
| 64 |
--- a/app-crypt/gnupg/gnupg-2.2.20.ebuild |
| 65 |
+++ b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild |
| 66 |
@@ -51,6 +51,7 @@ DOCS=( |
| 67 |
|
| 68 |
PATCHES=( |
| 69 |
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
| 70 |
+ "${FILESDIR}/${PN}-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch" |
| 71 |
) |
| 72 |
|
| 73 |
src_prepare() { |
Archives