* don't drop some joejob messages

diff --git a/.procmailrc b/.procmailrc
index 3a0c93a5bbac0df2176ffc5b4c94a7b49362b25d..41229f28db627e5fa9ca4f5bfd519cb7c7102160 100644 (file)
--- a/.procmailrc
+++ b/.procmailrc
@@ -116,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"