X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/bfe82fe5e7744f769c178a805bb2679a2d8c10da..7304c1c5451f92503e7fc20cc034d38821e22eb6:/procmail/justme

diff --git a/procmail/justme b/procmail/justme
index 578cc4a..e122ddf 100644
--- a/procmail/justme
+++ b/procmail/justme
@@ -2,15 +2,13 @@
 *$ MSGID ?? ^<.+@$RE_MYDOMAIN>
 {
   JUSTME="from machine in my domain"
-  LOG="justme:      passing; $JUSTME$NL"
-  SKIP_SPAMCHECKS=from-mydomain
+#  SKIP_SPAMCHECKS=from-mydomain
 }
 
 :0 EH
 *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN>
 {
   JUSTME="in-reply-to/referenced"
-  LOG="justme:      passing; $JUSTME$NL"
   SKIP_SPAMCHECKS=in-reply-to/referenced
 }
 
@@ -19,80 +17,82 @@
 {
   :0
   * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions
-  {
-    JUSTME="explicitly excepted address"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="explicitly excepted address" }
 
   :0 E
-  *$ 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"
-  }
+  *$ 1^0 B ?? .*\<$RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME\>
+  *$ 1^0 B ?? .*\<$RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME\>
+  { JUSTME="full name reference" }
 
   :0 E
-  *$ B ?? $RE_LASTNAME
-  {
-    JUSTME="last name reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  *$ B ?? .*\<$RE_LASTNAME\>
+  { JUSTME="last name reference" }
 
   :0 E
-  *  1^0 B ?? madduck
+  *  1^0 B ?? .*\<madduck\>
   * -1^0 B ?? mass\.madduck\.net
-  {
-    JUSTME="nickname reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="nickname reference" }
 
-  :0 EBH
+  :0 EB
   *$ ? $EGREP -qif $CONF/justme-keyword-exceptions
-  {
-    JUSTME="keyword reference"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="keyword reference" }
 
   :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"
-    }
+    { JUSTME="mailman confirmation" }
+
+    :0 E
+    * FROM ?? -bounces@
+    * SUBJECT ?? ^You have been unsubscribed
+    { JUSTME="mailman confirmation" }
 
     :0 E
     * FROM ?? -bounces@
     * SUBJECT ?? .+ mailing list reminder$
-    {
-      JUSTME="mailman password reminder"
-      LOG="justme:      passing; $JUSTME$NL"
-    }
+    { JUSTME="mailman password reminder" }
   }
 
   :0 E
   * FROM ?? ^[Mm]ajordomo@
-  * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$
   * SUBJECT ?? ^Confirmation for
-  {
-    JUSTME="majordomo confirmation"
-    LOG="justme:      passing; $JUSTME$NL"
-  }
+  { JUSTME="majordomo confirmation" }
 
   :0 E
-  {
-    LOG="justme:      discarding$NL"
+  * FROM ?? ^noreply@googlegroups\.com$
+  * SUBJECT ?? ^Google Groups: Please confirm
+  { JUSTME="googlegroups confirmation" }
 
-    INCLUDERC=$PMDIR/addheaders
+  :0 E
+  * FROM ?? ^Yahoo! Groups <confirm-.+@yahoogroups\.com>$
+  * SUBJECT ?? ^Please confirm your request to join
+  { JUSTME="yahoogroups confirmation" }
 
-    :0
-    $DISCARD
+  :0 E
+  * FROM ?? ^SmartList <.+-request@.+>
+  * SUBJECT ?? ^CONFIRM s[0-9]+$
+  { JUSTME="smartlist confirmation" }
+
+  :0 E
+  * FROM ?? ^Launchpad Email Validator <noreply@launchpad\.net>
+  * SUBJECT ?? ^Launchpad: Validate your email address$
+  { JUSTME="launchpad validation" }
+
+  :0 E
+  {
+    LOG="justme:      discarding$NL"
+    SWITCHRC=$PMDIR/discard
   }
 }
 
+:0
+* JUSTME ?? .
+{ LOG="justme:      passing; $JUSTME$NL" }
+
+:0 E
+{ LOG="justme:      passing; UNKNOWN$NL" }
+
 # vim:ft=procmail