[git] GnuPG - branch, master, updated. gnupg-2.2.3-93-gb38ca59

by Werner Koch cvs at cvs.gnupg.org
Mon Dec 11 10:48:23 CET 2017


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  b38ca59bdb0b9173aca620210afc8b52a6882e85 (commit)
       via  34defc9bce91d66fa8c9481ebe6e78b612e570dc (commit)
       via  3e72143023aa8a01d3e648797df89ae106e24e88 (commit)
       via  ddd54d821020125f777c192e499d6967d02e3322 (commit)
       via  6391de3e62a275132664ae96497dd4e47fe9f257 (commit)
       via  5c121d44443b0a96ec6ea82b90717e3dbafd2cc5 (commit)
       via  5b8d12a8bde246f4c04e1981b21801965cc2638d (commit)
       via  2fedf8583bcc493f587c90bc9632d25dfd10bd10 (commit)
       via  b9677ba16f6b386896781a751e4b2fc839e3ec81 (commit)
       via  1524ba9656f0205d8c6ef504f773b832a7a12ab9 (commit)
       via  0d0b9eb0d4f99e8d293a4ce4b90921a879905115 (commit)
       via  8a2917345ba88159bce6153b54706e701564f189 (commit)
       via  4cf3cc6e3d48c8400466ca29c3f1c22ed2da6c2c (commit)
       via  18af15249de5f826c3fa8d1d40e876734adcd0cf (commit)
      from  6d14be22a149da4c7b5d2f63d0343a337081446b (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 b38ca59bdb0b9173aca620210afc8b52a6882e85
Merge: 34defc9 3e72143
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 11 10:42:38 2017 +0100

    Merge branch 'STABLE-BRANCH-2-2' into master


commit 34defc9bce91d66fa8c9481ebe6e78b612e570dc
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 11 10:37:30 2017 +0100

    Adjust for changed macro names in libgpg-error master.
    
    * common/logging.h (GPGRT_LOGLVL_): New replacement macros for older
    libgpg-error versions.
    
    --
    
    Updates-commit: b56dfdfc1865ceb7c3c025d79996e049faee7fdf
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/asshelp.c b/common/asshelp.c
index b9c0cf4..5209ea6 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -93,7 +93,7 @@ my_libassuan_log_handler (assuan_context_t ctx, void *hook,
     return 0; /* Temporary disabled.  */
 
   if (msg)
-    log_string (GPGRT_LOG_DEBUG, msg);
+    log_string (GPGRT_LOGLVL_DEBUG, msg);
 
   return 1;
 }
diff --git a/common/logging.h b/common/logging.h
index 5ed769a..5a82be4 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -48,7 +48,8 @@ static inline void bug_at (const char *file, int line, const char *func)
 static inline void
 bug_at (const char *file, int line, const char *func)
 {
-  gpgrt_log (GPGRT_LOG_BUG, "there is a bug at %s:%d:%s\n", file, line, func);
+  gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d:%s\n",
+             file, line, func);
   abort ();
 }
 # else
@@ -58,7 +59,7 @@ static inline void bug_at (const char *file, int line)
 static inline void
 bug_at (const char *file, int line)
 {
-  gpgrt_log (GPGRT_LOG_BUG, "there is a bug at %s:%d\n", file, line);
+  gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d\n", file, line);
   abort ();
 }
 # endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
@@ -116,6 +117,15 @@ enum jnlib_log_levels {
     GPGRT_LOG_BUG,
     GPGRT_LOG_DEBUG
 };
