X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0cedb2f205d3552104ef3f7edc1d0640fedbd4ff..257871e32d11b6c0dec5b3e8413dfd34167461ff:/procmail/spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 9e88642..491f157 100755
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -37,13 +37,29 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   * 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" }
+  {
+    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
@@ -81,6 +97,9 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # now run the spamfilters
 :0 E
 {
+  INCLUDERC=$PMDIR/spamtraps
+  INCLUDERC=$PMDIR/spammers
+  INCLUDERC=$PMDIR/spampat
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114
@@ -89,6 +108,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   :0
   * !SKIP_CRM ?? .
   {
+    #TODO: somehow filter out headers we added
     :0 fw
     |$CRM114