handle spam separately, not from spamfilter

[etc/mailfilter.git] / procmail / spamfilter
diff --git a/procmail/spamfilter b/procmail/spamfilter

index 9e6d78780cc6d001e46eece0ccf903098438046d..c960e7959d2238d5a6dfa21b4c1ca0d43f50af3b 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -32,7 +32,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
  # check whether this message is being reinjected
  TRAINED_AS
  :0
-*$ $REPROC_MESSAGE
+*$ $MSG_DEJAVU
  * ^X-Trained-As: \/(h|sp)am
  {
    LOG="spamfilter:  skipping already trained $MATCH$NL"
@@ -60,6 +60,7 @@ TRAINED_AS
    :0 fw
    |$FORMAIL -I"X-Spam: unknown (check skipped)"
    SPAM_UNKNOWN=skip-match
+  SKIP_SPAMCHECKS=match
  }
  
  # sanity check on message size
@@ -252,6 +253,7 @@ TRAINED_AS
  # schedule spamtrapped ham for retraining as spam
  :0
  * SPAMTRAPPED ?? .
+* ! SKIP_SPAMCHECKS ?? .
  * ! IS_SPAM ?? .
  { 
    LOG="spamfilter:  found spamtrapped ham, retraining...$NL"
@@ -261,5 +263,4 @@ TRAINED_AS
    RETRAIN=spam
  }
  
-INCLUDERC=$PMDIR/handlespam
  #VERBOSE=no