X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/7ff084bf0856780853bcb2e29f8a4921a54cbecc..1c58a2ec1f77bd76da2d149012959e9bf121e39e:/procmail/spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 2ffec51..b0d2793 100755
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,16 +29,37 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
-# check whether this message is being reinjected
-TRAINED_AS
+# check whether this message is being resubmitted
 :0
 *$ $MSG_DEJAVU
-* ^X-Trained-As: \/(h|sp)am
 {
-  LOG="spamfilter:  skipping already trained $MATCH$NL"
   :0
-  * MATCH ?? spam
-  { IS_SPAM=already-trained }
+  * TRAINED_AS ?? .
+  {
+    LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"
+    :0 fw
+    |$FORMAIL -I"X-Spam: $TRAINED_AS (already trained)"
+    :0
+    * TRAINED_AS ?? spam
+    { IS_SPAM=already-trained }
+  }
+
+  :0 E
+  {
+    LOG="spamfilter:  skipping resubmitted message$NL"
+    :0 fw
+    |$FORMAIL -I"X-Spam: unknown (resubmitted)"
+  }
+}
+
+# do not run spamfilters if the message destination is already set
+:0 E
+* DEST ?? .
+{
+  LOG="spamfilter:  message already routed to '$DEST'$NL"
+  :0 fw
+  |$FORMAIL -I"X-Spam: unknown (already routed)"
+  SPAM_UNKNOWN=already-destined
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
@@ -76,6 +97,8 @@ TRAINED_AS
 # now run the spamfilters
 :0 E
 {
+  INCLUDERC=$PMDIR/spamtraps
+  INCLUDERC=$PMDIR/spammers
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114
@@ -84,6 +107,7 @@ TRAINED_AS
   :0
   * !SKIP_CRM ?? .
   {
+    #TODO: somehow filter out headers we added
     :0 fw
     |$CRM114