bb8163416e
but should be ok for general use. see https://github.com/neomutt/neomutt/releases/tag/2019-10-25 for more information and help request.
80 lines
4.8 KiB
Plaintext
80 lines
4.8 KiB
Plaintext
$OpenBSD: patch-contrib_gpg_rc,v 1.2 2019/10/26 19:37:09 sthen Exp $
|
|
|
|
Index: contrib/gpg.rc
|
|
--- contrib/gpg.rc.orig
|
|
+++ contrib/gpg.rc
|
|
@@ -59,61 +59,61 @@
|
|
|
|
# decode application/pgp
|
|
#
|
|
-set pgp_decode_command="gpg --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
|
|
+set pgp_decode_command="gpg2 --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
|
|
|
|
# Verify a signature
|
|
#
|
|
-set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
|
|
+set pgp_verify_command="gpg2 --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
|
|
|
|
# Decrypt an attachment
|
|
#
|
|
-set pgp_decrypt_command="gpg --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - --decrypt %f"
|
|
+set pgp_decrypt_command="gpg2 --status-fd=2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --quiet --batch --output - --decrypt %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 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --detach-sign %f"
|
|
+set pgp_sign_command="gpg2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --detach-sign %f"
|
|
|
|
# Create a application/pgp inline signed message. This style is obsolete but still needed for Hushmail recipients and some MUAs.
|
|
#
|
|
# 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 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --clearsign %f"
|
|
+set pgp_clearsign_command="gpg2 %?p?--pinentry-mode loopback --passphrase-fd 0? --no-verbose --batch --quiet --output - --armor --textmode %?a?--local-user %a? --clearsign %f"
|
|
|
|
# Create an encrypted attachment (note that some users include the --always-trust option here)
|
|
#
|
|
# set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
|
|
#
|
|
-set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg --batch --quiet --no-verbose --output - --textmode --armor --encrypt -- --recipient %r -- %f"
|
|
+set pgp_encrypt_only_command="/usr/libexec/neomutt/pgpewrap gpg2 --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/libexec/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/libexec/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"
|
|
+set pgp_encrypt_sign_command="/usr/libexec/neomutt/pgpewrap gpg2 %?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
|
|
#
|
|
-set pgp_import_command="gpg --no-verbose --import %f"
|
|
+set pgp_import_command="gpg2 --no-verbose --import %f"
|
|
|
|
# Export a key from the public key ring
|
|
#
|
|
-set pgp_export_command="gpg --no-verbose --armor --export %r"
|
|
+set pgp_export_command="gpg2 --no-verbose --armor --export %r"
|
|
|
|
# Verify a key
|
|
#
|
|
-set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
|
|
+set pgp_verify_key_command="gpg2 --verbose --batch --fingerprint --check-sigs %r"
|
|
|
|
# Read in the public key ring
|
|
# note: the second --with-fingerprint adds fingerprints to subkeys
|
|
#
|
|
-set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r"
|
|
+set pgp_list_pubring_command="gpg2 --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-keys %r"
|
|
|
|
# Read in the secret key ring
|
|
# note: the second --with-fingerprint adds fingerprints to subkeys
|
|
#
|
|
-set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r"
|
|
+set pgp_list_secring_command="gpg2 --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --list-secret-keys %r"
|
|
|
|
# Fetch keys
|
|
# set pgp_getkeys_command="pkspxycwrap %r"
|