From ac61c72f63a037fbcd7df91f68c093d461102898 Mon Sep 17 00:00:00 2001 From: Benjamin Mako Hill Date: Fri, 19 Jan 2018 00:20:54 -0800 Subject: [PATCH] fix for pgpewrap in default gpg.rc (#1023) Fixes an bug introduced by changes intorduced in commit 465fad6d21ac3b9d2ae5d12bae7705f5f04323e7 to contrib/gpg.rc that breaks signed and encrypted mail. The issues is just a typo related to way that pgpewrap works. This should fix issue #998. --- contrib/gpg.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/gpg.rc b/contrib/gpg.rc index 9f5740f31..6f0e165b0 100644 --- a/contrib/gpg.rc +++ b/contrib/gpg.rc @@ -85,13 +85,13 @@ set pgp_clearsign_command="gpg %?p?--pinentry-mode loopback --passphrase-fd 0? - # # set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" # -set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor -- --recipient %r -- --encrypt %f" +set pgp_encrypt_only_command="/usr/lib/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f" # Create an encrypted and signed attachment (note that some users include the --always-trust option here) # # set pgp_encrypt_sign_command="/usr/lib/neomutt/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="/usr/lib/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor -- --recipient %r -- --sign --encrypt %f" +set pgp_encrypt_sign_command="/usr/lib/neomutt/pgpewrap gpg %?p?--pinentry-mode loopback --passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - %?a?--local-user %a? --armor --sign --encrypt -- --recipient %r -- %f" # Import a key into the public key ring # -- 2.40.0