From: martin f. krafft Date: Fri, 17 Aug 2007 15:06:00 +0000 (+0200) Subject: remove trailing ws X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/77db0127feeb3654994cee2c75fa53b530e84eeb?ds=sidebyside remove trailing ws --- diff --git a/procmail/justme b/procmail/justme index e4b9c60..9c12697 100644 --- a/procmail/justme +++ b/procmail/justme @@ -19,7 +19,7 @@ :0 E * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions - { + { JUSTME="explicitly excepted address" LOG="justme: passing; $JUSTME$NL" } @@ -55,7 +55,7 @@ } :0 E - { + { LOG="justme: discarding$NL" :0 $DISCARD diff --git a/procmail/procmailrc b/procmail/procmailrc index fc4b83d..3753069 100755 --- a/procmail/procmailrc +++ b/procmail/procmailrc @@ -27,7 +27,7 @@ FROM_ALBATROSS=! L D } - + :0 E * M ?? ^\/\+?[^@]* { OT="madduck$MATCH@madduck.net" } diff --git a/procmail/spamfilter b/procmail/spamfilter index c960e79..066b9cb 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,7 +255,7 @@ TRAINED_AS * SPAMTRAPPED ?? . * ! SKIP_SPAMCHECKS ?? . * ! IS_SPAM ?? . -{ +{ LOG="spamfilter: found spamtrapped ham, retraining...$NL" :0 fw |$FORMAIL -I"X-Spam: spamtrapped ham"