no longer record delays in sqlite database

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index d0da2efbcdfc90cb6a3f67f3468c9c4663ca2db9..384f13cf81066f33c1a116972751c62120ae3e79 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -48,7 +48,7 @@ SPAMCHECK_MAX_MESSAGE_SIZE=512000
 
 # if crm114 is unsure and SA returns a score less-than-or-equal to this,
 # autotrain crm114 with ham
-CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=2.0
+CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM=0.0
 # if crm114 classifies a message as spam but SA returns a score
 # less-than-or-equal to this, retrain crm114
 CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM=-1.0
@@ -75,13 +75,14 @@ DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
-TICKLER_QUEUE=$BASE/.tickler/
+TICKLER_QUEUE=$BASE/.store/
 DISCARD=$BASE/.discard/
 SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
-DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00
+DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00
 DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00
+DELAY_AFTERNOON='tomorrow 00:00 9 hours ago' # todat at 15:00
 
 OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0
@@ -133,18 +134,14 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
+  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
   :0
-  * SUBJECT ?? =\?(iso-8859-1|utf-8)\?\/..[^\?]*
+  * SUBJECT ?? =\?iso-8859-1\?[QBqb]\?.+\?=
   {
+    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
     :0
-    * MATCH ?? B\?\/[^\?]*
-    { BBB=`echo $SUBJECT | mimencode -u` }
-
-    :0
-    * MATCH ?? Q\?\/[^\?]*
-    { QQQ=`echo $SUBJECT | mimencode -u -q` }
-
-    SUBJECT="$QQQ$BBB"
+    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
+    { SUBJECT=$MATCH }
   }
 }
 
@@ -152,19 +149,16 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
-{ LOG="NO ORIGINAL_TO: $MSGID" }
+* ^Received:
+{ LOGLATER="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" }
+*$ ^X-Postponed:$RE_EXTRACT_HEADER_VALUE
+{ POSTPONED="$MATCH" }
 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
@@ -230,3 +224,12 @@ JUSTME
 # DISABLE_DELAYS
 # if set, disables delaying messages
 DISABLE_DELAYS
+
+# DELAY
+# argument to /bin/date -d to indicate a message delay. This is overridden by
+# RELEASE
+DELAY
+
+# RELEASE
+# /bin/date time expression indicating the time at which a message is to be
+# released. Overrides DELAY.