X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/90b680896df34b1a64d4541ceea5491a58136558..4f616c9efaf89b47a77ff368b52b41a2500bf16d:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index cd1240e..5419eae 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -27,8 +27,8 @@ 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"
 
@@ -67,6 +67,8 @@ 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=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
@@ -133,11 +135,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 +173,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