You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/01/15 13:27:54 UTC

svn commit: r496291 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf

Author: jm
Date: Mon Jan 15 04:27:54 2007
New Revision: 496291

URL: http://svn.apache.org/viewvc?view=rev&rev=496291
Log:
ensure OE_MULTIPART_RELATED never gets published; also, promote the Dear Home Owner rules and HELO_FRIEND, all are 1.0 S/O

Modified:
    spamassassin/rules/trunk/sandbox/jm/20_basic.cf

Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?view=diff&rev=496291&r1=496290&r2=496291
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Mon Jan 15 04:27:54 2007
@@ -167,6 +167,13 @@
 
 body JM_ATTACHEMENT    /Stocks Quotes in attachement/
 
+body YOUR_CRD_RATING        /Your cr[d\.]* (?:scor|rat)ing doesn.t matter/
+body DEAR_HOMEOWNER         /\bDear Home Owner\b/
+body APPROVAL_MGR         /\bApproval Manager\b/
+body YOUR_MONTHLY         /\byour monthly payments by\b/
+
+header HELO_FRIEND  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=friend /i
+
 # ---------------------------------------------------------------------------
 # Testing bit
 
@@ -206,19 +213,15 @@
 # are like
 header __MULTIPART_RELATED Content-Type =~ /multipart\/related/
 meta OE_MULTIPART_RELATED (__OE_MUA && __MULTIPART_RELATED)
+tflags OE_MULTIPART_RELATED nopublish
 
 # more trials of bad HELO strings
 header HELO_LH_LD   X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=localhost\.localdomain /i
 header HELO_LH_HOME X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=\S+\.(?:home|lan) /i
-header HELO_FRIEND  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=friend /i
 header HELO_ADMIN  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=admin\S* /i
 
 # aim at the 'Dear Home Owner' spam
 header RCVD_FROM_EXTRA_SPACE    Received =~ /^from  [a-zA-Z]/
-body YOUR_CRD_RATING        /Your cr[d\.]* (?:scor|rat)ing doesn.t matter/
-body DEAR_HOMEOWNER         /\bDear Home Owner\b/
-body APPROVAL_MGR         /\bApproval Manager\b/
-body YOUR_MONTHLY         /\byour monthly payments by\b/
 
 # requested experiment: PBL hitrates on URIs
 # I don't anticipate this will be a useful rule ;)