X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/c59acab8a4a0212eaf427f8d5e9745eabcf0b303..07501919b00a0170efa60ded07e8169452647790:/procmail/spamfilter diff --git a/procmail/spamfilter b/procmail/spamfilter index 80d59cf..491f157 100755 --- 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" + :0 fw + |$FORMAIL -I"X-Spam: $TRAINED_AS (already trained)" :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 @@ -51,6 +57,8 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail} * DEST ?? . { LOG="spamfilter: message already routed to '$DEST'$NL" + :0 fw + |$FORMAIL -I"X-Spam: unknown (already routed)" SPAM_UNKNOWN=already-destined } @@ -91,6 +99,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail} { INCLUDERC=$PMDIR/spamtraps INCLUDERC=$PMDIR/spammers + INCLUDERC=$PMDIR/spampat INCLUDERC=$PMDIR/pre-spam-cleanup # crm114