X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.procmailrc;h=402c0d2097bd7fdbafde3e6873f335c2101d7e3e;hb=f142b8c6ec457f6337e130abe7c858753530da18;hp=047d96760902eab1b93229d53334f897d68e199f;hpb=13facb2901af99d87d51133390d3f7dd2e81512e;p=remote_mail.git

diff --git a/.procmailrc b/.procmailrc
index 047d967..402c0d2 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,36 +67,16 @@ FRIENDS=$HOME/.procmail/friends
 * ^Subject:.*Cron.*debbugs@master
 /dev/null
 
+# subaru
+:0:
+* 1^0 ^Subject: Your Crosstrek has started charging
+* 1^0 ^Subject: Charging for your Crosstrek is complete
+subaru/
 
-# 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"
-}
+# cottage kids e-mails
+:0:
+* 1^0 ^Subject: Cottage Kids Children's Center Check-
+cottage-kids/
 
 :0:
 * ! ? (formail -x From: -x Sender: | fgrep -iqf $FRIENDS)
@@ -140,6 +121,18 @@ $JOEJOB
 * ^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@
@@ -150,6 +143,11 @@ $POSTMASTER
 * ^From:.*rgm@gnu.org
 $HOME/Mail/idiots
 
+# Send messages from sacramento city unified to Laurel
+:0:cr
+* ^From:.*DoNotReply@scusd.edu
+| /usr/lib/sendmail lkdwillow@gmail.com
+
 # Work around procmail bug: any output on stderr will cause the "F" in "From"
 # to be dropped.  This will re-add it.
 :0 H
@@ -168,7 +166,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
@@ -190,7 +192,7 @@ chili_alarm/
 * ^From:\ nagios@nagios-global.lab.propel.com
 chili_alarm/
 
-#
+# Mail from dragongo
 :0:
 * ^From:\ noreply@dragongoserver.net
 lists/dragongo/
@@ -229,7 +231,7 @@ lists/`echo $MATCH | sed -e 's/[\/]/_/g'`/
 
 :0:
 * ^Sender: +<?\/[^@]+-bounces?
-lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/.*<//g; s/[\/]/_/g; y/A-Z/a-z/'`/
+lists/`echo $MATCH | sed -e 's/\-bounces*//g; s/\"//g; s/.*<//g; s/[\/]/_/g; y/A-Z/a-z/'`/
 
 :0:   
 * ^X-BeenThere: \/[^@]+
@@ -245,19 +247,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: \/[^@]+