proper handling of X-Postponed header

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index a7acfab60ec1b16eb8cc1d807add4719ba652d54..dc9663a22014f3c103f9a0c9ded08a573316fe7b 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -75,7 +75,7 @@ DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
 
 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'"
 DISCARD=$BASE/.discard/
 SPAM=$BASE/.spam/
 #DISCARD="'|$DELIVER -m BASE.discard'"


@@ -133,28 +133,22 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
 {
   SUBJECT=$MATCH
 

-#TODO
-#  :0
-#  * SUBJECT ?? ()\?=\?(iso-8859-1|utf-8)\?\/..[^\?]*
-#  {
-#    :0
-#    * MATCH ?? B\?\/[^\?]*
-#    { BBB=`echo $SUBJECT | mimencode -u | cat -v` }
-#
-#    :0
-#    * MATCH ?? Q\?\/[^\?]*
-#    { QQQ=`echo $SUBJECT | mimencode -u -q | cat -v` }
-#
-#    SUBJECT="$QQQ$BBB"
-#  }
-
-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" }
 
 :0
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0


@@ -162,12 +156,8 @@ SUBJECT="$MATCH"
 { TRAINED_AS="$MATCH" }
 
 :0
 { 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
 
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise


@@ -229,3 +219,7 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME

+
+# DISABLE_DELAYS
+# if set, disables delaying messages
+DISABLE_DELAYS