mac compat

diff --git a/.muttrc b/.muttrc
index 1a81a9fb2e4f88a3f9621f591b7a83fbd833c85a..cec7047b45c68351764f802a435f65c2475a954f 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -51,12 +51,12 @@ send-hook '~t vf@eisti\.fr' 'unset pgp_autosign'
 #  my_hdr X-Request-PGP: http://people.debian.org/~francois/public_key.asc 
 
 # start tofu
 #  my_hdr X-Request-PGP: http://people.debian.org/~francois/public_key.asc 
 
 # start tofu

-set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'
+set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'

 macro generic \e0 ":unset display_filter\n" "Turn TOFU protection off"
 macro generic \e0 ":unset display_filter\n" "Turn TOFU protection off"

-macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'\n" "Turn TOFU protection on"
+macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'\n" "Turn TOFU protection on"

 
 macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Turn TOFU protection off"
 
 macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Turn TOFU protection off"

-macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'; exec exit\n:exec display-message\n" "Turn TOFU protection on"
+macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'; exec exit\n:exec display-message\n" "Turn TOFU protection on"

 
 color body      brightmagenta           black   "^\\[---.*"
 color body      green                   black   "^#v[-+]"
 
 color body      brightmagenta           black   "^\\[---.*"
 color body      green                   black   "^#v[-+]"


@@ -166,3 +166,20 @@ set wait_key=no
 # mark all read
 macro index \eR "<tag-pattern>.\n<tag-prefix><clear-flag>N<untag-pattern>.\n" #mark all messages as read
 
 # mark all read
 macro index \eR "<tag-pattern>.\n<tag-prefix><clear-flag>N<untag-pattern>.\n" #mark all messages as read
 

+
+# stupid fucked up macports non gpg configured mutt
+# # GnuPG configuration
+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %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_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_encrypt_only_command="/opt/local/bin/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="/opt/local/bin/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_import_command="gpg --no-verbose --import %f"
+set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
+set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
+