cleanup headers we add earlier in the chain

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index cd1240e12be851dfe10b32ca302d978c59f6549b..9b404dece944c03fb2de0a44f6409d26c36e6abc 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -17,6 +17,8 @@ REPLIES=$MAILFILT/autoreplies
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 
 LOGFILE=${LOGFILE:-$PMVAR/log}
 LOGABSTRACT=no
 

+LC_CTYPE=de_CH.UTF-8
+

 #NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 #NICE='/usr/bin/nice -20'
 
 PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"


@@ -27,8 +29,8 @@ DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
 SA_PREFS="$MAILFILT/spamassassin/user_prefs"

-SPAMASSASSIN="$NICE /usr/bin/spamassassin -p $SA_PREFS"
-SPAMC="$NICE /usr/bin/spamc -lx"
+SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
+SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"

 #SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 
 #SPAMC="$SPAMASSASSIN"
 TRAINER="$MAILFILT/bin/train"
 


@@ -42,7 +44,7 @@ DEFAULT=$BASE/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking

-SPAMCHECK_MAX_MESSAGE_SIZE=2500000
+SPAMCHECK_MAX_MESSAGE_SIZE=512000

 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham
 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham


@@ -67,6 +69,8 @@ RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[     ]*\/[^  ].*"
 

+DEJAVU_HEADER=X-Deja-Vu
+

 NULL=/dev/null
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 NULL=/dev/null
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"


@@ -109,11 +113,6 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 { SUBJECT="$MATCH" }
 
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 { SUBJECT="$MATCH" }
 

-# TODO: can be removed as soon as albatross is out of the loop
-:0 fw
-* ^X-Original-To-Saved: \/.*
-|$FORMAIL -R X-Original-To-Saved X-Original-To
-

 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }


@@ -133,11 +132,11 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
 
 ### run-time variables
 

-# REPROC_MESSAGE
+# MSG_DEJAVU

 # a procmail-style flag, which is true if unset and false if set (to !).
 # a procmail-style flag, which is true if unset and false if set (to !).

-# unset by marknew if the message has already been seen by the filter (according
+# unset by dejavu if the message has already been seen by the filter (according

 # to the X-Been-There header).
 # to the X-Been-There header).

-REPROC_MESSAGE=!
+MSG_DEJAVU=!

 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason


@@ -171,3 +170,7 @@ SPAM_UNKNOWN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN
 # RETRAIN
 # if set, causes spamfilters to be retrained, according to the variable's value
 RETRAIN

+
+# JUSTME
+# if set, contains reason why justme message was passed
+JUSTME