X-Git-Url: https://git.donarmstrong.com/?p=remote_mail.git;a=blobdiff_plain;f=.procmailrc;h=48dbd1d02237ed7717436f3421a5ebc38c8bd534;hp=82abafa3b982bad7e70fde7df80f4df899056251;hb=a46d2cce24916584bc88175c6712387d2d6ef697;hpb=ee32e5a2e29a027753f93642dc45da79d5dcffee

diff --git a/.procmailrc b/.procmailrc
index 82abafa..48dbd1d 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -53,9 +53,9 @@ FRIENDS=$HOME/.procmail/friends
 #:0 a:
 #/dev/null
 
-:0 H
-* ^From:.*MAILER-DAEMON@beta.sndservers.com
-* B ?? ^Sender:.*info@necarpenterstraining.org
+:0 HB
+* ^From:.*mailer-daemon@beta.sndservers.com
+* ^Sender:.*Carpenters (Apprenticeship|Training)
 /dev/null
 
 :0 H
@@ -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