extract headers early, also tickle-delivered, and clean up those

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index cad0d37a17cb64211aa5966ea5a0aeedf8682041..62464dd0164114ae67fd6ef2c35f396cee6b4f3f 100644 (file)
--- 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
@@ -74,7 +76,7 @@ RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
-DELAY_QUEUE=$BASE/.delay/
+DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
@@ -123,6 +125,14 @@ 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" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
@@ -183,7 +193,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