X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.procmailrc;h=09dcf4f4d8b5495173fd11b5641c67762bf659cd;hb=2f962961a1ca98508e8941dbe269374e8e6ac540;hp=0910144810ea74cda6946b01195dd6287d11a34b;hpb=91685d4364920b3b877f3a460b9f319250604c92;p=remote_mail.git

diff --git a/.procmailrc b/.procmailrc
index 0910144..09dcf4f 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -24,6 +24,7 @@ $HOME/Mail/temp/
 HIGHSPAM=spam/HIGHSPAM/
 SPAM=spam/SPAM/
 JOEJOB=spam/JOEJOB/
+POSTMASTER=spam/POSTMASTER/
 
 # A list (one per line) of people I KNOW are spammers :-)
 # can match any part of name so you can use fred, fred@aol.com or aol.com to
@@ -64,7 +65,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
@@ -116,13 +117,24 @@ $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
+:0:
+* ^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
@@ -173,7 +185,10 @@ lists/dragongo/
 ###################
 
 :0:
-* ^To: \+announce@student.ucr.edu
+* ^From:.*announcements@student.ucr.edu
+lists/ucr-announcements
+
+:0:
 * ^List-Id: <stannounce2.lists.ucr.edu>
 lists/ucr-announcements
 
@@ -254,6 +269,14 @@ 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 #
 #####################################