also cleanup X-Spamtrapped header

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

diff --git a/procmail/get-msgid b/procmail/get-msgid
index c1260ac8bd9a5639ac573c05e6ff9a3e2e40e90b..50fbef4f01459bfcf76d826deb330ba099840ffb 100644 (file)
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -10,7 +10,7 @@
   {
     LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
   {
     LOG="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
   }
 
   :0 E


@@ -36,13 +36,8 @@
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
 *$ 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"
 {
   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" }
+  MSGID="<${MATCH}.MSGID-ADDED>"

 }
 }