fix skips and add billmonk

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 95a0cbce80455c10f20afc941ee7b25b871fc52b..80d59cf6b62d564bff6bae7ef9b6a7f5c304112b 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,21 +29,29 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 

-# check whether this message is being reinjected
+# check whether this message is being resubmitted

 :0
 *$ $MSG_DEJAVU
 {
   :0
 :0
 *$ $MSG_DEJAVU
 {
   :0

-  * ^X-Trained-As: \/(h|sp)am
+  * TRAINED_AS ?? .

   {
   {

-    LOG="spamfilter:  skipping already trained $MATCH$NL"
+    LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"

     :0
     :0

-    * MATCH ?? spam
+    * TRAINED_AS ?? spam

     { IS_SPAM=already-trained }
   }
 
   :0 E
     { IS_SPAM=already-trained }
   }
 
   :0 E

-  { LOG="spamfilter:  skipping reinjected message$NL" }
+  { LOG="spamfilter:  skipping resubmitted message$NL" }
+}
+
+# do not run spamfilters if the message destination is already set
+:0 E
+* DEST ?? .
+{
+  LOG="spamfilter:  message already routed to '$DEST'$NL"
+  SPAM_UNKNOWN=already-destined

 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks


@@ -81,6 +89,8 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # now run the spamfilters
 :0 E
 {
 # now run the spamfilters
 :0 E
 {

+  INCLUDERC=$PMDIR/spamtraps
+  INCLUDERC=$PMDIR/spammers

   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114


@@ -89,6 +99,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   :0
   * !SKIP_CRM ?? .
   {
   :0
   * !SKIP_CRM ?? .
   {

+    #TODO: somehow filter out headers we added

     :0 fw
     |$CRM114
 
     :0 fw
     |$CRM114