+#define GPGRT_LOGLVL_BEGIN  GPGRT_LOG_BEGIN
+#define GPGRT_LOGLVL_CONT   GPGRT_LOG_CONT
+#define GPGRT_LOGLVL_INFO   GPGRT_LOG_INFO
+#define GPGRT_LOGLVL_WARN   GPGRT_LOG_WARN
+#define GPGRT_LOGLVL_ERROR  GPGRT_LOG_ERROR
+#define GPGRT_LOGLVL_FATAL  GPGRT_LOG_FATAL
+#define GPGRT_LOGLVL_BUG    GPGRT_LOG_BUG
+#define GPGRT_LOGLVL_DEBUG  GPGRT_LOG_DEBUG
+
 void log_log (int level, const char *fmt, ...) GPGRT_ATTR_PRINTF(2,3);
 void log_logv (int level, const char *fmt, va_list arg_ptr);
 void log_logv_prefix (int level, const char *prefix,
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index caeb66f..7997a1a 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -45,14 +45,14 @@ my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr)
   /* Map the log levels.  */
   switch (level)
     {
-    case GCRY_LOG_CONT: level = GPGRT_LOG_CONT; break;
-    case GCRY_LOG_INFO: level = GPGRT_LOG_INFO; break;
-    case GCRY_LOG_WARN: level = GPGRT_LOG_WARN; break;
-    case GCRY_LOG_ERROR:level = GPGRT_LOG_ERROR; break;
-    case GCRY_LOG_FATAL:level = GPGRT_LOG_FATAL; break;
-    case GCRY_LOG_BUG:  level = GPGRT_LOG_BUG; break;
-    case GCRY_LOG_DEBUG:level = GPGRT_LOG_DEBUG; break;
-    default:            level = GPGRT_LOG_ERROR; break;
+    case GCRY_LOG_CONT: level = GPGRT_LOGLVL_CONT; break;
+    case GCRY_LOG_INFO: level = GPGRT_LOGLVL_INFO; break;
+    case GCRY_LOG_WARN: level = GPGRT_LOGLVL_WARN; break;
+    case GCRY_LOG_ERROR:level = GPGRT_LOGLVL_ERROR; break;
+    case GCRY_LOG_FATAL:level = GPGRT_LOGLVL_FATAL; break;
+    case GCRY_LOG_BUG:  level = GPGRT_LOGLVL_BUG; break;
+    case GCRY_LOG_DEBUG:level = GPGRT_LOGLVL_DEBUG; break;
+    default:            level = GPGRT_LOGLVL_ERROR; break;
     }
   log_logv (level, fmt, arg_ptr);
 }
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 347da54..25716e2 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -781,12 +781,12 @@ my_ntbtls_log_handler (void *opaque, int level, const char *fmt, va_list argv)
   (void)opaque;
 
   if (level == -1)
-    log_logv_prefix (GPGRT_LOG_INFO, "ntbtls: ", fmt, argv);
+    log_logv_prefix (GPGRT_LOGLVL_INFO, "ntbtls: ", fmt, argv);
   else
     {
       char prefix[10+20];
       snprintf (prefix, sizeof prefix, "ntbtls(%d): ", level);
-      log_logv_prefix (GPGRT_LOG_DEBUG, prefix, fmt, argv);
+      log_logv_prefix (GPGRT_LOGLVL_DEBUG, prefix, fmt, argv);
     }
 }
 #endif
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 684771b..61d06c6 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -195,7 +195,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
   err = get_assuan_server_version (ctx, mode, &serverversion);
   if (err)
     log_log (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED?
-             GPGRT_LOG_INFO : GPGRT_LOG_ERROR,
+             GPGRT_LOGLVL_INFO : GPGRT_LOGLVL_ERROR,
              _("error getting version from '%s': %s\n"),
              servername, gpg_strerror (err));
   else if (compare_version_strings (serverversion, myversion) < 0)
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 4acb2de..8d86253 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1142,7 +1142,7 @@ change_passphrase (ctrl_t ctrl, kbnode_t keyblock)
           if (err)
             log_log ((gpg_err_code (err) == GPG_ERR_CANCELED
                       || gpg_err_code (err) == GPG_ERR_FULLY_CANCELED)
-                     ? GPGRT_LOG_INFO : GPGRT_LOG_ERROR,
+                     ? GPGRT_LOGLVL_INFO : GPGRT_LOGLVL_ERROR,
                      _("key %s: error changing passphrase: %s\n"),
                        keystr_with_sub (keyid, subid),
                        gpg_strerror (err));
diff --git a/g10/misc.c b/g10/misc.c
index 77c8f26..9016d27 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -396,7 +396,7 @@ print_further_info (const char *format, ...)
 
   log_info (_("(further info: "));
   va_start (arg_ptr, format);
-  log_logv (GPGRT_LOG_CONT, format, arg_ptr);
+  log_logv (GPGRT_LOGLVL_CONT, format, arg_ptr);
   va_end (arg_ptr);
   log_printf (")\n");
 }
diff --git a/g10/tofu.c b/g10/tofu.c
index e63e989..8f729a2 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -3214,7 +3214,7 @@ show_statistics (tofu_dbs_t dbs,
             *p = ' ';
       }
 
