diff options
| author | Kevin McCarthy <kevin@8t8.us> | 2018-08-29 15:08:19 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kevin@8t8.us> | 2018-08-29 15:19:16 -0700 |
| commit | a2b289361d90360c37eb19cca2cf1216ab60fb7b (patch) | |
| tree | 20134678055a81af20e86172d15abbd76c7c41b7 /contrib | |
| parent | 6216a753e0207ff2be9b994f0cd82123037cf1bf (diff) | |
Rename pgpring to mutt_pgpring.
pgpring is used by another common package, signing-party. At the
request of ArchLinux, I am renaming our version to be prefixed by
"mutt_" in order to remove a naming conflict.
This is a minor inconvenience for pgp2, pgp5, and pgp6 users, but I
believe this constitutes an extremely small number of users at this
point.
I am keeping pgpewrap as-is because it is also used by GnuPG, and has
no such naming conflict.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pgp2.rc | 4 | ||||
| -rw-r--r-- | contrib/pgp5.rc | 4 | ||||
| -rw-r--r-- | contrib/pgp6.rc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc index 21280453..f7fc1327 100644 --- a/contrib/pgp2.rc +++ b/contrib/pgp2.rc @@ -42,10 +42,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r" set pgp_verify_key_command="pgp -kcc +language=mutt %r" # read in the public key ring -set pgp_list_pubring_command="pgpring -2 %r" +set pgp_list_pubring_command="mutt_pgpring -2 %r" # read in the secret key ring -set pgp_list_secring_command="pgpring -s -2 %r" +set pgp_list_secring_command="mutt_pgpring -s -2 %r" # pattern for good signature set pgp_good_sign="Good signature" diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc index 61d1c2c9..7ae0af48 100644 --- a/contrib/pgp5.rc +++ b/contrib/pgp5.rc @@ -39,9 +39,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r" set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r" # read in the public key ring -set pgp_list_pubring_command="pgpring -5 %r" +set pgp_list_pubring_command="mutt_pgpring -5 %r" # read in the secret key ring -set pgp_list_secring_command="pgpring -5 -s %r" +set pgp_list_secring_command="mutt_pgpring -5 -s %r" diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc index a5fca654..da16d54e 100644 --- a/contrib/pgp6.rc +++ b/contrib/pgp6.rc @@ -36,10 +36,10 @@ set pgp_export_command="pgp6 +compatible -kxaf %r" set pgp_verify_key_command="pgp6 +compatible -kcc %r" # read in the public key ring -set pgp_list_pubring_command="pgpring -5 %r" +set pgp_list_pubring_command="mutt_pgpring -5 %r" # read in the secret key ring -set pgp_list_secring_command="pgpring -s -5 %r" +set pgp_list_secring_command="mutt_pgpring -s -5 %r" # create a clearsigned message set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?" |