Return-Path: Delivered-To: apmail-spamassassin-commits-archive@www.apache.org Received: (qmail 32320 invoked from network); 3 Feb 2010 14:01:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Feb 2010 14:01:49 -0000 Received: (qmail 8374 invoked by uid 500); 3 Feb 2010 14:01:49 -0000 Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org Received: (qmail 8332 invoked by uid 500); 3 Feb 2010 14:01:49 -0000 Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "SpamAssassin Dev" List-Id: Delivered-To: mailing list commits@spamassassin.apache.org Received: (qmail 8323 invoked by uid 99); 3 Feb 2010 14:01:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2010 14:01:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2010 14:01:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB79723888EC; Wed, 3 Feb 2010 14:01:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r906046 - in /spamassassin/trunk/rulesrc/sandbox/mmartinec: 20_misc.cf 60_whitelist.cf Date: Wed, 03 Feb 2010 14:01:27 -0000 To: commits@spamassassin.apache.org From: mmartinec@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100203140127.EB79723888EC@eris.apache.org> Author: mmartinec Date: Wed Feb 3 14:01:27 2010 New Revision: 906046 URL: http://svn.apache.org/viewvc?rev=906046&view=rev Log: tweak my sandbox rules Removed: spamassassin/trunk/rulesrc/sandbox/mmartinec/60_whitelist.cf Modified: spamassassin/trunk/rulesrc/sandbox/mmartinec/20_misc.cf Modified: spamassassin/trunk/rulesrc/sandbox/mmartinec/20_misc.cf URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/mmartinec/20_misc.cf?rev=906046&r1=906045&r2=906046&view=diff ============================================================================== --- spamassassin/trunk/rulesrc/sandbox/mmartinec/20_misc.cf (original) +++ spamassassin/trunk/rulesrc/sandbox/mmartinec/20_misc.cf Wed Feb 3 14:01:27 2010 @@ -3,7 +3,7 @@ rawbody LONGLINE /^.{998}.+\r?$/ describe LONGLINE Line length exceeds 998 character limit, RFC 5322 -header RP_8BIT Return-Path =~ /[^\000-\177]/ +header RP_8BIT Return-Path:raw =~ /[^\000-\177]/ describe RP_8BIT Return-Path contains 8-bit characters with high bit on header RP_LASTNAME Return-Path =~ /LAST_NAME/m @@ -15,7 +15,7 @@ header RP_MINUS Return-Path:addr =~ /^-/m describe RP_MINUS Return-Path address starts with a minus -header CR_IN_SUBJ Subject =~ /\015/ +header CR_IN_SUBJ Subject:raw =~ /\015/ describe CR_IN_SUBJ Subject contains a CR character # must use :raw to avoid seeing a decoded display name @@ -25,9 +25,6 @@ header FROM_UNBAL2 From:raw =~ /^ [^<]* > /xm describe FROM_UNBAL2 From with unbalanced angle brackets, '<' missing -header FROM_UC_UNBAL From:raw =~ /^\s*[A-Z][A-Z0-9 \t]*<[A-Z0-9]+\@[^>]*$/m -describe FROM_UC_UNBAL All-upercase name in From and unbalanced <> - header FROM_WSP_TRAIL From:raw =~ /< [^>]* \s > [^<>]* \z/xm describe FROM_WSP_TRAIL Trailing whitespace before '>' in From header field @@ -47,12 +44,11 @@ #score RP_LASTNAME 4 #score RP_UNDERLINE 3 #score RP_MINUS 2 -#score CR_IN_SUBJ 7 +#score CR_IN_SUBJ 4 #score FROM_UNBAL1 3 #score FROM_UNBAL2 3 -#score FROM_UC_UNBAL 6 -#score FROM_WSP_TRAIL 2 +#score FROM_WSP_TRAIL 2 #score FROM_WSP_LEAD 2 #score MSGID_WSP_TRAIL 2 -#score MSGID_NOFQDN1 1 -#score MSGID_NOFQDN2 1 +#score MSGID_NOFQDN1 1 +#score MSGID_NOFQDN2 1