[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.20-35-g45f43ed
by Werner Koch
cvs at cvs.gnupg.org
Mon Aug 19 15:06:00 CEST 2013
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-0 has been updated
via 45f43ed5f651e2f82cf4d31b960a98535dcb103e (commit)
via 9cf37aa69051d08c738dff355bac593aba4bdbb4 (commit)
via 2d360a96375843c437680b28a4f96f176d70a7c1 (commit)
from 284e387707ef14f8f999f7b5cc869cfa74e51f17 (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 45f43ed5f651e2f82cf4d31b960a98535dcb103e
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 14:32:51 2013 +0200
Post release updates.
--
diff --git a/NEWS b/NEWS
index d40f7d5..ccd99f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.0.22 (unreleased)
+-------------------------------------------------
+
+
Noteworthy changes in version 2.0.21 (2013-08-19)
-------------------------------------------------
diff --git a/announce.txt b/announce.txt
index d4e11b1..27dada7 100644
--- a/announce.txt
+++ b/announce.txt
@@ -5,7 +5,7 @@ Mail-Followup-To: gnupg-users at gnupg.org
Hello!
We are pleased to announce the availability of a new stable GnuPG-2
-release: Version 2.0.20.
+release: Version 2.0.21.
The GNU Privacy Guard (GnuPG) is GNU's tool for secure communication
and data storage. It can be used to encrypt data, create digital
@@ -14,7 +14,7 @@ framework for public key cryptography. It includes an advanced key
management facility and is compliant with the OpenPGP and S/MIME
standards.
-GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.13) in
+GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.14) in
that it splits up functionality into several modules. However, both
versions may be installed alongside without any conflict. In fact,
the gpg version from GnuPG-1 is able to make use of the gpg-agent as
@@ -29,43 +29,23 @@ GnuPG is distributed under the terms of the GNU General Public License
also available for other Unices, Microsoft Windows and Mac OS X.
-What's New in 2.0.20
+What's New in 2.0.21
====================
- * Decryption using smartcards keys > 3072 bit does now work.
+ * gpg-agent: By default the users are now asked via the Pinentry
+ whether they trust an X.509 root key. To prohibit interactive
+ marking of such keys, the new option --no-allow-mark-trusted may
+ be used.
- * New meta option ignore-invalid-option to allow using the same
- option file by other GnuPG versions.
+ * gpg-agent: The command KEYINFO has options to add info from
+ sshcontrol.
- * gpg: The hash algorithm is now printed for sig records in key listings.
+ * The included ssh agent does now support ECDSA keys.
- * gpg: Skip invalid keyblock packets during import to avoid a DoS.
+ * The new option --enable-putty-support allows gpg-agent to act on
+ Windows as a Pageant replacement with full smartcard support.
- * gpg: Correctly handle ports from DNS SRV records.
-
- * keyserver: Improve use of SRV records
-
- * gpg-agent: Avoid tty corruption when killing pinentry.
-
- * scdaemon: Improve detection of card insertion and removal.
-
- * scdaemon: Rename option --disable-keypad to --disable-pinpad.
-
- * scdaemon: Better support for CCID readers. Now, the internal CCID
- driver supports readers without the auto configuration feature.
-
- * scdaemon: Add pinpad input for PC/SC, if your reader has pinpad and
- it supports variable length PIN input, and you specify
- --enable-pinpad-varlen option.
-
- * scdaemon: New option --enable-pinpad-varlen.
-
- * scdaemon: Install into libexecdir to avoid accidental execution
- from the command line.
-
- * Support building using w64-mingw32.
-
- * Assorted bug fixes.
+ * Support installation as portable application under Windows.
Getting the Software
@@ -74,7 +54,7 @@ Getting the Software
Please follow the instructions found at http://www.gnupg.org/download/
or read on:
-GnuPG 2.0.20 may be downloaded from one of the GnuPG mirror sites or
+GnuPG 2.0.21 may be downloaded from one of the GnuPG mirror sites or
direct from ftp://ftp.gnupg.org/gcrypt/gnupg/ . The list of mirrors
can be found at http://www.gnupg.org/mirrors.html . Note, that GnuPG
is not available at ftp.gnu.org.
@@ -82,14 +62,14 @@ is not available at ftp.gnu.org.
On the FTP server and its mirrors you should find the following files
in the gnupg/ directory:
- gnupg-2.0.20.tar.bz2 (4186k)
- gnupg-2.0.20.tar.bz2.sig
+ gnupg-2.0.21.tar.bz2 (4200k)
+ gnupg-2.0.21.tar.bz2.sig
GnuPG source compressed using BZIP2 and OpenPGP signature.
- gnupg-2.0.19-2.0.20.diff.bz2 (249k)
+ gnupg-2.0.20-2.0.21.diff.bz2 (39k)
- A patch file to upgrade a 2.0.19 GnuPG source tree. This patch
+ A patch file to upgrade a 2.0.20 GnuPG source tree. This patch
does not include updates of the language files.
Note, that we don't distribute gzip compressed tarballs for GnuPG-2.
@@ -104,9 +84,9 @@ the following ways:
* If you already have a trusted version of GnuPG installed, you
can simply check the supplied signature. For example to check the
- signature of the file gnupg-2.0.20.tar.bz2 you would use this command:
+ signature of the file gnupg-2.0.21.tar.bz2 you would use this command:
- gpg --verify gnupg-2.0.20.tar.bz2.sig
+ gpg --verify gnupg-2.0.21.tar.bz2.sig
This checks whether the signature file matches the source file.
You should see a message indicating that the signature is good and
@@ -129,15 +109,15 @@ the following ways:
* If you are not able to use an old version of GnuPG, you have to verify
the SHA-1 checksum. Assuming you downloaded the file
- gnupg-2.0.20.tar.bz2, you would run the sha1sum command like this:
+ gnupg-2.0.21.tar.bz2, you would run the sha1sum command like this:
- sha1sum gnupg-2.0.20.tar.bz2
+ sha1sum gnupg-2.0.21.tar.bz2
and check that the output matches the first line from the
following list:
-7ddfefa37ee9da89a8aaa8f9059d251b4cd02562 gnupg-2.0.20.tar.bz2
-4afefda1f42c7b8065e97c6df051fab2db552642 gnupg-2.0.19-2.0.20.diff.bz2
+5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26 gnupg-2.0.21.tar.bz2
+cd94a6267088eeff4735641b1fc832a1e6770ba3 gnupg-2.0.20-2.0.21.diff.bz2
Documentation
@@ -179,9 +159,9 @@ service directory at:
The driving force behind the development of GnuPG is the company of
its principal author, Werner Koch. Maintenance and improvement of
-GnuPG and related software takes up most of their resources. To
-allow him them continue his work he asks to either purchase a support
-contract, engage them for custom enhancements, or to donate money:
+GnuPG and related software takes up most of their resources. To allow
+him to continue this work he kindly asks to either purchase a support
+contract, engage g10 Code for custom enhancements, or to donate money:
http://g10code.com/gnupg-donation.html
@@ -191,7 +171,7 @@ Thanks
We have to thank all the people who helped with this release, be it
testing, coding, translating, suggesting, auditing, administering the
-servers, spreading the word or answering questions on the mailing
+servers, spreading the word, or answering questions on the mailing
lists.
diff --git a/configure.ac b/configure.ac
index 3d0b036..9814110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.21])
+m4_define([mym4_version], [2.0.22])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 9cf37aa69051d08c738dff355bac593aba4bdbb4
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 13:09:07 2013 +0200
Release 2.0.21
diff --git a/NEWS b/NEWS
index 990e241..d40f7d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.21 (unreleased)
+Noteworthy changes in version 2.0.21 (2013-08-19)
-------------------------------------------------
* gpg-agent: By default the users are now asked via the Pinentry
@@ -6,10 +6,13 @@ Noteworthy changes in version 2.0.21 (unreleased)
marking of such keys, the new option --no-allow-mark-trusted may
be used.
+ * gpg-agent: The command KEYINFO has options to add info from
+ sshcontrol.
+
* The included ssh agent does now support ECDSA keys.
- * The new option --enable-putty-support allows gpg-agent on Windows
- to act as a Pageant replacement with full smartcard support.
+ * The new option --enable-putty-support allows gpg-agent to act on
+ Windows as a Pageant replacement with full smartcard support.
* Support installation as portable application under Windows.
commit 2d360a96375843c437680b28a4f96f176d70a7c1
Author: Werner Koch <wk at gnupg.org>
Date: Mon Aug 19 13:08:37 2013 +0200
Require libgpg-error 1.11.
* configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.11.
* common/util.h: Remove GPG_ERR_ replacements.
--
The replacement macros actually never worked because gog-error.h uses
enums and not macros. libgpg-error 1.11 is 6 months old and thus it
should not be a problem to require that version.
Future replacement macros may then use the new
GPG_ERROR_VERSION_NUMBER to detect missing error codes.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/util.h b/common/util.h
index cad6c8e..becc9cf 100644
--- a/common/util.h
+++ b/common/util.h
@@ -25,13 +25,6 @@
#include <errno.h> /* We need errno. */
#include <gpg-error.h> /* We need gpg_error_t. */
-/* Add error codes available only in newer versions of libgpg-error. */
-#ifndef GPG_ERR_NOT_ENABLED
-#define GPG_ERR_NOT_ENABLED 179
-#endif
-#ifndef GPG_ERR_MISSING_ISSUER_CERT
-#define GPG_ERR_MISSING_ISSUER_CERT 185
-#endif
/* Hash function used with libksba. */
#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
@@ -62,10 +55,10 @@
/* GCC attributes. */
-#if __GNUC__ >= 4
+#if __GNUC__ >= 4
# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
#else
-# define GNUPG_GCC_A_SENTINEL(a)
+# define GNUPG_GCC_A_SENTINEL(a)
#endif
@@ -159,14 +152,14 @@ int answer_is_yes_no_quit (const char *s);
int answer_is_okay_cancel (const char *s, int def_answer);
/*-- xreadline.c --*/
-ssize_t read_line (FILE *fp,
+ssize_t read_line (FILE *fp,
char **addr_of_buffer, size_t *length_of_buffer,
size_t *max_length);
/*-- b64enc.c and b64dec.c --*/
-struct b64state
-{
+struct b64state
+{
unsigned int flags;
int idx;
int quad_count;
@@ -205,9 +198,9 @@ unsigned char *make_canon_sexp_from_rsa_pk (const void *m, size_t mlen,
size_t *r_len);
gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata,
size_t keydatalen,
- unsigned char const **r_n,
+ unsigned char const **r_n,
size_t *r_nlen,
- unsigned char const **r_e,
+ unsigned char const **r_e,
size_t *r_elen);
gpg_error_t get_pk_algo_from_canon_sexp (const unsigned char *keydata,
size_t keydatalen,
@@ -246,7 +239,7 @@ const char *dirmngr_socket_name (void);
gpgconf. */
#define GNUPG_MODULE_NAME_AGENT 1
#define GNUPG_MODULE_NAME_PINENTRY 2
-#define GNUPG_MODULE_NAME_SCDAEMON 3
+#define GNUPG_MODULE_NAME_SCDAEMON 3
#define GNUPG_MODULE_NAME_DIRMNGR 4
#define GNUPG_MODULE_NAME_PROTECT_TOOL 5
#define GNUPG_MODULE_NAME_CHECK_PATTERN 6
@@ -296,7 +289,7 @@ int match_multistr (const char *multistr,const char *match);
#ifndef HAVE_TTYNAME
/* Systems without ttyname (W32) will merely return NULL. */
static inline char *
-ttyname (int fd)
+ttyname (int fd)
{
(void)fd;
return NULL;
diff --git a/configure.ac b/configure.ac
index 4080699..3d0b036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
AC_INIT([gnupg],[mym4_full_version], [http://bugs.gnupg.org])
-NEED_GPG_ERROR_VERSION=1.7
+NEED_GPG_ERROR_VERSION=1.11
NEED_LIBGCRYPT_API=1
NEED_LIBGCRYPT_VERSION=1.4.0
-----------------------------------------------------------------------
Summary of changes:
NEWS | 13 +++++++--
announce.txt | 76 +++++++++++++++++++++------------------------------------
common/util.h | 25 ++++++------------
configure.ac | 4 +-
4 files changed, 49 insertions(+), 69 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list