[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-56-g7ddbcb6

[by Werner Koch]

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  7ddbcb6b6ab8b26c8e609fcd95c2c8a89bc20a7d (commit)
       via  c4b9a9b9f31587d090a3139e97fa0adfcad5fdbf (commit)
       via  7441e622ffb3296686bd0d7f04b4051466aaad38 (commit)
      from  8f8c6594147608b1021c16fc3561feb96da5d55a (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 7ddbcb6b6ab8b26c8e609fcd95c2c8a89bc20a7d
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Mar 26 15:52:15 2012 +0200

    Allow compress algorithm 0.
    
    * g10/mainproc.c (proc_compressed): Remove superfluous check for
    compress algorithm 0.  Reported by pfandrade.  This is bug#1326.

diff --git a/g10/mainproc.c b/g10/mainproc.c
index ca8b446..62b530b 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -782,9 +782,7 @@ proc_compressed( CTX c, PACKET *pkt )
     int rc;
 
     /*printf("zip: compressed data packet\n");*/
-    if( !zd->algorithm )
-      rc=G10ERR_COMPR_ALGO;
-    else if( c->sigs_only )
+    if (c->sigs_only)
       rc = handle_compressed (c->ctrl, c, zd, proc_compressed_cb, c );
     else if( c->encrypt_only )
       rc = handle_compressed (c->ctrl, c, zd, proc_encrypt_cb, c );

commit c4b9a9b9f31587d090a3139e97fa0adfcad5fdbf
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Mar 26 15:50:13 2012 +0200

    Typo fixes in de.po.
    
    --
    This is bug#1276 and http://bugs.debian.org/594343

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 481e05e..420326b 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1363,7 +1363,7 @@ useful for a "persona" verification, where you sign the key of a
 pseudonymous user.
 
 2 means you did casual verification of the key. For example, this
-could mean that you verified that the key fingerprint and checked the
+could mean that you verified the key fingerprint and checked the
 user ID on the key against a photo ID.
 
 3 means you did extensive verification of the key. For example, this

commit 7441e622ffb3296686bd0d7f04b4051466aaad38
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Mar 26 15:48:47 2012 +0200

    Add mksamplekeys script.
    
    * doc/mksamplekeys: New.
    --
    Note that we have the same script in the 1.4 branch.  That should be
    removed and only this one shall be used.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e228f23..9a46a07 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,7 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-EXTRA_DIST = samplekeys.asc \
+EXTRA_DIST = samplekeys.asc mksamplekeys \
 	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
diff --git a/doc/mksamplekeys b/doc/mksamplekeys
new file mode 100755
index 0000000..bb04cec
--- /dev/null
+++ b/doc/mksamplekeys
@@ -0,0 +1,11 @@
+#/bin/sh
+# Generate a samplekeys.asc
+
+keys='1E42B367 99242560 87978569
+      4F25E3B6 5B0358A2 57548DCD B2D7795E 1CE0C630'
+
+for i in $keys; do
+  gpg --list-keys $i | awk ' { print "  " $0 }'
+done
+echo
+gpg --export-options export-minimal --export -a $keys

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am  |    2 +-
 doc/gpg.texi     |    2 +-
 doc/mksamplekeys |   11 +++++++++++
 g10/mainproc.c   |    4 +---
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100755 doc/mksamplekeys


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org