X-Git-Url: https://git.donarmstrong.com/?p=remote_mail.git;a=blobdiff_plain;f=.procmailrc;h=f515163581f9a26092bedaa996aa1627ca160c4f;hp=3233379b1db136e890ac7e4ca882a2dbaf42a130;hb=fe4b23c392a08c7437a5a9a9cce7eeea17b9735c;hpb=d182c8a81f82532fb0dbf0dc8471e79c686b58fb

diff --git a/.procmailrc b/.procmailrc
index 3233379..f515163 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -66,37 +66,6 @@ FRIENDS=$HOME/.procmail/friends
 * ^Subject:.*Cron.*debbugs@master
 /dev/null
 
-
-# Handle delay messages
-:0 Hc
-* !Message-Id: .*delay[0-9]+@
-* ^TO \/don\+delay\+[^@]+
-$HOME/Mail/delay
-
-:0 Hhbw
-* !Message-Id: .*delay[0-9]+@
-* ^TO \/don\+delay\+[^@]+
-|/home/don/bin/delay_mail --mailto don@donarmstrong.com --enqueue --email --delay $MATCH
-
-# Convert old-style PGP messages to MIME
-:0
-* !^Content-Type: multipart/
-* !^Content-Type: application/pgp
-{
-    :0 fBw
-    * ^-----BEGIN PGP MESSAGE-----
-    * ^-----END PGP MESSAGE-----
-    | formail \
-        -i "Content-Type: application/pgp; format=text; x-action=encrypt"
-
-    :0 fBw
-    * ^-----BEGIN PGP SIGNED MESSAGE-----
-    * ^-----BEGIN PGP SIGNATURE-----
-    * ^-----END PGP SIGNATURE-----
-    | formail \
-        -i "Content-Type: application/pgp; format=text; x-action=sign"
-}
-
 :0:
 * ! ? (formail -x From: -x Sender: | fgrep -iqf $FRIENDS)
 {
@@ -122,14 +91,36 @@ $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)?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)
+* (^(((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 ][^<)]*(\(.*\).*)?)?$([^>]|$)
+* ^Subject:.*(Mail delivery failed|Returned mail|Undelivered Mail)
+* !^From:.+(ucr|debian|donarmstrong|sndservers|ccin|schedulesdirect|prometheuslabor.com)
 * !^From:.+(schedulesdirect|paypal.com)
-* !^To:.+ (don\+.+\@donarmstrong\.com)
+* !^To:.+ (don\+.+\@(donarmstrong\.com|debian\.org|rzlab\.ucr\.edu))
 * !^List-.+
 * !^X-Diagnostic:
 $JOEJOB
 
+}
+
+# discard bounces from dumb mailing lists on prometheuslabor
+:0:
+* ^From: MAILER-DAEMON@
+* ^To: root@mail.prometheuslabor.com
+* ^Subject:.*Undelivered
+/dev/null
+
+# discard AQMD mail
+:0:
+* ^From: usc.aqmd@usc.edu
+* ^Subject:.*USC AQMD Survey
+/dev/null
+
+# discard no spam digest
+:0:
+* ^From: .*spam-control@illinois.edu
+* ^Subject:.*End User Digest: 0 New Messages
+/dev/null
+
 # stuff for postmaster at my machines
 :0:
 * ^To: postmaster@
@@ -158,12 +149,16 @@ $HOME/Mail/idiots
 bugs.debian.org/
 
 :0:
-* ^Delivered-To: (listmaster@lists.debian.org)
+* ^Delivered-To: .*listmaster@lists.debian.org
+lists.debian.org/
+
+:0:
+* ^Delivered-To: .*lists-listmaster@bendel.debian.org
 lists.debian.org/
 
 # Buildds
 :0:
-* ^Return-Path:.*buildd@ignes.donarmstrong.com
+* ^Return-Path:.*buildd@.*.donarmstrong.com
 buildd.donarmstrong.com/
 
 # OFTC stuff
@@ -218,12 +213,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; 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
@@ -235,19 +230,19 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 # Debian's bug system uses X-Loop
 :0:
 * ^X-PTS-Package: \/.+
-bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
+bugs/bug_reports
 
 :0:
 * ^X-Debian-PR-Source: \/.+
-bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
+bugs/bug_reports
 
 :0:
 * ^X-Debian-PR-Package: \/.+
-bugs/`echo $MATCH |sed -e 's/[\/]/_/g'`/
+bugs/bug_reports
 
 :0:
 * ^X-Loop: owner@bugs.debian.org
-bugs/control_messages/
+bugs/bug_reports
 
 :0:
 * X-Loop: \/[^@]+