eval formail variable

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 2ffec514a5310a4093cb13f7355eb5a1b22c6921..37c3c33297f968ecd20fe4f5a0d799d12db20205 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,16 +29,29 @@ 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
+    * TRAINED_AS ?? spam
+    { IS_SPAM=already-trained }
+  }
+
+  :0 E
+  { 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
@@ -76,6 +89,8 @@ TRAINED_AS
 # now run the spamfilters
 :0 E
 {
+  INCLUDERC=$PMDIR/spamtraps
+  INCLUDERC=$PMDIR/spammers
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114