improve sender parsing

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index bdc31674b19ee61f2b9714881b9163b2f66603ad..32a6e8f56b7286103009a8ea971dc3ac66ef6500 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -117,33 +117,44 @@ ID="$LOGNAME@$HOSTNAME"
 # message-id
 INCLUDERC=$PMDIR/get-msgid
 
+:0
+*$ ^From:$RE_EXTRACT_HEADER_VALUE
+{ FROM="$MATCH" }
+
 # if $SENDER is undefined or not an email address, get it from the message
 :0
 * !SENDER ?? @
-*$ ^Sender:$RE_EXTRACT_HEADER_VALUE
-{ SENDER="$MATCH" }
+{
+  :0
+  *$ ^Sender:$RE_EXTRACT_HEADER_VALUE
+  { SENDER="$MATCH" }
+
+  :0 E
+  *$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ <\/[^>]+
+  { SENDER="$MATCH" }
+
+  :0 E
+  * FROM ?? ^.+ \(\/[^\)]+
+  { SENDER="$MATCH" }
+}
 
 :0
 *$ ^Date:$RE_EXTRACT_HEADER_VALUE
 { DATE="$MATCH" }
 
-:0
-*$ ^From:$RE_EXTRACT_HEADER_VALUE
-{ FROM="$MATCH" }
-
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
   SUBJECT=$MATCH
 
-  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1
   :0
-  * SUBJECT ?? =\?iso-8859-1\?[QBqb]\?.+\?=
+  * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=
   {
-    DECODED="`echo Subject: $SUBJECT | mimedecode | iconv -f latin1 -t utf-8`"
-    :0
-    *$ DECODED ?? ^Subject:$RE_EXTRACT_HEADER_VALUE
-    { SUBJECT=$MATCH }
+    SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"
   }
 }