[git] GnuPG - branch, master, updated. gnupg-2.1.9-23-g4e42ad3

[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, master has been updated
       via  4e42ad300b3de9fab25095a9e82431b1ea2740e7 (commit)
      from  c37621166e9cc2a818de73bc99287a393dbb5744 (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 4e42ad300b3de9fab25095a9e82431b1ea2740e7
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 19 20:30:27 2015 +0200

    dirmngr: Allow building with libassuan < 2.3.
    
    * dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
    available.
    * dirmngr/http.c (http_raw_connect): Ditto.
    --
    
    Frankly we should require that but we can also wait for 2.4.0 and
    switch then.

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 744fb52..9aa1ca3 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -470,7 +470,9 @@ set_tor_mode (void)
 {
   if (opt.use_tor)
     {
+#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
       if (assuan_sock_set_flag (ASSUAN_INVALID_FD, "tor-mode", 1))
+#endif
         {
           log_error ("error enabling TOR mode: %s\n", strerror (errno));
           log_info ("(is your Libassuan recent enough?)\n");
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 6f8bf3d..ab32bd8 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -753,7 +753,9 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
     {
       int mode;
 
+#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
       if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
+#endif
         {
           log_error ("TOR support is not available\n");
           return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);

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

Summary of changes:
 dirmngr/dirmngr.c | 2 ++
 dirmngr/http.c    | 2 ++
 2 files changed, 4 insertions(+)


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