also match student.ul.ie

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 37c3c33297f968ecd20fe4f5a0d799d12db20205..491f157939f95f423f179921b24fd06e7430c42e 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
 }
 


@@ -91,6 +99,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 {
   INCLUDERC=$PMDIR/spamtraps
   INCLUDERC=$PMDIR/spammers
 {
   INCLUDERC=$PMDIR/spamtraps
   INCLUDERC=$PMDIR/spammers

+  INCLUDERC=$PMDIR/spampat

   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114
   INCLUDERC=$PMDIR/pre-spam-cleanup
 
   # crm114


@@ -99,6 +108,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
   :0
   * !SKIP_CRM ?? .
   {
   :0
   * !SKIP_CRM ?? .
   {

+    #TODO: somehow filter out headers we added

     :0 fw
     |$CRM114
 
     :0 fw
     |$CRM114