cleanup headers we add earlier in the chain

[etc/mailfilter.git] / procmail / justme

diff --git a/procmail/justme b/procmail/justme
index 7d7135573bedc807ae5bd54b392e43427519a803..b6257b543c887d1c3b9ac40d69a777139dbb1c0e 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -55,11 +55,32 @@
   }
 
   :0 E
-  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$
   * MSGID ?? ^<mailman
-  * SUBJECT ?? ^confirm [[:xdigit:]]+$
+  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$
+  {
+    :0
+    * FROM ?? -request@
+    * SUBJECT ?? ^confirm [0-9a-f]+$
+    {
+      JUSTME="mailman confirmation"
+      LOG="justme:      passing; $JUSTME$NL"
+    }
+
+    :0 E
+    * FROM ?? -bounces@
+    * SUBJECT ?? .+ mailing list reminder$
+    {
+      JUSTME="mailman password reminder"
+      LOG="justme:      passing; $JUSTME$NL"
+    }
+  }
+
+  :0 E
+  * FROM ?? ^[Mm]ajordomo@
+  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$
+  * SUBJECT ?? ^Confirmation for
   {
-    JUSTME="mailman confirmation"
+    JUSTME="majordomo confirmation"
     LOG="justme:      passing; $JUSTME$NL"
   }