[mutt] 01/01: debian-specific/828751-pinentry-gpg2-support.patch: moved --pinentry-loopback within the conditional that checks the existance of PGPPASSFD.

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit f6ac6a78eba736fc0bb2d94c402d4fb61df4ed67
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Oct 22 16:39:51 2016 +0100

    debian-specific/828751-pinentry-gpg2-support.patch: moved --pinentry-loopback within the conditional that checks the existance of PGPPASSFD.
---
 debian/changelog                                         |  8 ++++++++
 .../debian-specific/828751-pinentry-gpg2-support.patch   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b79886..28e1cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.7.1-3) UNRELEASED; urgency=medium
+
+  * debian-specific/828751-pinentry-gpg2-support.patch: moved
+    --pinentry-loopback within the conditional that checks the existance of
+    PGPPASSFD.
+
+ -- Antonio Radici <antonio at debian.org>  Sat, 22 Oct 2016 16:36:54 +0100
+
 mutt (1.7.1-2) unstable; urgency=medium
 
   * Dropped neomutt-devel/837601-do-not-segfault-on-new-mails.patch which
diff --git a/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch b/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
index 05909ca..37ca042 100644
--- a/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
+++ b/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
@@ -19,26 +19,26 @@ This patch enables gpgme by default on the Debian version of mutt starting from
 +
  # decode application/pgp
 -set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --pinentry-mode=loopback --no-verbose --quiet --batch --output - %f"
++set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --no-verbose --quiet --batch --output - %f"
  
  # verify a pgp/mime signature
  set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
  
  # decrypt a pgp/mime attachment
 -set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --pinentry-mode=loopback --no-verbose --quiet --batch --output - %f"
++set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --no-verbose --quiet --batch --output - %f"
  
  # create a pgp/mime signed attachment
 -# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
 -set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
-+# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --pinentry-mode=loopback --armor --detach-sign --textmode %?a?-u %a? %f"
-+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --pinentry-mode=loopback --armor --detach-sign --textmode %?a?-u %a? %f"
++# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --detach-sign --textmode %?a?-u %a? %f"
++set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --detach-sign --textmode %?a?-u %a? %f"
  
  # create a application/pgp signed (old-style) message
 -# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
 -set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
-+# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --pinentry-mode=loopback --armor --textmode --clearsign %?a?-u %a? %f"
-+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --pinentry-mode=loopback --armor --textmode --clearsign %?a?-u %a? %f"
++# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --textmode --clearsign %?a?-u %a? %f"
++set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0 --pinentry-mode=loopback? --armor --textmode --clearsign %?a?-u %a? %f"
  
  # create a pgp/mime encrypted attachment
  # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
@@ -47,8 +47,8 @@ This patch enables gpgme by default on the Debian version of mutt starting from
  # create a pgp/mime encrypted and signed attachment
 -# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 -set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? --pinentry-mode=loopback -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --pinentry-mode=loopback --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0 --pinentry-mode=loopback? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
++set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0 --pinentry-mode=loopback? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
  
  # import a key into the public key ring
  set pgp_import_command="gpg --no-verbose --import %f"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git