fix subject decoding

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index 464cea3720cf6bb525ee96b8df8832f244bdd9e9..2aae636af0d1852acd93838a6d52c119a3c04905 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -77,10 +77,11 @@ NULL=/dev/null
 DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/

+SPAM=$BASE/.spam/

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

-DELAY_NEXT_WEEKEND='next sunday 30 hours ago' # fri night, 18:00
-DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00
+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="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 :0


@@ -90,7 +91,7 @@ OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
 *$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
 { OURDATE_SHORT="$MATCH" }
 :0
 *$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
 { OURDATE_SHORT="$MATCH" }
 :0

-*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/.+

 { OURDATE="$MATCH" }
 
 ### variables from the message
 { OURDATE="$MATCH" }
 
 ### variables from the message


@@ -129,7 +130,19 @@ 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
 
 :0
 *$ ^X-Original-To:$RE_EXTRACT_HEADER_VALUE


@@ -209,3 +222,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