Heitor Alves de Siqueira has proposed merging ~halves/ubuntu/+source/gnupg2:lp1910432-groovy into ubuntu/+source/gnupg2:ubuntu/groovy-devel.
Requested reviews: Dan Streetman (ddstreet) STS Sponsors (sts-sponsors) Related bugs: Bug #1910432 in gnupg2 (Ubuntu): "dirmngr doesn't work with kernel parameter ipv6.disable=1" https://bugs.launchpad.net/ubuntu/+source/gnupg2/+bug/1910432 For more details, see: https://code.launchpad.net/~halves/ubuntu/+source/gnupg2/+git/gnupg2/+merge/396531 -- Your team STS Sponsors is requested to review the proposed merge of ~halves/ubuntu/+source/gnupg2:lp1910432-groovy into ubuntu/+source/gnupg2:ubuntu/groovy-devel.
diff --git a/debian/changelog b/debian/changelog index 974065a..f8d261a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnupg2 (2.2.20-1ubuntu1.1) groovy; urgency=medium + + * d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch: + - Fix IPv6 connectivity for dirmngr (LP: #1910432) + + -- Heitor Alves de Siqueira <hal...@canonical.com> Sat, 16 Jan 2021 14:53:14 +0000 + gnupg2 (2.2.20-1ubuntu1) groovy; urgency=low * Merge from Debian unstable. Remaining changes: diff --git a/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch b/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch new file mode 100644 index 0000000..15a96a6 --- /dev/null +++ b/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch @@ -0,0 +1,38 @@ +From ca937cf390662b830d4fc5d295e69b24b1778050 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gni...@fsij.org> +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 <gni...@fsij.org> + +Origin: backport, https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=109d16e8f644 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1910432 +--- + dirmngr/http.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: gnupg2/dirmngr/http.c +=================================================================== +--- gnupg2.orig/dirmngr/http.c ++++ gnupg2/dirmngr/http.c +@@ -3005,6 +3005,15 @@ connect_server (const char *server, unsi + 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/debian/patches/series b/debian/patches/series index a0f1baf..af77b88 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch Make-gpg-zip-use-tar-from-PATH.patch gpg-drop-import-clean-from-default-keyserver-import-optio.patch dirmngr-honor-http-proxy.patch +dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch
-- Mailing list: https://launchpad.net/~sts-sponsors Post to : sts-sponsors@lists.launchpad.net Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp