route tickler via resubmit and delay queue

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index d0da2efbcdfc90cb6a3f67f3468c9c4663ca2db9..a24641c3d20a5e739a15b16731a172d8f43ecef5 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -75,7 +75,7 @@ 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'"
@@ -133,18 +133,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\?[QB]\?.+\?=$
   {
+    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,6 +148,7 @@ INCLUDERC=$PMDIR/get-msgid
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE
 { ORIGINAL_TO="$MATCH" }
 :0 E
+* ^Received:
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
 :0