-      log_string (GPGRT_LOG_INFO, msg);
+      log_string (GPGRT_LOGLVL_INFO, msg);
       xfree (msg);
 
       if (policy == TOFU_POLICY_AUTO)
@@ -3279,7 +3279,7 @@ show_warning (const char *fingerprint, strlist_t user_id_list)
     log_fatal ("format failed: %s\n",
                gpg_strerror (gpg_error_from_syserror()));
   xfree (tmpmsg);
-  log_string (GPGRT_LOG_INFO, text);
+  log_string (GPGRT_LOGLVL_INFO, text);
   xfree (text);
 
   es_free (set_policy_command);
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index 9b43584..e3814d3 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -137,14 +137,14 @@ my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr)
   /* Map the log levels.  */
   switch (level)
     {
-    case GCRY_LOG_CONT: level = GPGRT_LOG_CONT; break;
-    case GCRY_LOG_INFO: level = GPGRT_LOG_INFO; break;
-    case GCRY_LOG_WARN: level = GPGRT_LOG_WARN; break;
-    case GCRY_LOG_ERROR:level = GPGRT_LOG_ERROR; break;
-    case GCRY_LOG_FATAL:level = GPGRT_LOG_FATAL; break;
-    case GCRY_LOG_BUG:  level = GPGRT_LOG_BUG; break;
-    case GCRY_LOG_DEBUG:level = GPGRT_LOG_DEBUG; break;
-    default:            level = GPGRT_LOG_ERROR; break;
+    case GCRY_LOG_CONT: level = GPGRT_LOGLVL_CONT; break;
+    case GCRY_LOG_INFO: level = GPGRT_LOGLVL_INFO; break;
+    case GCRY_LOG_WARN: level = GPGRT_LOGLVL_WARN; break;
+    case GCRY_LOG_ERROR:level = GPGRT_LOGLVL_ERROR; break;
+    case GCRY_LOG_FATAL:level = GPGRT_LOGLVL_FATAL; break;
+    case GCRY_LOG_BUG:  level = GPGRT_LOGLVL_BUG; break;
+    case GCRY_LOG_DEBUG:level = GPGRT_LOGLVL_DEBUG; break;
+    default:            level = GPGRT_LOGLVL_ERROR; break;
     }
   log_logv (level, fmt, arg_ptr);
 }
diff --git a/sm/certchain.c b/sm/certchain.c
index a361aca..4e18caf 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -119,7 +119,8 @@ do_list (int is_error, int listmode, estream_t fp, const char *format, ...)
     }
   else
     {
-      log_logv (is_error? GPGRT_LOG_ERROR: GPGRT_LOG_INFO, format, arg_ptr);
+      log_logv (is_error? GPGRT_LOGLVL_ERROR: GPGRT_LOGLVL_INFO,
+                format, arg_ptr);
       log_printf ("\n");
     }
   va_end (arg_ptr);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 9ce752b..bf54303 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -87,7 +87,7 @@ gc_error (int status, int errnum, const char *fmt, ...)
   va_list arg_ptr;
 
   va_start (arg_ptr, fmt);
-  log_logv (GPGRT_LOG_ERROR, fmt, arg_ptr);
+  log_logv (GPGRT_LOGLVL_ERROR, fmt, arg_ptr);
   va_end (arg_ptr);
 
   if (errnum)

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

Summary of changes:
 agent/gpg-agent.c      | 12 ++++++++++++
 agent/keyformat.txt    |  6 +++---
 agent/protect.c        |  2 +-
 agent/t-protect.c      |  2 +-
 build-aux/speedo.mk    |  5 ++++-
 common/asshelp.c       |  2 +-
 common/logging.h       | 14 ++++++++++++--
 common/miscellaneous.c | 16 ++++++++--------
 dirmngr/dirmngr.c      |  4 ++--
 doc/gpg-agent.texi     | 11 +++++++++++
 g10/call-agent.c       |  2 +-
 g10/keyedit.c          |  2 +-
 g10/misc.c             |  2 +-
 g10/parse-packet.c     |  6 ++++++
 g10/tofu.c             |  4 ++--
 kbx/kbxutil.c          | 16 ++++++++--------
 sm/certchain.c         |  3 ++-
 tools/gpgconf-comp.c   |  2 +-
 18 files changed, 77 insertions(+), 34 deletions(-)


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




More information about the Gnupg-commits mailing list