LOGFILE=${LOGFILE:-$PMVAR/log}
LOGABSTRACT=no
-NICE='/usr/bin/nice -20'
+LC_CTYPE=de_CH.UTF-8
+
+#NICE='/usr/bin/nice -20'
PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
FORMAIL="$NICE /usr/bin/formail -f"
EGREP="$NICE /bin/egrep"
SED="$NICE /bin/sed"
+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 -lxu $ID"
-SPAMC="$SPAMASSASSIN"
-TRAINER="$MAILFILT/bin/train"
+SPAMASSASSIN="$NICE /usr/bin/spamassassin --prefs-file=$SA_PREFS"
+SPAMC="$NICE /usr/bin/spamc --log-to-stderr --no-safe-fallback"
+#SPAMC="$SPAMASSASSIN"
+TRAINER="$NICE $MAILFILT/bin/train"
+
+SQLITE="$NICE /usr/bin/sqlite3"
-OURDATE=`date -R`
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%m.%N`
+OURDATE="`date -R`"
+OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
-INBOX=$HOME/.maildir
+BASE=$HOME/.maildir
-DEFAULT=$INBOX/
+#DEFAULT="|$DELIVER"
+DEFAULT=$BASE/
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
### constants used in rules
NL="
"
-RE_MYDOMAIN="(.+\.)?madduck\.net"
+RE_MYDOMAIN="(.+\.)*madduck\.net"
RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
-RE_SPACE_NEWLINE="(^|[ ])"
+RE_SPACE="[ ]"
+RE_NOT_SPACE="[^ ]"
+RE_SPACE_NEWLINE="(^|$RE_SPACE)"
RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
RE_LASTNAME="kraff?t"
-RE_EXTRACT_HEADER_VALUE="[ ]*\/[^ ].*"
+RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
+
+DEJAVU_HEADER=X-Deja-Vu
NULL=/dev/null
-DISCARD=$INBOX/.discard/
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.tickler/
+DISCARD=$BASE/.discard/
+#DISCARD="'|$DELIVER -m BASE.discard'"
### variables from the message
*$ ^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 E
{ LOG="NO ORIGINAL_TO: $MSGID" }
+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
+{ TICKLE_DELIVERED="$MATCH" }
+
# fix variable values for special cases
INCLUDERC=$PMDIR/normalise
### run-time variables
-# OLD_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).
-OLD_MESSAGE=!
+MSG_DEJAVU=!
+
+# DEST
+# set this to a folder if the message should be delivered elsewhere than the
+# default
+DEST
# SKIP_SPAMCHECKS
# if set, cuases spamchecks to be skipped, value lists reason
# 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