X-Git-Url: https://git.donarmstrong.com/?p=remote_mail.git;a=blobdiff_plain;f=.procmailrc;h=f56ac483cdf8a2c72bfcd2b525e2ea64dfc71eec;hp=f3932acc60ba3e70080049b9d47ec995dfda2dfa;hb=3b755b9de35e0fe306ae3011ce2273b43e0524d1;hpb=b4525e4ed0cd19cf6eeddc2512d7c37f979be724

diff --git a/.procmailrc b/.procmailrc
index f3932ac..f56ac48 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -55,7 +55,7 @@ FRIENDS=$HOME/.procmail/friends
 
 :0 HB
 * ^From:.*mailer-daemon@beta.sndservers.com
-* ^Sender:.*Carpenters Apprenticeship
+* ^Sender:.*Carpenters (Apprenticeship|Training)
 /dev/null
 
 :0 H
@@ -125,7 +125,7 @@ $SPAM
 * (^(((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)
 * !^From:.+(schedulesdirect|paypal.com)
-* !^To:.+ (don\+.+\@donarmstrong\.com)
+* !^To:.+ (don\+.+\@(donarmstrong\.com|debian\.org|rzlab\.ucr\.edu))
 * !^List-.+
 * !^X-Diagnostic:
 $JOEJOB
@@ -161,6 +161,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 +218,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; 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