X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.procmailrc;h=27a73319a35ce731f39dac375465595221d683fb;hb=8b9b02c2a50a16747a49aa361470d29d7ba0ce26;hp=ee9f6bd2919ab42b9ac51bf9a828468a52522fe8;hpb=4705970ceedbf50f5160e790549281e4cd628cc3;p=remote_mail.git

diff --git a/.procmailrc b/.procmailrc
index ee9f6bd..27a7331 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -72,6 +72,24 @@ $HOME/Mail/delay
 * ^TO \/don\+delay\+[^@]+
 |/home/don/bin/delay_mail --mailto don@donarmstrong.com --enqueue --email --delay $MATCH
 
+# Convert old-style PGP messages to MIME
+:0
+* !^Content-Type: multipart/
+* !^Content-Type: application/pgp
+{
+    :0 fBw
+    * ^-----BEGIN PGP MESSAGE-----
+    * ^-----END PGP MESSAGE-----
+    | formail \
+        -i "Content-Type: application/pgp; format=text; x-action=encrypt"
+
+    :0 fBw
+    * ^-----BEGIN PGP SIGNED MESSAGE-----
+    * ^-----BEGIN PGP SIGNATURE-----
+    * ^-----END PGP SIGNATURE-----
+    | formail \
+        -i "Content-Type: application/pgp; format=text; x-action=sign"
+}
 
 :0:
 * ! ? (formail -x From: -x Sender: | fgrep -iqf $FRIENDS)
@@ -98,8 +116,10 @@ $SPAM
 # I get joe-jobbed a lot; if a message is from a mailer, but not from
 # one of mine, discard it.
 :0:
-* ^FROM_MAILER
-* !^From:.+(ucr|debian|donarmstrong|sndservers|ccin)
+* (^(((Resent-)?(From|Sender)|X-Envelope-From):|>?From )([^>]*[^(.%@a-z0-9])?(Post(ma(st(er)?|n)|office)|(send)?Mail(er)?|daemon|mmdf|n?uucp|ops|r(esponse|oot)|(bbs\.)?smtp(error)?|(s(erver)|ystem)|A(dmin(istrator)?|MMGR))(([^).!:a-z0-9][-_a-z0-9]*)?[%@>\t ][^<)]*(\(.*\).*)?)?$([^>]|$))
+* !^From:.+(ucr|debian|donarmstrong|sndservers|ccin|schedulesdirect)
+* !^From:.+(schedulesdirect|paypal.com)
+* !^To:.+ (don\+.+\@donarmstrong\.com)
 $JOEJOB
 
 # Work around procmail bug: any output on stderr will cause the "F" in "From"