[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.1-43-g6530aff
by Werner Koch
cvs at cvs.gnupg.org
Tue Nov 7 11:21:28 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, STABLE-BRANCH-2-2 has been updated
via 6530aff6923b118fad39f9e29c7357370cae650c (commit)
via 5bd515005032f9340bd73e4346bbd0aef8518074 (commit)
via 30f21f8b0fa6844a9bba3f24dc41b3ac32170109 (commit)
from 23bfac6d1a8bd2d0af5a6fac3ba3a6e986d6c9e8 (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 6530aff6923b118fad39f9e29c7357370cae650c
Author: Werner Koch <wk at gnupg.org>
Date: Tue Nov 7 11:04:44 2017 +0100
Post release updates.
--
diff --git a/NEWS b/NEWS
index 0ffff2f..ce6c5d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.2.3 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 2.2.2 (2017-11-07)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index dc1fc1a..227b57f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
m4_define([mym4_package],[gnupg])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [2])
+m4_define([mym4_micro], [3])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
commit 5bd515005032f9340bd73e4346bbd0aef8518074
Author: Werner Koch <wk at gnupg.org>
Date: Tue Nov 7 10:23:01 2017 +0100
Release 2.2.2
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/AUTHORS b/AUTHORS
index 99bb0e2..d27dfb6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,182 +38,15 @@ List of Copyright holders
Authors with a FSF copyright assignment
=======================================
-Ales Nyakhaychyk <nyakhaychyk at i1fn.linux.by> Translations [be]
-
-Andrey Jivsov <openpgp at brainhub.org> Assigns past and future changes for ECC.
- (g10/ecdh.c. other changes to support ECC)
-
-Ben Kibbey <bjk at luxsci.net> Assigns past and future changes.
-
-Birger Langkjer <birger.langkjer at image.dk> Translations [da]
-
-Maxim Britov <maxim.britov at gmail.com> Translations [ru]
-
-Daniel Resare <daniel at resare.com> Translations [sv]
-Per Tunedal <per at clipanish.com> Translations [sv]
-Daniel Nylander <po at danielnylander.se> Translations [sv]
-
-Daiki Ueno <ueno at unixuser.org> Assigns Past and Future Changes.
- (changed:passphrase.c and related code)
-
-David Shaw <dshaw at jabberwocky.com> Assigns past and future changes.
- (all in keyserver/,
- a lot of changes in g10/ see the ChangeLog,
- bug fixes here and there)
-
-Dokianakis Theofanis <madf at hellug.gr> Translations [el]
-
-Edmund GRIMLEY EVANS <edmundo at rano.org> Translations [eo]
-
-Florian Weimer <fw at deneb.enyo.de> Assigns past and future changes
- (changed:g10/parse-packet.c, include/iobuf.h, util/iobuf.c)
-
-g10 Code GmbH <info at g10code.com> Assigns past and future changes
- (all work since 2001 as indicated by mail addresses in ChangeLogs)
-
-Gaël Quéri <gael at lautre.net> Translations [fr]
- (fixed a lot of typos)
-
-Gregory Steuck <steuck at iname.com> Translations [ru]
-
-Nagy Ferenc László <nfl at nfllab.com> Translations [hu]
-
-Ivo Timmermans <itimmermans at bigfoot.com> Translations [nl]
-
-Jacobo Tarri'o Barreiro <jtarrio at iname.com> Translations [gl]
-
-Janusz Aleksander Urbanowicz <alex at bofh.torun.pl> Translations [pl]
-Jakub Bogusz <qboosh at pld-linux.org> Translations [pl]
-
-Jedi Lin <Jedi at idej.org> Translations [zh-tw]
-
-Jouni Hiltunen <jouni.hiltunen at kolumbus.fi> Translations [fi]
-Tommi Vainikainen <Tommi.Vainikainen at iki.fi> Translations [fi]
-
-Laurentiu Buzdugan <lbgnupg at rolix.org> Translations [ro]
-
-Magda Procha'zkova' <magda at math.muni.cz> Translations [cs]
-
-Michael Roth <mroth at nessie.de> Assigns changes.
- (wrote cipher/des.c., changes and bug fixes all over the place)
-
-Michal Majer <mmajer at econ.umb.sk> Translations [sk]
-
-Marco d'Itri <md at linux.it> Translations [it]
-
-Marcus Brinkmann <marcus at g10code.de>
- (gpgconf and fixes all over the place)
-
-Matthew Skala <mskala at ansuz.sooke.bc.ca> Disclaimer
- (wrote cipher/twofish.c)
-
-Moritz Schulte <moritz at g10code.com>
- (ssh support gpg-agent)
-
-Niklas Hernaeus <nh at df.lth.se> Disclaimer
- (weak key patches)
-
-Nilgun Belma Buguner <nilgun at technologist.com> Translations [tr]
-
-Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
- Assigns past and future changes
- (configure.in, cipher/rndlinux.c, FAQ)
-
-Paul Eggert <eggert at twinsun.com>
- (configuration macros for LFS)
-
-Pavel I. Shajdo <pshajdo at gmail.com> Translations [ru]
- (man pages)
-
-Pedro Morais <morais at poli.org> Translations [pt_PT]
-
-Rémi Guyomarch <rguyom at mail.dotcom.fr> Assigns past and future changes.
- (g10/compress.c, g10/encr-data.c,
- g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c)
-
-Stefan Bellon <sbellon at sbellon.de> Assigns past and future changes.
- (All patches to support RISC OS)
-
-Timo Schulz <twoaday at freakmail.de> Assigns past and future changes.
- (util/w32reg.c, g10/passphrase.c, g10/hkp.c)
-
-Tedi Heriyanto <tedi_h at gmx.net> Translations [id]
-
-Thiago Jung Bauermann <jungmann at cwb.matrix.com.br> Translations [pt_BR]
-Rafael Caetano dos Santos <rcaetano at linux.ime.usp.br> Translations [pt_BR]
-
-Toomas Soome <tsoome at ut.ee> Translations [et]
-
-Urko Lusa <ulusa at euskalnet.net> Translations [es_ES]
-
-Walter Koch <koch at u32.de> Translations [de]
-
-Werner Koch <wk at gnupg.org> Assigns GNU Privacy Guard and future changes.
- (started the whole thing, wrote the S/MIME extensions, the
- smartcard daemon and the gpg-agent)
-
-Yosiaki IIDA <iida at ring.gr.jp> Translations [ja]
-
-Yuri Chornoivan, yurchor at ukr dot net: Translations [uk]
-
-Yutaka Niibe Assigns Past and Future Changes
- (scd/)
+The list of authors who signed a FSF copyright assignment is kept in
+the GIT master branch's copy of this file.
Authors with a DCO
==================
-Andre Heinecke <aheinecke at intevation.de>
-2014-09-19:4525694.FcpLvWDUFT at esus:
-
-Andreas Schwier <andreas.schwier at cardcontact.de>
-2014-07-22:53CED1D8.1010306 at cardcontact.de:
-
-Christian Aistleitner <christian at quelltextlich.at>
-2013-05-26:20130626112332.GA2228 at quelltextlich.at:
-
-Damien Goutte-Gattat <dgouttegattat at incenp.org>
-2015-01-17:54BA49AA.2040708 at incenp.org:
-
-Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-2014-09-24:87oau6w9q7.fsf at alice.fifthhorseman.net:
-
-Hans of Guardian <hans at guardianproject.info>
-2013-06-26:D84473D7-F3F7-43D5-A9CE-16580B88D574 at guardianproject.info:
-
-Ineiev <ineiev at gnu.org>
-2017-05-09:20170509121611.GH25850 at gnu.org:
-
-Jonas Borgström <jonas at borgstrom.se>
-2013-08-29:521F1E7A.5080602 at borgstrom.se:
-
-Joshua Rogers <git at internot.info>
-2014-12-22:5497FE75.7010503 at internot.info:
-
-Kyle Butt <kylebutt at gmail.com>
-2013-05-29:CAAODAYLbCtqOG6msLLL0UTdASKWT6u2ptxsgUQ1JpusBESBoNQ at mail.gmail.com:
-
-Stefan Tomanek <tomanek at internet-sicherheit.de>
-2014-01-30:20140129234449.GY30808 at zirkel.wertarbyte.de:
-
-Tobias Mueller <muelli at cryptobitch.de>
-2016-11-23:1479937342.11180.3.camel at cryptobitch.de:
-
-Werner Koch <wk at gnupg.org>
-2013-03-29:87620ahchj.fsf at vigenere.g10code.de:
-
-William L. Thomson Jr. <wlt at o-sinc.com>
-2017-05-23:assp.0316398ca8.20170523093623.00a17d03 at o-sinc.com:
-
-Yann E. MORIN <yann.morin.1998 at free.fr>
-2016-07-10:20160710093202.GA3688 at free.fr:
-
-Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
-2016-10-17:580484F4.8040806 at ssi.gouv.fr:
-
-Phil Pennock <phil.pennock at spodhuis.org>
-Phil Pennock <phil at pennock-tech.com>
-2017-01-19:20170119061225.GA26207 at breadbox.private.spodhuis.org:
+The list of authors who signed the Developer's Certificate of Origin
+is kept in the GIT master branch's copy of this file.
Other authors
diff --git a/NEWS b/NEWS
index 2dd4e53..0ffff2f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,45 @@
-Noteworthy changes in version 2.2.2 (unreleased)
+Noteworthy changes in version 2.2.2 (2017-11-07)
------------------------------------------------
+ * gpg: Avoid duplicate key imports by concurrently running gpg
+ processes. [#3446]
+
+ * gpg: Fix creating on-disk subkey with on-card primary key. [#3280]
+
+ * gpg: Fix validity retrieval for multiple keyrings. [Debian#878812]
+
+ * gpg: Fix --dry-run and import option show-only for secret keys.
+
+ * gpg: Print "sec" or "sbb" for secret keys with import option
+ import-show. [#3431]
+
+ * gpg: Make import less verbose. [#3397]
+
+ * gpg: Add alias "Key-Grip" for parameter "Keygrip" and new
+ parameter "Subkey-Grip" to unattended key generation. [#3478]
+
+ * gpg: Improve "factory-reset" command for OpenPGP cards. [#3286]
+
+ * gpg: Ease switching Gnuk tokens into ECC mode by using the magic
+ keysize value 25519.
+
+ * gpgsm: Fix --with-colon listing in crt records for fields > 12.
+
+ * gpgsm: Do not expect X.509 keyids to be unique. [#1644]
+
+ * agent: Fix stucked Pinentry when using --max-passphrase-days. [#3190]
+
+ * agent: New option --s2k-count. [#3276 (workaround)]
+
+ * dirmngr: Do not follow https-to-http redirects. [#3436]
+
+ * dirmngr: Reduce default LDAP timeout from 100 to 15 seconds. [#3487]
+
+ * gpgconf: Ignore non-installed components for commands
+ --apply-profile and --apply-defaults. [#3313]
+
+ * Add configure option --enable-werror. [#2423]
+
Noteworthy changes in version 2.2.1 (2017-09-19)
------------------------------------------------
@@ -23,6 +62,8 @@ Noteworthy changes in version 2.2.1 (2017-09-19)
certificates are configured. If build with GNUTLS, this was
already the case.
+ See-also: gnupg-announce/2017q3/000415.html
+
Noteworthy changes in version 2.2.0 (2017-08-28)
------------------------------------------------
diff --git a/README b/README
index 6cd4ddb..dd66dab 100644
--- a/README
+++ b/README
@@ -26,8 +26,7 @@
Note that the 2.0 series of GnuPG will reach end-of-life on
2017-12-31. It is not possible to install a 2.2.x version along
- with any 2.0.x version. However, it is possible to install GnuPG
- 1.4 along with any 2.x version.
+ with any 2.0.x version.
* BUILD INSTRUCTIONS
commit 30f21f8b0fa6844a9bba3f24dc41b3ac32170109
Author: Werner Koch <wk at gnupg.org>
Date: Tue Nov 7 10:02:53 2017 +0100
dirmngr: Reduce default LDAP timeout to 15 seconds.
* dirmngr/dirmngr.c (DEFAULT_LDAP_TIMEOUT): Change to 15.
* dirmngr/dirmngr_ldap.c (DEFAULT_LDAP_TIMEOUT): Ditto.
Signed-off-by: Werner Koch <wk at gnupg.org>
(cherry picked from commit ab7ac827041b5cd97bbca7a75b0930072dd6611f)
GnuPG-bug-id: 3487
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 0d133c6..5317c21 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -279,7 +279,7 @@ static struct debug_flags_s debug_flags [] =
};
#define DEFAULT_MAX_REPLIES 10
-#define DEFAULT_LDAP_TIMEOUT 100 /* arbitrary large timeout */
+#define DEFAULT_LDAP_TIMEOUT 15 /* seconds */
#define DEFAULT_CONNECT_TIMEOUT (15*1000) /* 15 seconds */
#define DEFAULT_CONNECT_QUICK_TIMEOUT ( 2*1000) /* 2 seconds */
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index 5a9ae97..5be4e58 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -104,7 +104,7 @@ static void npth_protect (void) { }
typedef struct timeval my_ldap_timeval_t;
#endif
-#define DEFAULT_LDAP_TIMEOUT 100 /* Arbitrary long timeout. */
+#define DEFAULT_LDAP_TIMEOUT 15 /* Arbitrary long timeout. */
/* Constants for the options. */
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index eef78a8..9654a0e 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -416,7 +416,7 @@ percent-escaped strings.}
@item --ldaptimeout @var{secs}
@opindex ldaptimeout
Specify the number of seconds to wait for an LDAP query before timing
-out. The default is currently 100 seconds. 0 will never timeout.
+out. The default are 15 seconds. 0 will never timeout.
@item --add-servers
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 175 ++-----------------------------------------------
NEWS | 47 ++++++++++++-
README | 3 +-
configure.ac | 2 +-
dirmngr/dirmngr.c | 2 +-
dirmngr/dirmngr_ldap.c | 2 +-
doc/dirmngr.texi | 2 +-
7 files changed, 55 insertions(+), 178 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list