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 B6384138359 for ; Fri, 14 Aug 2020 23:58:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9BADE0877; Fri, 14 Aug 2020 23:58:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC853E0877 for ; Fri, 14 Aug 2020 23:58:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69CB934F367 for ; Fri, 14 Aug 2020 23:58:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 217312FD for ; Fri, 14 Aug 2020 23:58:13 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1597449475.f880165f3ad8531f8b185108094f46a47c9e2fb4.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/, app-crypt/gnupg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/files/gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch app-crypt/gnupg/gnupg-2.2.20-r1.ebuild app-crypt/gnupg/gnupg-2.2.20.ebuild X-VCS-Directories: app-crypt/gnupg/files/ app-crypt/gnupg/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: f880165f3ad8531f8b185108094f46a47c9e2fb4 X-VCS-Branch: master Date: Fri, 14 Aug 2020 23:58:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 450ff7cb-6db8-411a-b191-1b018116a51d X-Archives-Hash: 24826498b3e354feea9ae1cc0287da6c commit: f880165f3ad8531f8b185108094f46a47c9e2fb4 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 14 23:57:39 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 14 23:57:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f880165f app-crypt/gnupg: fix dirmngr for non-IPv6 enabled hosts Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> ...20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch | 35 ++++++++++++++++++++++ ...{gnupg-2.2.20.ebuild => gnupg-2.2.20-r1.ebuild} | 1 + 2 files changed, 36 insertions(+) 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 new file mode 100644 index 00000000000..14a1913b3a0 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch @@ -0,0 +1,35 @@ +From 109d16e8f644da97ed9c00e6f9010a53097f587a Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 13 Jul 2020 10:00:58 +0900 +Subject: [PATCH] dirmngr: Handle EAFNOSUPPORT at connect_server. + +* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT. + +-- + +GnuPG-bug-id: 4977 +Signed-off-by: NIIBE Yutaka +--- + dirmngr/http.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/dirmngr/http.c b/dirmngr/http.c +index f26675f9b..50b9b732b 100644 +--- a/dirmngr/http.c ++++ b/dirmngr/http.c +@@ -3005,6 +3005,15 @@ connect_server (ctrl_t ctrl, const char *server, unsigned short port, + sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol); + if (sock == ASSUAN_INVALID_FD) + { ++ if (errno == EAFNOSUPPORT) ++ { ++ if (ai->family == AF_INET) ++ v4_valid = 0; ++ if (ai->family == AF_INET6) ++ v6_valid = 0; ++ continue; ++ } ++ + err = gpg_err_make (default_errsource, + gpg_err_code_from_syserror ()); + log_error ("error creating socket: %s\n", gpg_strerror (err)); diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild similarity index 98% rename from app-crypt/gnupg/gnupg-2.2.20.ebuild rename to app-crypt/gnupg/gnupg-2.2.20-r1.ebuild index 35dc9274af9..ec52f664069 100644 --- a/app-crypt/gnupg/gnupg-2.2.20.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.20-r1.ebuild @@ -51,6 +51,7 @@ DOCS=( PATCHES=( "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" + "${FILESDIR}/${PN}-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch" ) src_prepare() {