replace existing x-tickle-delivered header

[etc/mailfilter.git] / procmail / justme

diff --git a/procmail/justme b/procmail/justme
index e4b9c60c0155681b30da1c802de85396eadd0ade..b6257b543c887d1c3b9ac40d69a777139dbb1c0e 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -19,12 +19,12 @@
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
 
   :0 E
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions

-  { 
+  {

     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }
 

-  :0 EBH
+  :0 E

   *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
   *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
   {
   *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME
   *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME
   {


@@ -32,14 +32,14 @@
     LOG="justme:      passing; $JUSTME$NL"
   }
 
     LOG="justme:      passing; $JUSTME$NL"
   }
 

-  :0 EBH
+  :0 E

   *$ B ?? $RE_LASTNAME
   {
     JUSTME="last name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   *$ B ?? $RE_LASTNAME
   {
     JUSTME="last name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 

-  :0 EBH
+  :0 E

   *  1^0 B ?? madduck
   * -1^0 B ?? mass\.madduck\.net
   {
   *  1^0 B ?? madduck
   * -1^0 B ?? mass\.madduck\.net
   {


@@ -55,8 +55,41 @@
   }
 
   :0 E
   }
 
   :0 E

-  { 
+  * MSGID ?? ^<mailman
+  * 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="majordomo confirmation"
+    LOG="justme:      passing; $JUSTME$NL"
+  }
+
+  :0 E
+  {

     LOG="justme:      discarding$NL"
     LOG="justme:      discarding$NL"

+
+    INCLUDERC=$PMDIR/addheaders
+

     :0
     $DISCARD
   }
     :0
     $DISCARD
   }