[git] GnuPG - branch, master, updated. gnupg-2.2.4-108-g149369a
by Werner Koch
cvs at cvs.gnupg.org
Thu Jan 25 17:05:24 CET 2018
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 149369a92b447d06863e79dfe5589321eaf1f237 (commit)
via 91a3d15cee32f82a8422e76655a605c5048eaad8 (commit)
via 91303b7df9c3e810cfcd4920f78bac6f8b7df2b2 (commit)
via e1e35db510c9222e7a7dc208c2e49df556954170 (commit)
via 6fb5713f4a6976900cc70c140e61043b6ef688d1 (commit)
via 339b3301ee8410fe3bbdebb66a6e83801d79d40d (commit)
via 4d3c500f4793eb263940ff5ef87ec4ead63c9b4b (commit)
via 412bb7a801f242d47a82712080cce6ddbb843166 (commit)
via 4f88b0f56134af2ce56d434b7acd47fcf9b6f7cf (commit)
via a6849888295f0e0872c948cd72a59374bb867777 (commit)
via f3ba66781a07af2e32f5887e6e15acdd4822a431 (commit)
via 290348e349e8d56a856f187a08e913f2ed525b3c (commit)
via 84555d53720cc9240535ed9b57f1efcc9927f6dc (commit)
via 558b17593ae97b8a07d06bf0d6af1a626b304501 (commit)
via b4975788143b5cbab75534d7274c635986f15e0b (commit)
via 43aaf60449036e870cc25b77fbb7312cf3fb534c (commit)
via c7b8ec6c8e57797f0b77dbf7fca85fb600323328 (commit)
via 7449063b1af2eef73d621a69cdb2fb713ab1ae6c (commit)
via faecaf80f0b5f0dd50d4ff20a8ba3bd6a592fe1f (commit)
via 3a48455b0baec6e516e16370a63b1175af89e7af (commit)
via 482e000b8a7e336f342a7fac3b7379257e944b6e (commit)
from db7661b5a297a58c95fa9873d43f31d697b8feb3 (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 149369a92b447d06863e79dfe5589321eaf1f237
Merge: db7661b 91a3d15
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 25 16:48:07 2018 +0100
Merge branch 'STABLE-BRANCH-2-2' into master
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --cc NEWS
index 216d872,f924176..4fa20b2
--- a/NEWS
+++ b/NEWS
@@@ -47,7 -51,11 +47,10 @@@ Noteworthy changes in version 2.3.0 (un
* agent: Improve robustness of the shutdown pending
state. [Git#7ffedfab89]
+ See-also: gnupg-announce/2017q4/000417.html
+
+
-Noteworthy changes in version 2.2.2 (2017-11-07)
-------------------------------------------------
+ Changes also found in 2.2.2:
* gpg: Avoid duplicate key imports by concurrently running gpg
processes. [#3446]
@@@ -88,7 -96,11 +91,9 @@@
* Add configure option --enable-werror. [#2423]
+ See-also: gnupg-announce/2017q4/000416.html
+
-
-Noteworthy changes in version 2.2.1 (2017-09-19)
-------------------------------------------------
+ Changes also found in 2.2.1:
* gpg: Fix formatting of the user id in batch mode key generation
if only "name-email" is given.
diff --cc common/logging.h
index 5a82be4,2225100..a20b8f8
--- a/common/logging.h
+++ b/common/logging.h
@@@ -145,9 -107,35 +145,36 @@@ void log_flush (void)
raw dump, with TEXT being an empty string, print a trailing
linefeed, otherwise print an entire debug line with TEXT followed
by the hexdump and a final LF. */
-void log_printhex (const char *text, const void *buffer, size_t length);
+void log_printhex (const void *buffer, size_t length, const char *text);
-void log_clock (const char *string);
+void log_clock (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
+#endif /* Use gnupg internal logging functions. */
+
+ /* Some handy assertion macros which don't abort. */
+
+ #define return_if_fail(expr) do { \
+ if (!(expr)) { \
+ log_debug ("%s:%d: assertion '%s' failed\n", \
+ __FILE__, __LINE__, #expr ); \
+ return; \
+ } } while (0)
+ #define return_null_if_fail(expr) do { \
+ if (!(expr)) { \
+ log_debug ("%s:%d: assertion '%s' failed\n", \
+ __FILE__, __LINE__, #expr ); \
+ return NULL; \
+ } } while (0)
+ #define return_val_if_fail(expr,val) do { \
+ if (!(expr)) { \
+ log_debug ("%s:%d: assertion '%s' failed\n", \
+ __FILE__, __LINE__, #expr ); \
+ return (val); \
+ } } while (0)
+ #define never_reached() do { \
+ log_debug ("%s:%d: oops - should never get here\n", \
+ __FILE__, __LINE__ ); \
+ } while (0)
+
+
#endif /*GNUPG_COMMON_LOGGING_H*/
-----------------------------------------------------------------------
Summary of changes:
NEWS | 5 +
common/homedir.c | 2 +-
common/logging.h | 27 +
configure.ac | 2 +-
doc/gpg.texi | 19 +-
doc/tools.texi | 8 +
doc/wks.texi | 37 +-
g10/keygen.c | 67 ++-
g10/mainproc.c | 10 +-
kbx/kbxutil.c | 1 -
kbx/keybox-defs.h | 69 +--
kbx/keybox-util.c | 53 --
kbx/keybox.h | 4 -
po/ca.po | 8 +-
po/cs.po | 1285 +++++++++++++++++++---------------------------
po/da.po | 7 +-
po/de.po | 11 +-
po/el.po | 8 +-
po/eo.po | 8 +-
po/es.po | 7 +-
po/et.po | 8 +-
po/fi.po | 8 +-
po/fr.po | 7 +-
po/gl.po | 8 +-
po/hu.po | 8 +-
po/id.po | 8 +-
po/it.po | 8 +-
po/ja.po | 10 +-
po/nb.po | 7 +-
po/nl.po | 4 +-
po/pl.po | 7 +-
po/pt.po | 8 +-
po/ro.po | 13 +-
po/ru.po | 14 +-
po/sk.po | 9 +-
po/sv.po | 7 +-
po/tr.po | 7 +-
po/uk.po | 7 +-
po/zh_CN.po | 8 +-
po/zh_TW.po | 7 +-
scd/app-openpgp.c | 119 ++++-
scd/ccid-driver.c | 17 +-
sm/gpgsm.c | 2 -
tools/applygnupgdefaults | 2 +-
tools/gpg-wks-server.c | 195 ++++++-
tools/gpgconf-comp.c | 29 +-
tools/gpgconf.c | 112 +++-
tools/gpgconf.h | 4 +
48 files changed, 1206 insertions(+), 1075 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list