From c5c1a18c94a36cd72af1a7da398a372927cd10a8 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 16 Apr 2002 08:34:28 +0000 Subject: Remove hardcoded path "/usr/bin" for "gpg" from "gpg.rc". --- mail/mutt-devel/distinfo | 3 +- mail/mutt-devel/patches/patch-ae | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 mail/mutt-devel/patches/patch-ae diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo index 534a988b537..419773ad2cb 100644 --- a/mail/mutt-devel/distinfo +++ b/mail/mutt-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2002/03/13 14:50:08 tron Exp $ +$NetBSD: distinfo,v 1.14 2002/04/16 08:34:28 tron Exp $ SHA1 (mutt-1.3.28i.tar.gz) = 4d25d61444cafd49974a3f2986464ec92d530f98 Size (mutt-1.3.28i.tar.gz) = 2546513 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70 SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2 SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5 +SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e diff --git a/mail/mutt-devel/patches/patch-ae b/mail/mutt-devel/patches/patch-ae new file mode 100644 index 00000000000..b678a8fb6b9 --- /dev/null +++ b/mail/mutt-devel/patches/patch-ae @@ -0,0 +1,63 @@ +$NetBSD: patch-ae,v 1.1 2002/04/16 08:34:29 tron Exp $ + +--- contrib/gpg.rc.orig Tue Dec 11 10:33:57 2001 ++++ contrib/gpg.rc Tue Apr 16 10:28:08 2002 +@@ -31,44 +31,44 @@ + # breaking PGP/MIME. + + # decode application/pgp +-set pgp_decode_command="/usr/bin/gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" ++set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" + + # verify a pgp/mime signature +-set pgp_verify_command="/usr/bin/gpg --no-verbose --quiet --batch --output - --verify %s %f" ++set pgp_verify_command="gpg --no-verbose --quiet --batch --output - --verify %s %f" + + # decrypt a pgp/mime attachment +-set pgp_decrypt_command="/usr/bin/gpg --passphrase-fd 0 --no-verbose --quiet --batch --output - %f" ++set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --quiet --batch --output - %f" + + # create a pgp/mime signed attachment +-# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" +-set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" ++# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" ++set pgp_sign_command="gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" + + # create a application/pgp signed (old-style) message +-# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" +-set pgp_clearsign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" ++# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" ++set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --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" +-set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" ++set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" + + # create a pgp/mime encrypted and signed attachment + # set pgp_encrypt_sign_command="pgpewrap gpg-2comp --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" +-set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --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 --passphrase-fd 0 --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="/usr/bin/gpg --no-verbose --import -v %f" ++set pgp_import_command="gpg --no-verbose --import -v %f" + + # export a key from the public key ring +-set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r" ++set pgp_export_command="gpg --no-verbose --export --armor %r" + + # verify a key +-set pgp_verify_key_command="/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r" ++set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r" + + # read in the public key ring +-set pgp_list_pubring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r" ++set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" + + # read in the secret key ring +-set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" ++set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" + + # fetch keys + # set pgp_getkeys_command="pkspxycwrap %r" -- cgit v1.2.3