fix resubmit script argument processing

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 43945cdb9c89492f13ec6c1c85def19e27383982..384f13cf81066f33c1a116972751c62120ae3e79 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -80,8 +80,9 @@ 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
@@ -135,7 +136,7 @@ INCLUDERC=$PMDIR/get-msgid
 
   # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
   :0
-  * SUBJECT ?? ^=\?iso-8859-1\?[QB]\?.+\?=$
+  * SUBJECT ?? =\?iso-8859-1\?[QBqb]\?.+\?=
   {
     DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
     :0
@@ -149,7 +150,7 @@ INCLUDERC=$PMDIR/get-msgid
 { ORIGINAL_TO="$MATCH" }
 :0 E
 * ^Received:
-{ LOG="NO ORIGINAL_TO: $MSGID" }
+{ LOGLATER="NO ORIGINAL_TO: $MSGID" }
 
 :0
 *$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
@@ -223,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.