only delay if ts is actually in the future

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index cad0d37a17cb64211aa5966ea5a0aeedf8682041..f9f6ff8b99bc2f0fda0a8a85a69530c4210f98d0 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -32,10 +32,9 @@ 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"
 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`
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
+SQLITE="$NICE /usr/bin/sqlite3"

 
 BASE=$HOME/.maildir
 
 
 BASE=$HOME/.maildir
 


@@ -74,11 +73,22 @@ RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
 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'"
 
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 

+OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+:0
+*$ OURDATE ?? ^\/${RE_NOT_SPACE}+
+{ OURDATE_TS="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE_SHORT="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE="$MATCH" }
+

 ### variables from the message
 
 ### local recipient data
 ### variables from the message
 
 ### local recipient data


@@ -123,6 +133,18 @@ INCLUDERC=$PMDIR/get-msgid
 :0 E
 { LOG="NO ORIGINAL_TO: $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
 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 


@@ -183,7 +205,3 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
 # 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