X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/cd898064101f6cf9a55af2c98514574a6ec7f94a..dbbfca75714b9d79cd7c2d52529e6de258adbb77:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 93efda8..2e8c1f5 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -32,9 +32,11 @@ SA_PREFS="$MAILFILT/spamassassin/user_prefs"
 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"
+TRAINER="$NICE $MAILFILT/bin/train"
 
-OURDATE=`date -R`
+SQLITE="$NICE /usr/bin/sqlite3"
+
+OURDATE="`date -R`"
 OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
 
 BASE=$HOME/.maildir
@@ -64,14 +66,18 @@ NL="
 "
 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
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
@@ -119,6 +125,18 @@ INCLUDERC=$PMDIR/get-msgid
 :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" }
+
+:0
+*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+{ DELAYED="$MATCH" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
@@ -179,7 +197,3 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
-
-# TRAINED_AS
-# if set, contains category with which this message has just been trained
-TRAINED_AS