X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/df5fcc057aee589a6f58b05314951b74521c1241..8dde77c861da2fb8c14e2ce651423691db664f47:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index c825b51..511e614 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -27,18 +27,18 @@ DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 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"
 
 OURDATE=`date -R`
 OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 
-INBOX=$HOME/.maildir
+BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"
-DEFAULT=$INBOX/
+DEFAULT=$BASE/
 ORGMAIL=$HOME/BOUNCED-MAIL
 
 # maximum message size for spam checking
@@ -67,9 +67,11 @@ RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="[ 	]*\/[^ 	].*"
 
+DEJAVU_HEADER=X-Deja-Vu
+
 NULL=/dev/null
-DISCARD=$INBOX/.discard/
-#DISCARD="'|$DELIVER -m INBOX.discard'"
+DISCARD=$BASE/.discard/
+#DISCARD="'|$DELIVER -m BASE.discard'"
 
 ### variables from the message
 
@@ -109,11 +111,6 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^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" }
@@ -133,11 +130,11 @@ INCLUDERC=$PMDIR/normalise
 
 ### run-time variables
 
-# REPROC_MESSAGE
+# MSG_DEJAVU
 # 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).
-REPROC_MESSAGE=!
+MSG_DEJAVU=!
 
 # SKIP_SPAMCHECKS
 # if set, cuases spamchecks to be skipped, value lists reason
@@ -171,3 +168,7 @@ SPAM_UNKNOWN
 # 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