X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.procmailrc;h=4ed4f93b61fcd32282d741947675b75b21781158;hb=7a34af72b02a1406479da746718af7c1f7ae801e;hp=6cee9ef51d614705895e721f128ab13de9150918;hpb=152e5accbcfb3fa4da0acc7c76cdacd743ca902c;p=remote_mail.git

diff --git a/.procmailrc b/.procmailrc
index 6cee9ef..4ed4f93 100644
--- a/.procmailrc
+++ b/.procmailrc
@@ -1,3 +1,4 @@
+# -*- mode: tinyprocmail -*-
 PATH=/bin:/usr/bin:/usr/X11R6/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin
 
 SHELL=/bin/bash
@@ -66,37 +67,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 +92,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,7 +150,11 @@ $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
@@ -180,7 +176,13 @@ chili_alarm/
 * ^From:\ nagios@nagios-global.lab.propel.com
 chili_alarm/
 
-#
+# subaru
+:0:
+* 1^0 ^Subject: Your Crosstrek has started charging
+* 1^0 ^Subject: Charging for your Crosstrek is complete
+subaru/
+
+# Mail from dragongo
 :0:
 * ^From:\ noreply@dragongoserver.net
 lists/dragongo/
@@ -219,7 +221,7 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 
 :0:
 * ^Sender: +<?\/[^@]+-bounces?
-lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/<//g; s/[\/]/_/g'`/
+lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/\"//g; s/.*<//g; s/[\/]/_/g; y/A-Z/a-z/'`/
 
 :0:   
 * ^X-BeenThere: \/[^@]+
@@ -235,19 +237,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: \/[^@]+