pass all d-publicity mail

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

diff --git a/procmail/get-msgid b/procmail/get-msgid
index e61817c4fc2d6731f3f04a9fc7ba4f63e9c3d021..eb5964eac7036b38d7d44180dc131731ba3b47bb 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>"
 }
 
@@ -38,6 +38,6 @@
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 * MSGID ?? ^<\/[^>]+
 {
-  LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
+  LOGLATER="get-msgid:   missing message ID added by one of our mail relays$NL"
   MSGID="<${MATCH}.MSGID-ADDED>"
 }