fix filtering of GPG messages

[etc/mailfilter.git] / procmail / defines

diff --git a/procmail/defines b/procmail/defines
index c79f5d5a35dfed9471f15ee01ab670819b00e1b5..e10d302713d12c8a82eee2dab603ad7bc40aff75 100644 (file)
--- a/procmail/defines
+++ b/procmail/defines
@@ -136,14 +136,10 @@ INCLUDERC=$PMDIR/get-msgid
 {
   SUBJECT=$MATCH
 
 {
   SUBJECT=$MATCH
 

-  # mimedecode.c: * Disclaimer: We only handle charset of iso-8859-1

   :0
   :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\\\";\"`"

   }
 }
 
   }
 }
 


@@ -225,7 +221,7 @@ JUSTME
 
 # DISABLE_DELAYS
 # if set, disables delaying messages
 
 # DISABLE_DELAYS
 # if set, disables delaying messages

-DISABLE_DELAYS=true
+DISABLE_DELAYS

 
 # DELAY
 # argument to /bin/date -d to indicate a message delay. This is overridden by
 
 # DELAY
 # argument to /bin/date -d to indicate a message delay. This is overridden by