X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/f3ea78382551b4dde6f4d130d7b37450f6ff56a7..b9d8d8cd7d90da7e14d72ed0bf6d1054f2ce3f5c:/procmail/justme diff --git a/procmail/justme b/procmail/justme index eae6a7d..7941e89 100644 --- a/procmail/justme +++ b/procmail/justme @@ -1,46 +1,46 @@ -:0 -* ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-addresses +:0 H +*$ MSGID ?? ^<.+@$RE_MYDOMAIN> { - :0 H - *$ MSGID ?? ^<.+@$RE_MYDOMAIN> - { - JUSTME="from machine in my domain" - LOG="justme: passing; $JUSTME$NL" - SKIP_SPAMCHECKS=from-mydomain - } + JUSTME="from machine in my domain" + LOG="justme: passing; $JUSTME$NL" +# SKIP_SPAMCHECKS=from-mydomain +} - :0 EH - *$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN> - { - JUSTME="in-reply-to/referenced" - LOG="justme: passing; $JUSTME$NL" - SKIP_SPAMCHECKS=in-reply-to/referenced - } +:0 EH +*$ ^(References|In-Reply-To):.*<.+@$RE_MYDOMAIN> +{ + JUSTME="in-reply-to/referenced" + LOG="justme: passing; $JUSTME$NL" + SKIP_SPAMCHECKS=in-reply-to/referenced +} - :0 E +:0 E +* ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-addresses +{ + :0 * ? echo "$ORIGINAL_TO" | $EGREP -qif $CONF/justme-address-exceptions { JUSTME="explicitly excepted address" LOG="justme: passing; $JUSTME$NL" } - - :0 EBH - *$ 1^0 B ?? $RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME - *$ 1^0 B ?? $RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME + + :0 E + *$ 1^0 B ?? .*\<$RE_FIRSTNAME$RE_SPACE_NEWLINE+$RE_LASTNAME\> + *$ 1^0 B ?? .*\<$RE_LASTNAME[,]?$RE_SPACE_NEWLINE*$RE_FIRSTNAME\> { JUSTME="full name reference" LOG="justme: passing; $JUSTME$NL" } - :0 EBH - *$ B ?? $RE_LASTNAME + :0 E + *$ B ?? .*\<$RE_LASTNAME\> { JUSTME="last name reference" LOG="justme: passing; $JUSTME$NL" } - :0 EBH - * 1^0 B ?? madduck + :0 E + * 1^0 B ?? .*\<madduck\> * -1^0 B ?? mass\.madduck\.net { JUSTME="nickname reference" @@ -55,13 +55,56 @@ } :0 E + * MSGID ?? ^<mailman + * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$ { - LOG="justme: discarding$NL" + :0 + * FROM ?? -request@ + * SUBJECT ?? ^confirm [0-9a-f]+$ + { + JUSTME="mailman confirmation" + LOG="justme: passing; $JUSTME$NL" + } - INCLUDERC=$PMDIR/addheaders + :0 E + * FROM ?? -bounces@ + * SUBJECT ?? ^You have been unsubscribed + { + JUSTME="mailman confirmation" + LOG="justme: passing; $JUSTME$NL" + } - :0 - $DISCARD + :0 E + * FROM ?? -bounces@ + * SUBJECT ?? .+ mailing list reminder$ + { + JUSTME="mailman password reminder" + LOG="justme: passing; $JUSTME$NL" + } + } + + :0 E + * FROM ?? ^[Mm]ajordomo@ + * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$ + * SUBJECT ?? ^Confirmation for + { + JUSTME="majordomo confirmation" + LOG="justme: passing; $JUSTME$NL" + } + + :0 E + * FROM ?? ^noreply@googlegroups\.com$ + * ORIGINAL_TO ?? ^[^=]+=[^@]+@mass\.madduck\.net$ + * SUBJECT ?? ^Google Groups: Please confirm + { + JUSTME="googlegroups confirmation" + LOG="justme: passing; $JUSTME$NL" + } + + :0 E + { + LOG="justme: discarding$NL" + SWITCHRC=$PMDIR/discard } }