[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.20-26-g110b52f

[by Werner Koch]

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-0 has been updated
       via  110b52fffa77b339e6d59eba939408f7e87e7138 (commit)
       via  f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c (commit)
      from  7c028efc182234cd28bbfbeccff0107f334064f2 (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 110b52fffa77b339e6d59eba939408f7e87e7138
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 6 10:31:54 2013 +0200

    Improve libcurl detection.
    
    * m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
    given.  Suggested by John Marshall.
    --
    
    GnuPG-bug-id: 1510

diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index fe9809e..6299501 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -75,7 +75,11 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
      if test -d "$_libcurl_with" ; then
         LIBCURL_CPPFLAGS="-I$withval/include"
         _libcurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"])
+        if test -x "$withval/bin/curl-config" ; then
+          _libcurl_config="$withval/bin/curl-config"
+        else
+          _libcurl_config=
+        fi
      else
 	AC_PATH_PROG([_libcurl_config],[curl-config])
      fi

commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 6 10:04:12 2013 +0200

    gpg: Remove legacy keyserver examples from the template conf file.
    
    * g10/options.skel: Update.

diff --git a/g10/options.skel b/g10/options.skel
index 534affc..e21431b 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -4,11 +4,11 @@
 # Options for GnuPG
 # Copyright 1998, 1999, 2000, 2001, 2002, 2003,
 #           2010 Free Software Foundation, Inc.
-# 
+#
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This file is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -101,14 +101,9 @@ require-cross-certification
 #
 # Example HKP keyservers:
 #      hkp://keys.gnupg.net
-#      hkp://subkeys.pgp.net
-#
-# Example email keyserver:
-#      mailto:pgp-public-keys at keys.pgp.net
 #
 # Example LDAP keyservers:
 #      ldap://pgp.surfnet.nl:11370
-#      ldap://keyserver.pgp.com
 #
 # Regular URL syntax applies, and you can set an alternate port
 # through the usual method:
@@ -131,8 +126,6 @@ require-cross-certification
 keyserver hkp://keys.gnupg.net
 #keyserver http://http-keys.gnupg.net
 #keyserver mailto:pgp-public-keys at keys.nl.pgp.net
-#keyserver ldap://pgp.surfnet.nl:11370
-#keyserver ldap://keyserver.pgp.com
 
 # Common options for keyserver functions:
 #

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

Summary of changes:
 g10/options.skel |   11 ++---------
 m4/libcurl.m4    |    6 +++++-
 2 files changed, 7 insertions(+), 10 deletions(-)


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