fix filtering of GPG messages

[etc/mailfilter.git] / procmail / get-msgid

diff --git a/procmail/get-msgid b/procmail/get-msgid
index c1260ac8bd9a5639ac573c05e6ff9a3e2e40e90b..02b10b150d0fc46fadda71228f0aed2c3b1d668a 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -1,34 +1,34 @@
 :0
-* ^Message-Id:[        ]*\/[^  ]+
+*$ ^Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
 { MSGID="$MATCH" }
 
 :0
-* MSGID ?? ^[  ]*$|^<>$
+*$ MSGID ?? ^$RE_SPACE*$|^<>$
 {
   :0
-  * ^Resent-Message-Id:[       ]*\/[^  ]+
+  *$ ^Resent-Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
   {
-    LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
+    LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
-    |$FORMAIL -R Resent-Message-Id Message-Id
+    |$FORMAIL -R Resent-Message-ID Message-ID
   }
 
   :0 E
   {
-    LOG="get-msgid:   lacking message-id, generating one...$NL"
+    LOGLATER="get-msgid:   lacking message-id, generating one...$NL"
     :0 fw
     |$FORMAIL -a Message-ID:
   }
 
   :0
-  * ^Message-Id:[      ]*\/[^  ]+
+  *$ ^Message-Id:$RE_EXTRACT_HEADER_VALUE
   { MSGID="$MATCH" }
 }
 
 :0
 * ! MSGID ?? ^<[^>]+>$
 {
-  LOG="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"
+  LOGLATER="get-msgid:   message-id '$MSGID' not enclosed in <>, fixing it...$NL"
   MSGID="<$MSGID>"
 }
 
@@ -36,13 +36,8 @@
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
+* MSGID ?? ^<\/[^>]+
 {
-  LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
-
-  :0 fw
-  |$SED -re "s/^([Mm]essage-[Ii][Dd]:[^@]+@$RE_MAILRELAYS)\>/\1.MSGID-ADDED/"
-
-  :0
-  * ^Message-Id:[      ]*\/[^  ]+
-  { MSGID="$MATCH" }
+  LOGLATER="get-msgid:   missing message ID added by one of our mail relays$NL"
+  MSGID="<${MATCH}.MSGID-ADDED>"
 }