Merge branch 'no-more-albatross'

[etc/mailfilter.git] / procmail / spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 9e6d78780cc6d001e46eece0ccf903098438046d..066b9cbd7845ca878c43036ee08559eb33e55bd0 100755 (executable)
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -23,7 +23,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # Note: add E flag to next recipe when uncommenting
 #:0
 #* SPAMTRAPPED ?? .
 # Note: add E flag to next recipe when uncommenting
 #:0
 #* SPAMTRAPPED ?? .

-#{ 
+#{

 #  LOG="spamfilter:  skipping checks for spamtrapped message$NL"
 #  :0 fw
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #  LOG="spamfilter:  skipping checks for spamtrapped message$NL"
 #  :0 fw
 #  |$FORMAIL -I"X-Spam: spamtrapped"


@@ -32,7 +32,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # check whether this message is being reinjected
 TRAINED_AS
 :0
 # 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"
 * ^X-Trained-As: \/(h|sp)am
 {
   LOG="spamfilter:  skipping already trained $MATCH$NL"


@@ -44,8 +44,8 @@ TRAINED_AS
 # let earlier parts of the mailfilter cause bypassing the checks
 :0 E
 * SKIP_SPAMCHECKS ?? .
 # let earlier parts of the mailfilter cause bypassing the checks
 :0 E
 * SKIP_SPAMCHECKS ?? .

-{ 
-  LOG="spamfilter:  skipping checks as requested: $SKIP_SPAMCHECKS$NL" 
+{
+  LOG="spamfilter:  skipping checks as requested: $SKIP_SPAMCHECKS$NL"

   :0 fw
   |$FORMAIL -I"X-Spam: unknown (skip requested)"
   SPAM_UNKNOWN=skip-requested
   :0 fw
   |$FORMAIL -I"X-Spam: unknown (skip requested)"
   SPAM_UNKNOWN=skip-requested


@@ -60,6 +60,7 @@ TRAINED_AS
   :0 fw
   |$FORMAIL -I"X-Spam: unknown (check skipped)"
   SPAM_UNKNOWN=skip-match
   :0 fw
   |$FORMAIL -I"X-Spam: unknown (check skipped)"
   SPAM_UNKNOWN=skip-match

+  SKIP_SPAMCHECKS=match

 }
 
 # sanity check on message size
 }
 
 # sanity check on message size


@@ -239,7 +240,7 @@ TRAINED_AS
   :0 E
   * CRM_SPAM ?? SPAM
   * SA_SPAM ?? Yes
   :0 E
   * CRM_SPAM ?? SPAM
   * SA_SPAM ?? Yes

-  { 
+  {

     IS_SPAM=sa+crm
     :0 fw
     |$FORMAIL -I"X-Spam: yes (crm114:$CRM_SCORE SA:$SA_SCORE)"
     IS_SPAM=sa+crm
     :0 fw
     |$FORMAIL -I"X-Spam: yes (crm114:$CRM_SCORE SA:$SA_SCORE)"


@@ -252,8 +253,9 @@ TRAINED_AS
 # schedule spamtrapped ham for retraining as spam
 :0
 * SPAMTRAPPED ?? .
 # schedule spamtrapped ham for retraining as spam
 :0
 * SPAMTRAPPED ?? .

+* ! SKIP_SPAMCHECKS ?? .

 * ! IS_SPAM ?? .
 * ! IS_SPAM ?? .

-{ 
+{

   LOG="spamfilter:  found spamtrapped ham, retraining...$NL"
   :0 fw
   |$FORMAIL -I"X-Spam: spamtrapped ham"
   LOG="spamfilter:  found spamtrapped ham, retraining...$NL"
   :0 fw
   |$FORMAIL -I"X-Spam: spamtrapped ham"


@@ -261,5 +263,4 @@ TRAINED_AS
   RETRAIN=spam
 }
 
   RETRAIN=spam
 }
 

-INCLUDERC=$PMDIR/handlespam

 #VERBOSE=no
 #VERBOSE=no