[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.21-4-g23944d0

[by Daniel Kahn Gillmor]

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-1-4 has been updated
       via  23944d0249b7a6dc854dcc8b0c7c74cd46b1341e (commit)
       via  f2acaa5d785a29eca629c4b3df739bc474249004 (commit)
      from  82bc22aa139c7dda5276fc658d4ee40cab27d8e7 (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 23944d0249b7a6dc854dcc8b0c7c74cd46b1341e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 29 10:36:33 2016 -0400

    spelling: Correct achived to achieved.
    
    --
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/THOUGHTS b/THOUGHTS
index 25707c4..aba9402 100644
--- a/THOUGHTS
+++ b/THOUGHTS
@@ -90,7 +90,7 @@ extension mechanisms in GPG should be enough to try various ways later on.
 
 1) pass an argument string to loadable extension modules (maybe
     gpg --load-extension foofish=arg1,arg2,arg3 ?)
-    --> could also be achived by S-Exps
+    --> could also be achieved by S-Exps
 
 2) allow multiple instances of the same extension module (presumably with
    different arguments)
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 12a6d60..e9935c3 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1894,7 +1894,7 @@ opposite meaning. The options are:
   a formerly deleted key does not automatically gain an ownertrust
   values merely due to import.  On the other hand it is sometimes
   necessary to re-import a trusted set of keys again but keeping
-  already assigned ownertrust values.  This can be achived by using
+  already assigned ownertrust values.  This can be achieved by using
   this option.
 
   @item repair-pks-subkey-bug

commit f2acaa5d785a29eca629c4b3df739bc474249004
Author: Neal H. Walfield <neal at g10code.com>
Date:   Mon Aug 29 10:56:16 2016 -0400

    tools: Fix option parsing for gpg-zip.
    
    * tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
    Correctly set TAR when --tar is specified.  Pass TAR_ARGS to tar.
    
    (cherry-picked by dkg from master branch's
    84ebf15b06e435453b2f58775f97a3a1c61a7e55)
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Co-authored-by: Michael Mönch <michael.moench at marktjagd.de>
    GnuPG-bug-id 1351
    GnuPG-bug-id 1442

diff --git a/tools/gpg-zip.in b/tools/gpg-zip.in
index d27b1f9..a6b4238 100644
--- a/tools/gpg-zip.in
+++ b/tools/gpg-zip.in
@@ -94,7 +94,8 @@ while test $# -gt 0 ; do
       exit 0
       ;;
     --gpg)
-      GPG=$1
+      GPG=$2
+      shift
       shift
       ;;
     --gpg-args)
@@ -103,7 +104,8 @@ while test $# -gt 0 ; do
       shift
       ;;
     --tar)
-      TAR=$1
+      TAR=$2
+      shift
       shift
       ;;
     --tar-args)
@@ -126,8 +128,8 @@ while test $# -gt 0 ; do
 done
 
 if test x$create = xyes ; then
-#   echo "$TAR -cf - "$@" | $GPG --set-filename x.tar $gpg_args" 1>&2
-   $TAR -cf - "$@" | $GPG --set-filename x.tar $gpg_args
+#   echo "$TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args" 1>&2
+   $TAR $tar_args -cf - "$@" | $GPG --set-filename x.tar $gpg_args
 elif test x$list = xyes ; then
 #   echo "cat \"$1\" | $GPG $gpg_args | $TAR $tar_args -tf -" 1>&2
    cat "$1" | $GPG $gpg_args | $TAR $tar_args -tf -

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

Summary of changes:
 THOUGHTS         |  2 +-
 doc/gpg.texi     |  2 +-
 tools/gpg-zip.in | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)


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