add received header on resumission

[etc/mailfilter.git] / procmail / justme

diff --git a/procmail/justme b/procmail/justme
index 578cc4a7fff859177fb35f8db13b55a46a3b7e55..f414ac51357d62be3f0c9a82a77db2d273348620 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"


@@ -56,7 +56,6 @@
 
   :0 E
   * MSGID ?? ^<mailman
 
   :0 E
   * MSGID ?? ^<mailman

-  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$

   {
     :0
     * FROM ?? -request@
   {
     :0
     * FROM ?? -request@


@@ -66,6 +65,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$


@@ -77,7 +84,6 @@
 
   :0 E
   * FROM ?? ^[Mm]ajordomo@
 
   :0 E
   * FROM ?? ^[Mm]ajordomo@

-  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$

   * SUBJECT ?? ^Confirmation for
   {
     JUSTME="majordomo confirmation"
   * SUBJECT ?? ^Confirmation for
   {
     JUSTME="majordomo confirmation"


@@ -85,13 +91,41 @@
   }
 
   :0 E
   }
 
   :0 E

+  * FROM ?? ^noreply@googlegroups\.com$
+  * SUBJECT ?? ^Google Groups: Please confirm

   {
   {

-    LOG="justme:      discarding$NL"
+    JUSTME="googlegroups confirmation"
+    LOG="justme:      passing; $JUSTME$NL"
+  }

 
 

-    INCLUDERC=$PMDIR/addheaders
+  :0 E
+  * FROM ?? ^Yahoo! Groups <confirm-.+@yahoogroups\.com>$
+  * SUBJECT ?? ^Please confirm your request to join
+  {
+    JUSTME="yahoogroups confirmation"
+    LOG="justme:      passing; $JUSTME$NL"
+  }

 
 

-    :0
-    $DISCARD
+  :0 E
+  * FROM ?? ^SmartList <.+-request@.+>
+  * SUBJECT ?? ^CONFIRM s[0-9]+$
+  {
+    JUSTME="smartlist confirmation"
+    LOG="justme:      passing; $JUSTME$NL"
+  }
+
+  :0 E
+  * FROM ?? ^Launchpad Email Validator <noreply@launchpad\.net>
+  * SUBJECT ?? ^Launchpad: Validate your email address$
+  {
+    JUSTME="launchpad validation"
+    LOG="justme:      passing; $JUSTME$NL"
+  }
+
+  :0 E
+  {
+    LOG="justme:      discarding$NL"
+    SWITCHRC=$PMDIR/discard

   }
 }
 
   }
 }