fix skips and add billmonk

[etc/mailfilter.git] / procmail / justme

diff --git a/procmail/justme b/procmail/justme
index 3d5f6fc7c7bf9c47e54be132b858b9b61cbf59b5..7941e89b638577b064dc3be69c3d608d18c348d8 100644 (file)
--- a/procmail/justme
+++ b/procmail/justme
@@ -3,7 +3,7 @@
 {
   JUSTME="from machine in my domain"
   LOG="justme:      passing; $JUSTME$NL"
 {
   JUSTME="from machine in my domain"
   LOG="justme:      passing; $JUSTME$NL"

-  SKIP_SPAMCHECKS=from-mydomain
+#  SKIP_SPAMCHECKS=from-mydomain

 }
 
 :0 EH
 }
 
 :0 EH


@@ -23,24 +23,24 @@
     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }
     JUSTME="explicitly excepted address"
     LOG="justme:      passing; $JUSTME$NL"
   }

-
+  

   :0 E
   :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\>

   {
     JUSTME="full name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E
   {
     JUSTME="full name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E

-  *$ B ?? $RE_LASTNAME
+  *$ B ?? .*\<$RE_LASTNAME\>

   {
     JUSTME="last name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E
   {
     JUSTME="last name reference"
     LOG="justme:      passing; $JUSTME$NL"
   }
 
   :0 E

-  *  1^0 B ?? madduck
+  *  1^0 B ?? .*\<madduck\>

   * -1^0 B ?? mass\.madduck\.net
   {
     JUSTME="nickname reference"
   * -1^0 B ?? mass\.madduck\.net
   {
     JUSTME="nickname reference"


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

+    :0 E
+    * FROM ?? -bounces@
+    * SUBJECT ?? ^You have been unsubscribed
+    {
+      JUSTME="mailman confirmation"
+      LOG="justme:      passing; $JUSTME$NL"
+    }
+

     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$


@@ -96,11 +104,7 @@
   :0 E
   {
     LOG="justme:      discarding$NL"
   :0 E
   {
     LOG="justme:      discarding$NL"

-
-    INCLUDERC=$PMDIR/addheaders
-
-    :0
-    $DISCARD
+    SWITCHRC=$PMDIR/discard

   }
 }
 
   }
 }