[git] GnuPG - branch, master, updated. gnupg-2.1.15-170-g20a1683

[by Justus Winter]

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  20a16833ee2bb05f735377f705899302bcf2b4d3 (commit)
       via  2e64ccb0f96d615b1eb87e37f230a5d761aa9c36 (commit)
       via  2b23a321ac0b07beeac1dfa8d71f223e66c49b71 (commit)
      from  4e4843e735f32b5e79a51d8062da55bfaab6ad77 (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 20a16833ee2bb05f735377f705899302bcf2b4d3
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 27 17:45:52 2016 +0200

    build: Do not link gpg-connect-agent against npth.
    
    * tools/Makefile.am: Do not link gpg-connect-agent against npth.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6df49f6..b2a274f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -122,10 +122,9 @@ watchgnupg_SOURCES = watchgnupg.c
 watchgnupg_LDADD = $(NETLIBS)
 
 gpg_connect_agent_SOURCES = gpg-connect-agent.c
-# FIXME: remove NPTH_LIBS (why do we need them at all?)
 gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
 	                  $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
-                          $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
+                          $(GPG_ERROR_LIBS) \
                           $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
                           $(resource_objs)
 

commit 2e64ccb0f96d615b1eb87e37f230a5d761aa9c36
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 27 17:18:15 2016 +0200

    build: Fix check for resolver library on macOS.
    
    * configure.ac: Check for the mangled name of 'dn_skipname' first.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index b16f837..fe432e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1074,8 +1074,15 @@ if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
                    AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no))
     AC_SEARCH_LIBS(dn_expand,resolv bind,,
                    AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
-    AC_SEARCH_LIBS(dn_skipname,resolv bind,,
-                   AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no))
+
+    # macOS renames dn_skipname into res_9_dn_skipname in <resolv.h>,
+    # and for some reason fools us into believing we don't need
+    # -lresolv even if we do.  Since the test program checking for the
+    # symbol does not include <resolv.h>, we need to check for the
+    # renamed symbol explicitly.
+    AC_SEARCH_LIBS(res_9_dn_skipname,resolv bind,,
+        AC_SEARCH_LIBS(dn_skipname,resolv bind,,
+            AC_SEARCH_LIBS(__dn_skipname,resolv bind,,have_resolver=no)))
 
     if test x"$have_resolver" != xno ; then
 

commit 2b23a321ac0b07beeac1dfa8d71f223e66c49b71
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 27 15:54:56 2016 +0200

    common: Correctly handle modules relying on npth.
    
    * common/Makefile.am (common_sources): Drop 'call-gpg.{c,h}'.
    (with_npth_sources): New variable.
    (libcommonpth_a_SOURCES): Use the new variable.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/common/Makefile.am b/common/Makefile.am
index 422fcf6..9f151f2 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -88,7 +88,6 @@ common_sources = \
 	helpfile.c \
 	mkdir_p.c mkdir_p.h \
 	strlist.c strlist.h \
-	call-gpg.c call-gpg.h \
 	exectool.c exectool.h \
 	server-help.c server-help.h \
 	name-value.c name-value.h \
@@ -114,11 +113,14 @@ endif
 without_npth_sources = \
         get-passphrase.c get-passphrase.h
 
+# Sources only useful with NPTH.
+with_npth_sources = \
+        call-gpg.c call-gpg.h
 
 libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 
-libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
 if !HAVE_W32CE_SYSTEM

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

Summary of changes:
 common/Makefile.am |  6 ++++--
 configure.ac       | 11 +++++++++--
 tools/Makefile.am  |  3 +--
 3 files changed, 14 insertions(+), 6 deletions(-)


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