X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/5af333ca3b83425e5cb3aa704b37654d576856c1..be0c56b52025c2bca71c81b6b067dabd6fd5534a:/procmail/spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index a882087..0fab788 100755
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -21,13 +21,14 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 INCLUDERC=$PMDIR/pre-spam-cleanup
 
 # no need to reprocess messages that went into a spamtrap
-:0
-* SPAMTRAPPED ?? .
-{ 
-  LOG="spamfilter:  skipping checks for spamtrapped message$NL"
-  :0 fw
-  |$FORMAIL -I"X-Spam: spamtrapped"
-}
+# UPDATE: retrain them only if diagnosed as non-spam, see below
+#:0
+#* SPAMTRAPPED ?? .
+#{ 
+#  LOG="spamfilter:  skipping checks for spamtrapped message$NL"
+#  :0 fw
+#  |$FORMAIL -I"X-Spam: spamtrapped"
+#}
 
 # let earlier parts of the mailfilter cause bypassing the checks
 :0 E
@@ -119,7 +120,7 @@ INCLUDERC=$PMDIR/pre-spam-cleanup
       LOG="spamfilter:  scheduling crm114 retraining with HAM (score $SA_SCORE <= $CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM)$NL"
       :0 fw
       |$FORMAIL -A "X-CRM114-Autotrain: ham, according to SA (score $SA_SCORE <= $CRM_UNSURE_SA_AUTOTRAIN_LIMIT_HAM)"
-      CRM_RETRAIN=ham
+      RETRAIN=ham
     }
 
     # retrain as spam
@@ -129,7 +130,7 @@ INCLUDERC=$PMDIR/pre-spam-cleanup
       LOG="spamfilter:  scheduling crm114 retraining with SPAM (score $SA_SCORE > $CRM_UNSURE_SA_AUTOTRAIN_LIMIT_SPAM)$NL"
       :0 fw
       |$FORMAIL -A "X-CRM114-Autotrain: spam, according to SA (score $SA_SCORE > $CRM_UNSURE_SA_AUTOTRAIN_LIMIT_SPAM)"
-      CRM_RETRAIN=spam
+      RETRAIN=spam
     }
 
     # skip retraining if SA is not convinced
@@ -152,7 +153,7 @@ INCLUDERC=$PMDIR/pre-spam-cleanup
     * ? perl -e "$SA_SCORE <= $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM || exit 1"
     {
       LOG="spamfilter:  crm114 found spam ($CRM_SCORE), but SA is more convincing ($SA_SCORE <= $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM)$NL"
-      CRM_RETRAIN=ham
+      RETRAIN=ham
       :0 fw
       |$FORMAIL -A "X-CRM114-Retrain: ham, according to SA (score $SA_SCORE <= $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_HAM)"
     }
@@ -177,7 +178,7 @@ INCLUDERC=$PMDIR/pre-spam-cleanup
     * ? perl -e "$SA_SCORE > $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM || exit 1"
     {
       LOG="spamfilter:  crm114 found ham ($CRM_SCORE), but SA is more convincing ($SA_SCORE > $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM)$NL"
-      CRM_RETRAIN=spam
+      RETRAIN=spam
       :0 fw
       |$FORMAIL -A "X-CRM114-Retrain: spam, according to SA (score $SA_SCORE > $CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM)"
     }
@@ -205,5 +206,11 @@ INCLUDERC=$PMDIR/pre-spam-cleanup
   |$FORMAIL -I"X-Spam: no (crm114:$CRM_SCORE SA:$SA_SCORE)"
 }
 
+# schedule spamtrapped ham for retraining as spam
+:0
+* SPAMTRAPPED ?? .
+* ! IS_SPAM ?? .
+{ RETRAIN=spam }
+
 INCLUDERC=$PMDIR/handlespam
 #VERBOSE=no