[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2-base-22-g9e3d41b
by Werner Koch
cvs at cvs.gnupg.org
Mon Aug 28 12:09:15 CEST 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 9e3d41bf727fcf12f7cf05926890c687125c2902 (commit)
via 9d80fb8e000189e61c173c39f1e1ca417566a7fc (commit)
via 24462fea508f0dfe1192d47e14dcb9527565655f (commit)
via 45d5f5800afe6613f338a26f361cb5e03e861129 (commit)
via 13821e15fb9bdddfce79d88731c0f151724b2371 (commit)
via b065a696344eac3007dbd5642143ecaaeebab43a (commit)
via 757302cc7a94633cd9bda5eb4dbe5c6e804b957b (commit)
via 02a5df614a369519ad7781f95dc977e24a0d4277 (commit)
via 565e486b8028f9e3cc51ebc5202666b598042175 (commit)
via b917cb66b79597520788cd9264889942247a3377 (commit)
via 008ae0bd868cb49ad4d67fc8c71707cd2a162137 (commit)
via fd0e5b60bed1cfc2aed7b2e13cc449f355eac051 (commit)
via 6158811304937b592601ef30c29c5a5cdbaa88ea (commit)
via e6fa6b0ce823effd721c807b2b292287af91c642 (commit)
via c23a69970ba38edae9d3b2603825d18fbb732423 (commit)
via cbe54b28bf3610204e12c50c0606df37337a1156 (commit)
via 0161225457e0609509d0d5f4b80a60a1071b4b48 (commit)
via 6e596b2a745ae7a75a69038cf00ab4bbae1cebaa (commit)
via e6f84116abca2ed49bf14b2e28c3c811a3717227 (commit)
via 2d6832aa83ebdf3fe422c7c7d5411d1b44a6ac34 (commit)
via 23107ba20f8b4eb5482b480ad6a8af6b39d2bfeb (commit)
via 977fc5f0eb9fdee19e66bea8cd2eb5414789b485 (commit)
from d6b40a9c866a8495d6a2c0bc3eac158ddd2928c7 (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 9e3d41bf727fcf12f7cf05926890c687125c2902
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 28 11:57:17 2017 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index 345fe23..7510ff4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.2.1 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 2.2.0 (2017-08-28)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 6f945bd..fbd5c18 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], [0])
+m4_define([mym4_micro], [1])
# 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 9d80fb8e000189e61c173c39f1e1ca417566a7fc
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 28 11:18:26 2017 +0200
Release 2.2.0
diff --git a/NEWS b/NEWS
index 3b4e008..345fe23 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
-Noteworthy changes in version 2.2.0 (unreleased)
--------------------------------------------------
+Noteworthy changes in version 2.2.0 (2017-08-28)
+------------------------------------------------
+
+ This is the new long term stable branch. This branch will only see
+ bug fixes and no new features.
+
+ * gpg: Reverted change in 2.1.23 so that --no-auto-key-retrieve is
+ again the default.
+
+ * Fixed a few minor bugs.
Noteworthy changes in version 2.1.23 (2017-08-09)
@@ -38,6 +46,8 @@ Noteworthy changes in version 2.1.23 (2017-08-09)
* Fixed connection timeout problem under Windows.
+ See-also: gnupg-announce/2017q3/000412.html
+
Noteworthy changes in version 2.1.22 (2017-07-28)
-------------------------------------------------
diff --git a/README b/README
index a9a3eb0..6cd4ddb 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
The GNU Privacy Guard 2
=========================
- Version 2.1
+ Version 2.2
Copyright 1997-2017 Werner Koch
Copyright 1998-2017 Free Software Foundation, Inc.
@@ -25,14 +25,14 @@
GNU General Public License.
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.1.x version along
+ 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 a 2.x version.
+ 1.4 along with any 2.x version.
* BUILD INSTRUCTIONS
- GnuPG 2.1 depends on the following GnuPG related packages:
+ GnuPG 2.2 depends on the following GnuPG related packages:
npth (ftp://ftp.gnupg.org/gcrypt/npth/)
libgpg-error (ftp://ftp.gnupg.org/gcrypt/libgpg-error/)
@@ -122,9 +122,9 @@
Add other options as needed.
-* MIGRATION from 1.4 or 2.0 to 2.1
+* MIGRATION from 1.4 or 2.0 to 2.2
- The major change in 2.1 is gpg-agent taking care of the OpenPGP
+ The major change in 2.2 is gpg-agent taking care of the OpenPGP
secret keys (those managed by GPG). The former file "secring.gpg"
will not be used anymore. Newly generated keys are stored in the
agent's key store directory "~/.gnupg/private-keys-v1.d/". The
@@ -134,7 +134,7 @@
Note that gpg-agent now uses a fixed socket. All tools will start
the gpg-agent as needed. The formerly used environment variable
- GPG_AGENT_INFO is ignored by 2.1. The SSH_AUTH_SOCK environment
+ GPG_AGENT_INFO is ignored by 2.2. The SSH_AUTH_SOCK environment
variable should be set to a fixed value.
The Dirmngr is now part of GnuPG proper and also used to access
@@ -142,6 +142,9 @@
use of the GnuPG directories. Dirmngr is started by gpg or gpgsm as
needed. There is no more need to install a separate Dirmngr package.
+ All changes introduced with GnuPG 2.2 have been developed in the 2.1
+ series of releases. See the respective entries in the file NEWS.
+
* RECOMMENDATIONS
** Socket directory
@@ -193,13 +196,13 @@
* HOW TO GET MORE INFORMATION
- A description of new features and changes in version 2.1 can be
+ A description of new features and changes since version 2.1 can be
found in the file "doc/whats-new-in-2.1.txt" and online at
"https://gnupg.org/faq/whats-new-in-2.1.html" .
- The primary WWW page is "https://www.gnupg.org"
+ The primary WWW page is "https://gnupg.org"
or using Tor "http://ic6au7wa3f6naxjq.onion"
- The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/"
+ The primary FTP site is "https://gnupg.org/ftp/gcrypt/"
See [[https://gnupg.org/download/mirrors.html]] for a list of
mirrors and use them if possible. You may also find GnuPG mirrored
@@ -229,7 +232,7 @@
https://www.gnupg.org/documentation/mailing-lists.html for archives
of the mailing lists.
- Please direct bug reports to [[http://bugs.gnupg.org]] or post them
+ Please direct bug reports to [[https://bugs.gnupg.org]] or post them
direct to the mailing list <gnupg-devel at gnupg.org>.
Please direct questions about GnuPG to the users mailing list or one
diff --git a/configure.ac b/configure.ac
index 33c88d2..6f945bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1864,7 +1864,7 @@ if test "$have_gpg_error" = "no"; then
***
*** You need libgpg-error to build this program.
** This library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/libgpg-error
+*** https://gnupg.org/ftp/gcrypt/libgpg-error
*** (at least version $NEED_GPG_ERROR_VERSION is required.)
***]])
fi
@@ -1874,7 +1874,7 @@ if test "$have_libgcrypt" = "no"; then
***
*** You need libgcrypt to build this program.
** This library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+*** https://gnupg.org/ftp/gcrypt/libgcrypt/
*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) is required.)
***]])
fi
@@ -1884,7 +1884,7 @@ if test "$have_libassuan" = "no"; then
***
*** You need libassuan to build this program.
*** This library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/libassuan/
+*** https://gnupg.org/ftp/gcrypt/libassuan/
*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required).
***]])
fi
@@ -1894,7 +1894,7 @@ if test "$have_ksba" = "no"; then
***
*** You need libksba to build this program.
*** This library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/libksba/
+*** https://gnupg.org/ftp/gcrypt/libksba/
*** (at least version $NEED_KSBA_VERSION using API $NEED_KSBA_API is required).
***]])
fi
@@ -1915,7 +1915,7 @@ if test "$have_npth" = "no"; then
*** It is now required to build with support for the
*** New Portable Threads Library (nPth). Please install this
*** library first. The library is for example available at
-*** ftp://ftp.gnupg.org/gcrypt/npth/
+*** https://gnupg.org/ftp/gcrypt/npth/
*** (at least version $NEED_NPTH_VERSION (API $NEED_NPTH_API) is required).
***]])
fi
@@ -1928,7 +1928,7 @@ if test "$require_iconv" = yes; then
*** The system does not provide a working iconv function. Please
*** install a suitable library; for example GNU Libiconv which is
*** available at:
-*** http://ftp.gnu.org/gnu/libiconv/
+*** https://ftp.gnu.org/gnu/libiconv/
***]])
fi
fi
diff --git a/doc/whats-new-in-2.1.txt b/doc/whats-new-in-2.1.txt
index 4b7349a..ef8b233 100644
--- a/doc/whats-new-in-2.1.txt
+++ b/doc/whats-new-in-2.1.txt
@@ -6,7 +6,7 @@
━━━━━━━━━━━━━━━━━━━━━━━━━━━
- 2016-07-14
+ 2017-08-28
Table of Contents
@@ -42,11 +42,11 @@ https://gnupg.org/faq/whats-new-in-2.1.html
1 What’s new in GnuPG 2.1
═════════════════════════
- GnuPG version 2.1 comes with a bag of new features which changes some
- things old-timers are used to. This page explains the more important
- ones. It expects that the reader is familiar with GnuPG version 2.0
- and aware that GnuPG consists of /gpg/, /gpgsm/, and /gpg-agent/ as
- its main components.
+ GnuPG version 2.1 (now known as 2.2) comes with a bag of new features
+ which changes some things old-timers are used to. This page explains
+ the more important ones. It expects that the reader is familiar with
+ GnuPG version 2.0 and aware that GnuPG consists of /gpg/, /gpgsm/, and
+ /gpg-agent/ as its main components.
• The file /secring.gpg/ is not anymore used to store the secret keys.
Merging of secret keys is now supported.
@@ -103,8 +103,8 @@ https://gnupg.org/faq/whats-new-in-2.1.html
• The scripts to create a Windows installer are now part of GnuPG.
Now for the detailed description of these new features. Note that the
- examples assume that /gpg/ is installed as /gpg/. Your
- installation may have it installed under the name /gpg2/.
+ examples assume that /gpg/ is installed as /gpg/. Your installation
+ may have it installed under the name /gpg2/.
1.1 Removal of the secret keyring
@@ -477,6 +477,25 @@ https://gnupg.org/faq/whats-new-in-2.1.html
│ uid [ unknown] Sample 2 <me at example.org>
└────
+ Since version 2.1.17 the expiration date of the primary key can be
+ changed directly:
+
+ ┌────
+ │ $ gpg --quick-set-expire 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7 2017-12-31
+ │ $ gpg -K 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7
+ │ sec rsa2048 2016-06-22 [SC] [expires: 2017-12-31]
+ │ 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7
+ │ uid [ultimate] steve.biko at example.net
+ │ ssb rsa2048 2016-06-22 [E]
+ │
+ │ $ gpg --quick-set-expire 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7 none
+ │ $ gpg -K 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7
+ │ sec rsa2048 2016-06-22 [SC]
+ │ 5B83120DB1E3A65AE5A8DCF6AA43F1DCC7FED1B7
+ │ uid [ultimate] steve.biko at example.net
+ │ ssb rsa2048 2016-06-22 [E]
+ └────
+
1.6 Improved Pinentry support
─────────────────────────────
@@ -510,9 +529,9 @@ https://gnupg.org/faq/whats-new-in-2.1.html
at login time and use an environment variable (`GPG_AGENT_INFO') to
tell the other GnuPG modules how to connect to the agent. However,
correctly managing the start up and this environment variable is
- cumbersome so that an easier method is required. Since GnuPG
- 2.0.16 the `--use-standard-socket' option already allowed to start the
- agent on the fly; however the environment variable was still required.
+ cumbersome so that an easier method is required. Since GnuPG 2.0.16
+ the `--use-standard-socket' option already allowed to start the agent
+ on the fly; however the environment variable was still required.
With GnuPG 2.1 the need of `GPG_AGENT_INFO' has been completely
removed and the variable is ignored. Instead a fixed Unix domain
@@ -668,6 +687,10 @@ https://gnupg.org/faq/whats-new-in-2.1.html
pad are supported. The internal CCID driver does now also work with
certain non-auto-configuration equipped readers.
+ Since version 2.1.19 multiple card readers are support and the format
+ of the Pinentry prompts has been changed to show more information on
+ the requested card.
+
[gnuk] http://www.fsij.org/doc-gnuk/
@@ -713,7 +736,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
makes writing of key manager software easier.
- [GPGME] https://gnupg.org/related_software/gpgme/
+ [GPGME] https://gnupg.org/software/gpgme/
1.15 Recipient key from file
@@ -836,7 +859,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
- # Copyright 2014--2016 The GnuPG Project.
+ # Copyright 2014--2017 The GnuPG Project.
# This work is licensed under the Creative Commons
# Attribution-ShareAlike 4.0 International License. To view a copy of
# this license, visit http://creativecommons.org/licenses/by-sa/4.0/
commit 24462fea508f0dfe1192d47e14dcb9527565655f
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 28 11:17:39 2017 +0200
po: Auto update
--
diff --git a/po/ja.po b/po/ja.po
index dcfbc68..6567ab3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1198,7 +1198,9 @@ msgid "WARNING: %s\n"
msgstr "*警告*: %s\n"
msgid "Note: Outdated servers may lack important security fixes.\n"
-msgstr "*注意*: 古いサーバは、重要なセキュリティの修正が欠如しているかもしれません。\n"
+msgstr ""
+"*注意*: 古いサーバは、重要なセキュリティの修正が欠如しているかもしれませ"
+"ん。\n"
#, c-format
msgid "Note: Use the command \"%s\" to restart them.\n"
diff --git a/po/ru.po b/po/ru.po
index a7fb60c..f995349 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1209,8 +1209,8 @@ msgstr "Внимание: %s\n"
msgid "Note: Outdated servers may lack important security fixes.\n"
msgstr ""
-"Замечание: На старых серверах могут быть оставаться ошибки, "
-"критичные для безопасности.\n"
+"Замечание: На старых серверах могут быть оставаться ошибки, критичные для "
+"безопасности.\n"
#, c-format
msgid "Note: Use the command \"%s\" to restart them.\n"
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
NEWS | 18 +-
README | 25 +-
agent/agent.h | 2 +-
autogen.rc | 4 +-
build-aux/speedo.mk | 4 +-
configure.ac | 18 +-
doc/gpg.texi | 2 +-
doc/whats-new-in-2.1.txt | 49 +-
g10/gpg.c | 19 +-
g10/keyedit.c | 5 +-
g10/sig-check.c | 141 +-
g10/trustdb.c | 3 +
po/ja.po | 34 +-
po/nb.po | 1576 +++-----------------
po/ru.po | 93 +-
scd/app-openpgp.c | 4 +-
tests/gpgscm/scheme.c | 14 +-
tests/openpgp/Makefile.am | 24 +-
tests/openpgp/README | 43 +-
tests/openpgp/defs.scm | 24 +
tests/openpgp/tofu.scm | 24 -
tests/openpgp/trust-pgp-1.scm | 76 +
tests/openpgp/trust-pgp-2.scm | 39 +
tests/{gpgsm/shell.scm => openpgp/trust-pgp-3.scm} | 21 +-
tests/openpgp/trust-pgp-4.scm | 37 +
tests/openpgp/trust-pgp/alice.sec.asc | 11 +
tests/openpgp/trust-pgp/bobby.sec.asc | 11 +
tests/openpgp/trust-pgp/carol.sec.asc | 11 +
tests/openpgp/trust-pgp/common.scm | 66 +
tests/openpgp/trust-pgp/david.sec.asc | 11 +
tests/openpgp/trust-pgp/frank.sec.asc | 11 +
tests/openpgp/trust-pgp/grace.sec.asc | 11 +
tests/openpgp/trust-pgp/heidi.sec.asc | 11 +
tests/openpgp/trust-pgp/scenario1.asc | 75 +
tests/openpgp/trust-pgp/scenario2.asc | 70 +
tests/openpgp/trust-pgp/scenario3.asc | 58 +
tests/openpgp/trust-pgp/scenario4.asc | 84 ++
tools/gpgconf-comp.c | 16 +-
tools/gpgconf.c | 2 +-
40 files changed, 1179 insertions(+), 1570 deletions(-)
create mode 100755 tests/openpgp/trust-pgp-1.scm
create mode 100755 tests/openpgp/trust-pgp-2.scm
copy tests/{gpgsm/shell.scm => openpgp/trust-pgp-3.scm} (58%)
mode change 100644 => 100755
create mode 100755 tests/openpgp/trust-pgp-4.scm
create mode 100644 tests/openpgp/trust-pgp/alice.sec.asc
create mode 100644 tests/openpgp/trust-pgp/bobby.sec.asc
create mode 100644 tests/openpgp/trust-pgp/carol.sec.asc
create mode 100644 tests/openpgp/trust-pgp/common.scm
create mode 100644 tests/openpgp/trust-pgp/david.sec.asc
create mode 100644 tests/openpgp/trust-pgp/frank.sec.asc
create mode 100644 tests/openpgp/trust-pgp/grace.sec.asc
create mode 100644 tests/openpgp/trust-pgp/heidi.sec.asc
create mode 100644 tests/openpgp/trust-pgp/scenario1.asc
create mode 100644 tests/openpgp/trust-pgp/scenario2.asc
create mode 100644 tests/openpgp/trust-pgp/scenario3.asc
create mode 100644 tests/openpgp/trust-pgp/scenario4.asc
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list