X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/5af333ca3b83425e5cb3aa704b37654d576856c1..a61350bc7ddd403460f79498a48e07f101fc2067:/procmail/procmailrc

diff --git a/procmail/procmailrc b/procmail/procmailrc
index 55565ef..8ddb567 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail
 
 INCLUDERC=$PMDIR/defer
 
-FROM_ALBATROSS=!
-:0
-* ^X-Been-There: madduck@albatross
-{
-  M=$MATCH
-  :0
-  * M ?? ^\+.+\+\/[^@]+
-  {
-    # we have two +, so it's a virtual domain
-    L=$MATCH
-
-    :0
-    * M ?? ^\+\/[^+]+
-    { D=$MATCH }
-
-    OT="$L@$D"
-    L
-    D
-  }
- 
-  :0 E
-  * M ?? ^\/\+?[^@]*
-  { OT="madduck$MATCH@madduck.net" }
-  M
-
-  :0 fw
-  |formail -I "X-Original-To: $OT" -A'X-From-Albatross: yes'
-  OT
-
-  FROM_ALBATROSS
-  LOG="log:     *** received $MSGID from albatross$NL"
-}
-
 INCLUDERC=$PMDIR/defines
 
 INCLUDERC=$PMDIR/ignore
@@ -50,8 +17,12 @@ INCLUDERC=$PMDIR/smsmail
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
+INCLUDERC=$PMDIR/msgid-index
+
+INCLUDERC=$PMDIR/flag-test-messages
 
-INCLUDERC=$PMDIR/marknew
+INCLUDERC=$PMDIR/dejavu
+INCLUDERC=$PMDIR/cleanup
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
@@ -60,12 +31,20 @@ INCLUDERC=$PMDIR/to-gmail
 
 INCLUDERC=$PMDIR/justme
 
-INCLUDERC=$PMDIR/spamtraps
-INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
 
+INCLUDERC=$PMDIR/handlespam
+
 #INCLUDERC=$PMDIR/autoreplies
+INCLUDERC=$PMDIR/tickle
+INCLUDERC=$PMDIR/delay-delivery
 
-INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/listquirks
+
+#INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool
 
 INCLUDERC=$PMRULES/all
+
+INCLUDERC=$PMDIR/addheaders
+INCLUDERC=$PMDIR/deliver