X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/c04de83de0bf141a8bdfa44b60866dfd50a1e0a6..bc44168d4736169c38c92f94cb40e34fbb6e7ccf:/procmail/spamfilter diff --git a/procmail/spamfilter b/procmail/spamfilter index c960e79..2ffec51 100755 --- 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 ?? . -#{ +#{ # LOG="spamfilter: skipping checks for spamtrapped message$NL" # :0 fw # |$FORMAIL -I"X-Spam: spamtrapped" @@ -44,8 +44,8 @@ TRAINED_AS # 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 @@ -240,7 +240,7 @@ TRAINED_AS :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)" @@ -255,12 +255,13 @@ TRAINED_AS * SPAMTRAPPED ?? . * ! SKIP_SPAMCHECKS ?? . * ! IS_SPAM ?? . -{ +{ LOG="spamfilter: found spamtrapped ham, retraining...$NL" :0 fw |$FORMAIL -I"X-Spam: spamtrapped ham" IS_SPAM=spamtrapped-ham RETRAIN=spam + SPAM_UNSURE } #VERBOSE=no