[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-9-g6fb5713

[by Andre Heinecke]

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  6fb5713f4a6976900cc70c140e61043b6ef688d1 (commit)
      from  339b3301ee8410fe3bbdebb66a6e83801d79d40d (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 6fb5713f4a6976900cc70c140e61043b6ef688d1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jan 8 19:09:28 2018 +0100

    doc: Note pinentry-mode for passphrase opts
    
    * doc/gpg.texi (--passphrase, --passphrase-file, --passphrase-fd):
    Note that pinentry-mode needs to be loopback.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 35bb9a8..9776a3b 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3082,8 +3082,9 @@ will be read from file descriptor @var{n}. If you use 0 for @var{n},
 the passphrase will be read from STDIN. This can only be used if only
 one passphrase is supplied.
 
-Note that this passphrase is only used if the option @option{--batch}
-has also been given.  This is different from GnuPG version 1.x.
+Note that since Version 2.0 this passphrase is only used if the
+option @option{--batch} has also been given. Since Version 2.1
+the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --passphrase-file @var{file}
 @opindex passphrase-file
@@ -3092,8 +3093,10 @@ be read from file @var{file}. This can only be used if only one
 passphrase is supplied. Obviously, a passphrase stored in a file is
 of questionable security if other users can read this file. Don't use
 this option if you can avoid it.
-Note that this passphrase is only used if the option @option{--batch}
-has also been given.  This is different from GnuPG version 1.x.
+
+Note that since Version 2.0 this passphrase is only used if the
+option @option{--batch} has also been given. Since Version 2.1
+the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --passphrase @var{string}
 @opindex passphrase
@@ -3101,8 +3104,10 @@ Use @var{string} as the passphrase. This can only be used if only one
 passphrase is supplied. Obviously, this is of very questionable
 security on a multi-user system. Don't use this option if you can
 avoid it.
-Note that this passphrase is only used if the option @option{--batch}
-has also been given.  This is different from GnuPG version 1.x.
+
+Note that since Version 2.0 this passphrase is only used if the
+option @option{--batch} has also been given. Since Version 2.1
+the @option{--pinentry-mode} also needs to be set to @code{loopback}.
 
 @item --pinentry-mode @var{mode}
 @opindex pinentry-mode

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

Summary of changes:
 doc/gpg.texi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)


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