[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-3-gecfc4db

[by Michał Górny]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  ecfc4db3a2f8bc2652ba4ac4de5ca1cd13bfcbec (commit)
      from  641aae783e46af9eb47994dd598df4e51fb8296c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ecfc4db3a2f8bc2652ba4ac4de5ca1cd13bfcbec
Author: Michał Górny <mgorny at gentoo.org>
Date:   Wed Jan 31 16:57:19 2018 +0100

    dirmngr: Handle failures related to missing IPv6 gracefully
    
    * dirmngr/ks-engine-hkp.c (handle_send_request_error): Handle two more
    error codes.
    
    --
    Handle the two possible connect failures related to missing IPv6 support
    gracefully by marking the host dead and retrying with another one.
    If IPv6 is disabled via procfs, connect() will return EADDRNOTAVAIL.
    If IPv6 is not compiled into the kernel, it will return EAFNOSUPPORT.
    This makes it possible to use dual-stack hkp servers on hosts not having
    IPv6 without random connection failures.
    
    GnuPG-bug-id: 3331
    
    --
    
    The above description seems to be for Linux, so it is possible that
    other systems might behave different.  However, it is worth to try
    this patch.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 4a0b08f..a9bb936 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -1353,6 +1353,8 @@ handle_send_request_error (ctrl_t ctrl, gpg_error_t err, const char *request,
     case GPG_ERR_UNKNOWN_HOST:
     case GPG_ERR_NETWORK:
     case GPG_ERR_EIO:  /* Sometimes used by estream cookie functions.  */
+    case GPG_ERR_EADDRNOTAVAIL:  /* e.g. when IPv6 is disabled */
+    case GPG_ERR_EAFNOSUPPORT:  /* e.g. when IPv6 is not compiled in */
       if (mark_host_dead (request) && *tries_left)
         retry = 1;
       break;

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/ks-engine-hkp.c | 2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org