fix handling of X-Postponed header

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index c38adab1906742c1d1e15c50a213cd8241afc7f5..dc9663a22014f3c103f9a0c9ded08a573316fe7b 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"
 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/"
 DELIVER="$NICE /usr/lib/dovecot/deliver"
 
 CRM114="$NICE /usr/share/crm114/mailreaver.crm -u $MAILFILT/crm114/"


@@ -36,9 +37,6 @@ TRAINER="$NICE $MAILFILT/bin/train"
 
 SQLITE="$NICE /usr/bin/sqlite3"
 
 
 SQLITE="$NICE /usr/bin/sqlite3"
 

-OURDATE="`date -R`"
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
-

 BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"
 BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"


@@ -76,11 +74,26 @@ 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/
-TICKLER_QUEUE=$BASE/.tickler/
+DELAYED_QUEUE=$BASE/.delayed/
+TICKLER_QUEUE=$BASE/.store/

 DISCARD=$BASE/.discard/
 DISCARD=$BASE/.discard/

+SPAM=$BASE/.spam/

 #DISCARD="'|$DELIVER -m BASE.discard'"
 
 #DISCARD="'|$DELIVER -m BASE.discard'"
 

+DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00
+DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20: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}+\/.+
+{ OURDATE="$MATCH" }
+

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


@@ -117,14 +130,35 @@ INCLUDERC=$PMDIR/get-msgid
 
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE

-{ SUBJECT="$MATCH" }
+{
+  SUBJECT=$MATCH
+
+  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
+  :0
+  * SUBJECT ?? ^=\?iso-8859-1\?[QB]\?.+\?=$
+  {
+    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
+    :0
+    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
+    { SUBJECT=$MATCH }
+  }
+}

 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E

+* ^Received:

 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 { LOG="NO ORIGINAL_TO: $MSGID" }
 

+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE
+{ POSTPONED="$MATCH" }
+

 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 


@@ -186,6 +220,6 @@ RETRAIN
 # if set, contains reason why justme message was passed
 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
+# DISABLE_DELAYS
+# if set, disables delaying messages
+DISABLE_DELAYS