X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/646d3b454aac6142476d4b165140806947e89562..e1d90df1eaecda8accd3c8117756c33a926b359c:/procmail/justme diff --git a/procmail/justme b/procmail/justme index b6257b5..3d5f6fc 100644 --- a/procmail/justme +++ b/procmail/justme @@ -1,23 +1,23 @@ -: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" @@ -84,6 +84,15 @@ 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"