fix sender rewrite rule

[remote_mail.git] / .procmailrc

diff --git a/.procmailrc b/.procmailrc
index 43dc9a91e969dac8ebf05425cef1a44503688cb7..48dbd1d02237ed7717436f3421a5ebc38c8bd534 100644 (file)
--- a/.procmailrc
+++ b/.procmailrc
@@ -13,8 +13,8 @@ LOGFILE=$HOME/.procmail_log
 
 # TODO
 
-:0 c:
-$HOME/Mail/temp/
+#:0 c:
+#$HOME/Mail/temp/
 
 # Add filter for "your message to foo awaits moderator approval"
 # filter out owner mails
@@ -53,6 +53,11 @@ FRIENDS=$HOME/.procmail/friends
 #:0 a:
 #/dev/null
 
+:0 HB
+* ^From:.*mailer-daemon@beta.sndservers.com
+* ^Sender:.*Carpenters (Apprenticeship|Training)
+/dev/null
+
 :0 H
 * ^Subject:.*Rnm-devel moderator request
 /dev/null
@@ -65,7 +70,7 @@ FRIENDS=$HOME/.procmail/friends
 # Handle delay messages
 :0 Hc
 * !Message-Id: .*delay[0-9]+@
-* ^TO \/don\+de[^@]+
+* ^TO \/don\+delay\+[^@]+
 $HOME/Mail/delay
 
 :0 Hhbw
@@ -117,11 +122,12 @@ $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)?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)
+* (^(((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)
 * !^List-.+
+* !^X-Diagnostic:
 $JOEJOB
 
 # stuff for postmaster at my machines
@@ -129,6 +135,11 @@ $JOEJOB
 * ^To: postmaster@
 $POSTMASTER
 
+# mail from people I don't want to see, because they annoy me
+:0:
+* ^From:.*rgm@gnu.org
+$HOME/Mail/idiots
+
 # Work around procmail bug: any output on stderr will cause the "F" in "From"
 # to be dropped.  This will re-add it.
 :0 H
@@ -141,11 +152,7 @@ $POSTMASTER
   | sed -e 's/^rom /From /'
 }
 
-
-
-
 # Debian role accounts
-
 :0:
 * ^Delivered-To: (owner@bugs.debian.org)
 bugs.debian.org/
@@ -154,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:
@@ -174,6 +185,14 @@ chili_alarm/
 * ^From:\ noreply@dragongoserver.net
 lists/dragongo/
 
+# discard all yahoogroups mail
+# except for those to rsult (riverside ultimate)
+:0:
+* !^To:.*rsult@yahoogroups.com
+* ^To:.*@yahoogroups.com
+/dev/null
+
+
 ###################
 #  Mailing lists  #
 ###################
@@ -199,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
@@ -214,11 +233,14 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 
 
 # Debian's bug system uses X-Loop
-8
 :0:
 * ^X-PTS-Package: \/.+
 bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
 
+:0:
+* ^X-Debian-PR-Source: \/.+
+bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
+
 :0:
 * ^X-Debian-PR-Package: \/.+
 bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
@@ -263,14 +285,6 @@ lists/scd/
 * ^Sender: (Bugtraq|Incidents Mailing|VULN-DEV) List
 lists/bugtraq/
 
-# morons on emacs-devel keep Cc:'ing me; discard the message if it
-# lists emacs-devel in To or Cc
-:0:
-* ^(To|Cc):.*emacs-devel@gnu.org
-* !^Sender:.*emacs-devel
-/dev/null
-
-
 #####################################
 # Last rule:  Put mail into mailbox #
 #####################################