fix skip regexps for recipient lines

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 80d59cf6b62d564bff6bae7ef9b6a7f5c304112b..b0d279370be02e07507a0216b2e555a3bd005314 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -37,13 +37,19 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   * TRAINED_AS ?? .
   {
     LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"
   * 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
     :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
 }
 
 # do not run spamfilters if the message destination is already set


@@ -51,6 +57,8 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 * DEST ?? .
 {
   LOG="spamfilter:  message already routed to '$DEST'$NL"
 * DEST ?? .
 {
   LOG="spamfilter:  message already routed to '$DEST'$NL"

+  :0 fw
+  |$FORMAIL -I"X-Spam: unknown (already routed)"

   SPAM_UNKNOWN=already-destined
 }
 
   SPAM_UNKNOWN=already-destined
 }