X-Git-Url: https://git.donarmstrong.com/?p=remote_mail.git;a=blobdiff_plain;f=.procmailrc;h=f515163581f9a26092bedaa996aa1627ca160c4f;hp=9aa6270bce240a77903f4eeb63c44a42d917b209;hb=fe4b23c392a08c7437a5a9a9cce7eeea17b9735c;hpb=418c1f8014be4a77f487daa0b40d3c77b876a6c4

diff --git a/.procmailrc b/.procmailrc
index 9aa6270..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)
 {
@@ -146,6 +115,12 @@ $JOEJOB
 * ^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@
@@ -174,7 +149,11 @@ $HOME/Mail/idiots
 bugs.debian.org/
 
 :0:
-* ^Delivered-To: (lists-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
@@ -251,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: \/[^@]+