improve format normalisation for final destination

[etc/mailfilter.git] / procmail / procmailrc

diff --git a/procmail/procmailrc b/procmail/procmailrc
index c30fddb3c96f56de46940d1841d39ea9eaef361d..21ce73e49e93b8a4d5a2a5f2754eb1b66391f5ed 100755 (executable)
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -8,39 +8,6 @@ PMDIR=$HOME/.etc/mailfilter/procmail
 
 INCLUDERC=$PMDIR/defer
 
 
 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
 INCLUDERC=$PMDIR/defines
 
 INCLUDERC=$PMDIR/ignore


@@ -50,8 +17,10 @@ INCLUDERC=$PMDIR/smsmail
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging

+INCLUDERC=$PMDIR/msgid-index

 
 INCLUDERC=$PMDIR/dejavu
 
 INCLUDERC=$PMDIR/dejavu

+INCLUDERC=$PMDIR/cleanup

 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates


@@ -63,12 +32,19 @@ INCLUDERC=$PMDIR/justme
 INCLUDERC=$PMDIR/spamtraps
 INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
 INCLUDERC=$PMDIR/spamtraps
 INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter

+
+INCLUDERC=$PMDIR/addheaders
+

 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies

+INCLUDERC=$PMDIR/tickle

 
 

-INCLUDERC=$PMDIR/addheaders
+#INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/spool

 
 

-INCLUDERC=$PMDIR/lurker
+INCLUDERC=$PMDIR/listquirks

 
 INCLUDERC=$PMRULES/all
 
 INCLUDERC=$PMRULES/all

+
+INCLUDERC=$PMRULES/deliver