[git] GnuPG - branch, master, updated. gnupg-2.2.1-57-gf6ab97f

[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  f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (commit)
       via  05cb87276c21c3a47226c75026fa46a955553dd9 (commit)
       via  b13972dfbf7224478652038725ab0d2cb41b7303 (commit)
       via  84af859e391a757877c9a1d78e35face983e6d23 (commit)
       via  812fe29bff42cf7dbd07e0becc55b2ada340dd97 (commit)
       via  e417aaf69817fcb4a73c38077853dc940a2deabc (commit)
       via  1067403c8a7fb51decf30059e46901b5ee9f5b37 (commit)
       via  6e808ae4700dc5e95bf4cc2d5c063df582c234d0 (commit)
       via  560d85ecff4246133d185dc29395f07c918b5556 (commit)
       via  016538d82867c40a21bc7cbf44ec386f4699077f (commit)
       via  9e3f2a7e0b7a8713084bbdd835bc5c65410a402f (commit)
       via  44fb3fbc85b32552c91f32f099b6b246c12ce0cc (commit)
       via  2c7dccca9b617780a3ea760adf460bb3b77f90f3 (commit)
       via  68c8619114fd5f24cb6bfb9e0f25c428a8805323 (commit)
       via  1ba308aa0356a57c21c4c8c2dac75b4d62b8aac3 (commit)
       via  d07de3862710d88bc80d6f6c5ca8da5cf38ff0eb (commit)
       via  7c73db3d31c6457dfbdc82a8dc89951c023f0603 (commit)
       via  8448347b5bdee56e6f9938a93ea92fe4d3c8800c (commit)
       via  752cae6dd2ee8982a34c796a3f168ae538f7938c (commit)
       via  1bf5cbd3ef01b7f5fdcfa30c882047b924dcf3f0 (commit)
       via  b509d81cab030cca6abf0d878e1fc884eda344e6 (commit)
       via  e725c4d65335d18dea6b855726ee7c57afd4a60a (commit)
      from  fb7828676cc2c01047498898378711e049f73fee (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 f6ab97fd9620bb8f512ffb471a66e5f96098a7cc
Merge: fb78286 05cb872
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 27 13:56:15 2017 +0200

    Merge branch 'STABLE-BRANCH-2-2' into master
    
    --
    Resolved Conflicts:
    	configure.ac - Adjust due to new log_clock otions

diff --cc configure.ac
index 22f082e,dc1fc1a..ebd0c2f
--- a/configure.ac
+++ b/configure.ac
@@@ -1680,19 -1666,15 +1674,28 @@@ AC_ARG_ENABLE(optimization
                     fi])
  
  #
 +# log_debug has certain requirements which might hamper portability.
 +# Thus we use an option to enable it.
 +#
 +AC_MSG_CHECKING([whether to enable log_clock])
 +AC_ARG_ENABLE(log_clock,
 +              AC_HELP_STRING([--enable-log-clock],
 +                             [enable log_clock timestamps]),
 +              enable_log_clock=$enableval, enable_log_clock=no)
 +AC_MSG_RESULT($enable_log_clock)
 +if test "$enable_log_clock" = yes ; then
 +  AC_DEFINE(ENABLE_LOG_CLOCK,1,[Defined to use log_clock timestamps])
 +fi
 +
+ # Add -Werror to CFLAGS.  This hack can be used to avoid problems with
+ # misbehaving autoconf tests in case the user supplied -Werror.
+ #
+ AC_ARG_ENABLE(werror,
+    AC_HELP_STRING([--enable-werror],
+                   [append -Werror to CFLAGS]),
+                   [if test $enableval = yes ; then
+                       CFLAGS="$CFLAGS -Werror"
+                    fi])
  
  #
  # Configure option --enable-all-tests

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

Summary of changes:
 configure.ac             |  20 +++----
 dirmngr/ks-engine-http.c |  10 ++--
 doc/gpg.texi             |   3 +-
 doc/gpgv.texi            |   2 +-
 g10/import.c             |   5 +-
 g10/key-check.c          | 143 +++++++++++++++++++++++++++++++----------------
 g10/keyedit.c            | 100 ++++++++++++++++++---------------
 g10/keygen.c             |   3 +
 g10/trust.c              |  20 +++++++
 sm/call-dirmngr.c        |   4 +-
 sm/certlist.c            |  40 ++++++++++++-
 sm/gpgsm.c               |   2 +-
 sm/gpgsm.h               |   2 +-
 sm/server.c              |   2 +-
 tools/gpgconf-comp.c     |  17 ++++--
 15 files changed, 253 insertions(+), 120 deletions(-)


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