X-Git-Url: https://git.donarmstrong.com/?p=remote_mail.git;a=blobdiff_plain;f=.procmailrc;h=1e9498f1d29d034ba015e0a0cc60c1c082d127ab;hp=051e1c10eea53d3217abc110e76b03ab584915bc;hb=1b9fdf4d8da5b9bd31ed895b682da51180e5280f;hpb=51689bcb2759d60db51edf8e38478046fe1a47c4

diff --git a/.procmailrc b/.procmailrc
index 051e1c1..1e9498f 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -122,14 +122,30 @@ $SPAM
 # I get joe-jobbed a lot; if a message is from a mailer, but not from
 # one of mine, discard it.
 :0:
-* (^(((Resent-)?(From|Sender)|X-Envelope-From):|>?From )([^>]*[^(.%@a-z0-9])?(Post(ma(st(er)?|n)|office)|(send)?Mailer|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|promtheuslabor.com)
+* (^(((Resent-)?(From|Sender)|X-Envelope-From):|>?From )([^>]*[^(.%@a-z0-9])?(Post(ma(st(er)?|n)|office)|(send)?Mailer|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 ][^<)]*(\(.*\).*)?)?$([^>]|$)
+* ^Subject:.*(Mail delivery failed|Returned mail|Undelivered Mail)
+* !^From:.+(ucr|debian|donarmstrong|sndservers|ccin|schedulesdirect|prometheuslabor.com)
 * !^From:.+(schedulesdirect|paypal.com)
-* !^To:.+ (don\+.+\@donarmstrong\.com)
+* !^To:.+ (don\+.+\@(donarmstrong\.com|debian\.org|rzlab\.ucr\.edu))
 * !^List-.+
 * !^X-Diagnostic:
 $JOEJOB
 
+}
+
+# discard bounces from dumb mailing lists on prometheuslabor
+:0:
+* ^From: MAILER-DAEMON@
+* ^To: root@mail.prometheuslabor.com
+* ^Subject:.*Undelivered
+/dev/null
+
+# discard AQMD mail
+:0:
+* ^From: usc.aqmd@usc.edu
+* ^Subject:.*USC AQMD Survey
+/dev/null
+
 # stuff for postmaster at my machines
 :0:
 * ^To: postmaster@
@@ -161,6 +177,10 @@ bugs.debian.org/
 * ^Delivered-To: (listmaster@lists.debian.org)
 lists.debian.org/
 
+# Buildds
+:0:
+* ^Return-Path:.*buildd@.*.donarmstrong.com
+buildd.donarmstrong.com/
 
 # OFTC stuff
 :0:
@@ -214,12 +234,12 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 
 :0:
-* ^Sender: \/[^@]+-bounces?
-lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/[\/]/_/g'`/
+* ^Sender: +<?\/[^@]+-bounces?
+lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/\"//g; s/.*<//g; s/[\/]/_/g; y/A-Z/a-z/'`/
 
 :0:   
 * ^X-BeenThere: \/[^@]+
-lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
+lists/`echo $MATCH | sed -e 's/<//g; s/[\/]/_/g'`/
 
 
 # Dumb apache mailing lists