fix sender rewrite rule

[remote_mail.git] / .procmailrc

diff --git a/.procmailrc b/.procmailrc
index f9b07a2cf40922140e0261ed1b137329746f5962..48dbd1d02237ed7717436f3421a5ebc38c8bd534 100644 (file)
--- a/.procmailrc
+++ b/.procmailrc
@@ -53,9 +53,9 @@ FRIENDS=$HOME/.procmail/friends
 #:0 a:
 #/dev/null
 
-:O 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