Heitor Alves de Siqueira has proposed merging ~halves/ubuntu/+source/gnupg2:lp1910432-focal into ubuntu/+source/gnupg2:ubuntu/focal-devel.
Requested reviews: STS Sponsors (sts-sponsors) Dan Streetman (ddstreet) 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/396406 -- Your team STS Sponsors is requested to review the proposed merge of ~halves/ubuntu/+source/gnupg2:lp1910432-focal into ubuntu/+source/gnupg2:ubuntu/focal-devel.
diff --git a/debian/changelog b/debian/changelog index fe05c72..6ada1d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnupg2 (2.2.19-3ubuntu3) focal; urgency=medium + + * d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch: + - Fix IPv6 connectivity for dirmngr (LP: #1910432) + + -- Heitor Alves de Siqueira <[email protected]> Wed, 06 Jan 2021 18:10:35 +0000 + gnupg2 (2.2.19-3ubuntu2) focal; urgency=medium * Don't declare diffutils as a test dependency, this package is essential 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 <[email protected]> +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 <[email protected]> + +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 8891526..f78f186 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ Make-gpg-zip-use-tar-from-PATH.patch gpg-drop-import-clean-from-default-keyserver-import-optio.patch from-master/gpg-Fix-output-of-with-secret-if-a-pattern-is-given.patch dirmngr-honor-http-proxy.patch +dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch
-- Mailing list: https://launchpad.net/~sts-sponsors Post to : [email protected] Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
