reuse BIN_DATE variable and slight reorg

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 9b404dece944c03fb2de0a44f6409d26c36e6abc..464cea3720cf6bb525ee96b8df8832f244bdd9e9 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -25,6 +25,7 @@ PROCMAIL="$NICE /usr/bin/procmail -p $PMDIR/procmailrc"
 FORMAIL="$NICE /usr/bin/formail -f"
 EGREP="$NICE /bin/egrep"
 SED="$NICE /bin/sed"
+BIN_DATE="/bin/date"
 DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"
@@ -32,10 +33,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"
-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
 
@@ -64,17 +64,35 @@ 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'"
 
+DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00
+DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00
+
+OURDATE="`$BIN_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
@@ -119,6 +137,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
 
@@ -138,6 +168,11 @@ INCLUDERC=$PMDIR/normalise
 # to the X-Been-There header).
 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
 SKIP_SPAMCHECKS