[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta895-33-gd280a52
by Werner Koch
cvs at cvs.gnupg.org
Wed Nov 5 16:54:27 CET 2014
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 d280a52757b6a9968c98500dfe5e07e519423dba (commit)
via e22b459b910762f77245283746de34c67ebc72da (commit)
via 24028875848f7e677e6c99581aa4e390633d571d (commit)
via 6b54759976dc372e34c6d3900fab596936aae6f8 (commit)
from b453226f566b92be0d339d3126eaba75237e97fb (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 d280a52757b6a9968c98500dfe5e07e519423dba
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 5 16:46:52 2014 +0100
Post release updates.
--
diff --git a/NEWS b/NEWS
index 802e26e..ae5afc7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.1 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 2.1.0 (2014-11-06)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8cc06e1..9afcd3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.10"
m4_define([mym4_package],[gnupg])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [1])
-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 e22b459b910762f77245283746de34c67ebc72da
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 5 15:29:58 2014 +0100
Release 2.1.0
commit 24028875848f7e677e6c99581aa4e390633d571d
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 5 08:56:52 2014 +0100
speedo: Do not not assume GNU tar.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/autogen.sh b/autogen.sh
index 112d2ee..7effd56 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -202,12 +202,12 @@ if [ "$myhost" = "find-version" ]; then
case "$version_parts" in
2)
- matchstr1="$package-$major.[0-9][0-9]*"
+ matchstr1="$package-$major.[0-9]*"
matchstr2="$package-$major-base"
vers="$major.$minor"
;;
*)
- matchstr1="$package-$major.$minor.[0-9][0-9]*"
+ matchstr1="$package-$major.$minor.[0-9]*"
matchstr2="$package-$major.$minor-base"
vers="$major.$minor.$micro"
;;
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 8e0ef4e..b7bcf06 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -421,11 +421,13 @@ speedo_pkg_gpa_configure = \
speedo_pkg_gpgex_configure = \
--with-gpg-error-prefix=$(idir) \
- --with-libassuan-prefix=$(idir)
+ --with-libassuan-prefix=$(idir) \
+ --enable-gpa-only
speedo_pkg_w64_gpgex_configure = \
--with-gpg-error-prefix=$(idir6) \
- --with-libassuan-prefix=$(idir6)
+ --with-libassuan-prefix=$(idir6) \
+ --enable-gpa-only
#
@@ -741,15 +743,16 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
elif [ -n "$$$${tar}" ]; then \
echo "speedo: unpacking $(1) from $$$${tar}"; \
case "$$$${tar}" in \
- *.gz) opt=z ;; \
- *.bz2) opt=j ;; \
- *.xz) opt=J ;; \
- *) opt= ;; \
+ *.gz) pretar=zcat ;; \
+ *.bz2) pretar=bzcat ;; \
+ *.xz) pretar=xzcat ;; \
+ *) pretar=cat ;; \
esac; \
[ -f tmp.tgz ] && rm tmp.tgz; \
case "$$$${tar}" in \
- /*) tar x$$$${opt}f - < $$$${tar} ;; \
- *) wget -q -O - $$$${tar} | tee tmp.tgz | tar x$$$${opt}f - ;; \
+ /*) $$$${pretar} < $$$${tar} | tar xf - ;; \
+ *) wget -q -O - $$$${tar} | tee tmp.tgz \
+ | $$$${pretar} | tar x$$$${opt}f - ;; \
esac; \
if [ -f tmp.tgz ]; then \
if [ -n "$$$${sha1}" ]; then \
commit 6b54759976dc372e34c6d3900fab596936aae6f8
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 5 08:42:56 2014 +0100
build: Update README.maint.
--
Also fixed some typos.
diff --git a/README.maint b/README.maint
index 38f2338..9af6029 100644
--- a/README.maint
+++ b/README.maint
@@ -23,10 +23,7 @@ Release process:
* Decide whether you want to update the automake standard files
(Mainly config.guess and config.sub).
- * [1.4 only] Update gpg.texi and gpgv.texi from master:
- make -C doc update-source-from-gnupg-2
-
- * [1.4 and 2.0] Copy needed texinfo files from master:
+ * [2.0] Copy needed texinfo files from master:
make -C doc update-source
* Run:
@@ -34,11 +31,9 @@ Release process:
* Write NEWS entries and set the release date in NEWS.
- * [1.4 and 2.0] In configure.ac set "my_isgit" to "no".
-
* Commit all changes to GIT with a message of "Release n.m.o."
- * Tag the revision with the string "gnupg-x.y.z".
+ * Create a signed tag with the name "gnupg-x.y.z".
* Run "./autogen.sh --force"
(--force is required for the git magic in configure.ac and a good
@@ -64,11 +59,12 @@ Release process:
* Copy the files to the FTP server
- * Update the webpages - at least the file swdb.wml needs an update.
+ * Update the webpages - at least the file swdb.mac needs an update.
* Add a new headline to NEWS.
- * Bump "my_version" up and set "my_isgit" back to "yes" in configure.ac
+ * Bump the version number in configure.ac up, add an empty NEWS
+ entry, commit, and push that.
* Write an announcement.
diff --git a/doc/whats-new-in-2.1.txt b/doc/whats-new-in-2.1.txt
index 10d3f60..d20239f 100644
--- a/doc/whats-new-in-2.1.txt
+++ b/doc/whats-new-in-2.1.txt
@@ -103,7 +103,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
`secring.gpg'. The only difference is that secring stored in addition
to the public part also the private part of the key pair. The secret
keyring thus contained only the keys for which a private key is
- availaable, that is the user’s key. It required a lot of code to keep
+ available, that is the user’s key. It required a lot of code to keep
both versions of the key in sync and led to sometimes surprising
inconsistencies.
@@ -198,8 +198,8 @@ https://gnupg.org/faq/whats-new-in-2.1.html
Thus only the name and the mail address are required. For all other
parameters the default values are used. Many graphical frontends
- works in the same way. Note that GPG prints a hint for the old time
- GPG users on how to get the full option menu.
+ works in the same way. Note that /gpg/ prints a hint for the old time
+ gpg users on how to get the full option menu.
1.4 Support for ECC
@@ -381,7 +381,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
│ sub rsa2048/72A4D018 2014-11-04
╰────
- Another common operation is to sign a key. gpg can do this directly
+ Another common operation is to sign a key. /gpg/ can do this directly
from the command line by giving the fingerprint of the to-be-signed
key:
@@ -478,7 +478,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
A deficit of the OpenPGP protocol is that signatures carry only a
limited indication on which public has been used to create a
signature. Thus a verification engine may only use this “long key id”
- to lookup the the key in its own store or from a public keyserver.
+ to look up the the key in its own store or from a public keyserver.
Unfortunately it has now become possible to create a key with a long
key id matching the key id of another key. Importing a key with a
long key id already used by another key in gpg’s local key store was
@@ -522,7 +522,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
server from the pool.
The new /dirmngr/ in GnuPG does not use the implicit round-robin of
- the DNS resolver but uses its own DNS lookup and keeps an internal
+ the DNS resolver but uses its own DNS look up and keeps an internal
table of all hosts from the pool along with the encountered aliveness
state. Thus after a failure (timeout) of a request, /dirmngr/ flags a
host as dead and randomly selects another one from the pool. After a
@@ -544,10 +544,10 @@ https://gnupg.org/faq/whats-new-in-2.1.html
──────────────────────────
The format GnuPG has always used for the public keyring is actually a
- slighly extended version of the on-the-wire format for OpenPGP key
+ slightly extended version of the on-the-wire format for OpenPGP key
exchange. This format is quite inflexible to work with when random
access to keys in the keyring is required. In fact /gpg/ always
- parsed all keys in the kering until it encountred the desired one.
+ parsed all keys in the keyring until it encountered the desired one.
With a large keyring (more than a few thousand keys) this could be
quite slow.
@@ -570,9 +570,9 @@ https://gnupg.org/faq/whats-new-in-2.1.html
`pubring.gpg' file and not know anything about keys stored in the
keybox file.
- To convert an existsing `pubring.gpg' file to the keybox format, you
+ To convert an existing `pubring.gpg' file to the keybox format, you
first rename the file to (for example) `publickeys' so it won’t be
- recognized by any GnupG version and then you run the command
+ recognized by any GnuPG version and then you run the command
╭────
│ $ gpg2 --import publickeys
@@ -597,12 +597,12 @@ https://gnupg.org/faq/whats-new-in-2.1.html
──────────────────────────
The /scdaemon/, which is responsible for accessing smardcards and
- other tokens, has received may updates. In particilar pluggable USB
- readers with a fixed card now work smoothless and simlar to standard
+ other tokens, has received may updates. In particular plugable USB
+ readers with a fixed card now work smoothless and similar to standard
readers. The latest features of the /gnuk/ token are supported. Code
for the HSM smartcard has been added. More card readers with a PIN
pad are supported. The internal CCID driver does now also work with
- certain non-auto configration equipped readers.
+ certain non-auto configuration equipped readers.
1.14 New format for key listings
@@ -692,8 +692,8 @@ https://gnupg.org/faq/whats-new-in-2.1.html
This command downloads all direct dependencies, checks the signatures
using the GnuPG version from the build system (all Linux distros
- feature a suitable GnuPG tool), builds everthing from source, and uses
- NSIS to create the installer. Although this sounds easy, some
+ feature a suitable GnuPG tool), builds everything from source, and
+ uses NSIS to create the installer. Although this sounds easy, some
experience in setting up a development machine is still required.
Some versions of the toolchain exhibit bugs and thus your mileage may
vary. Support for keyserver access over TLS is currently not
-----------------------------------------------------------------------
Summary of changes:
NEWS | 4 ++++
README.maint | 14 +++++---------
autogen.sh | 4 ++--
build-aux/speedo.mk | 19 +++++++++++--------
configure.ac | 2 +-
doc/whats-new-in-2.1.txt | 30 +++++++++++++++---------------
6 files changed, 38 insertions(+), 35 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list