[git] GnuPG - branch, master, updated. gnupg-2.1.20-58-gbd0c949

[by NIIBE Yutaka]

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, master has been updated
       via  bd0c94939faf8ccfc117fb595e9bc0105edcafa4 (commit)
       via  0b904ddea8bddaa2fd7893a9dce1df1cb5e36b00 (commit)
      from  1538523156be568046f632d1775eae30ea8bd556 (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 bd0c94939faf8ccfc117fb595e9bc0105edcafa4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 10:19:27 2017 +0900

    dirmngr: Fix dns-stuff.c in another way.
    
    * dirmngr/dns-stuff.c (T_CERT): Define our own.
    
    --
    
    T_CERT may be defined by another enum type even if the value is same.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 728f662..cb0456a 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -95,9 +95,8 @@
 #ifndef T_SRV
 #define T_SRV 33
 #endif
-#ifndef T_CERT
-# define T_CERT 37
-#endif
+#undef T_CERT
+#define T_CERT 37
 
 /* The standard SOCKS and TOR ports.  */
 #define SOCKS_PORT 1080

commit 0b904ddea8bddaa2fd7893a9dce1df1cb5e36b00
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 10:00:37 2017 +0900

    Revert "dirmngr: Fix dns-stuff.c."
    
    This reverts commit 1538523156be568046f632d1775eae30ea8bd556.

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 8b25e02..728f662 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -40,6 +40,7 @@
 #else
 # if HAVE_SYSTEM_RESOLVER
 #  include <netinet/in.h>
+#  include <arpa/nameser.h>
 #  include <resolv.h>
 # endif
 # include <netdb.h>

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

Summary of changes:
 dirmngr/dns-stuff.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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