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

[jm...@apache.org]

Author: jm
Date: Tue Dec  5 05:27:20 2006
New Revision: 482641

URL: http://svn.apache.org/viewvc?view=rev&rev=482641
Log:
replace RCVD_FORGED_WROTE with RCVD_CORRUPT_ESMTP test rule; it hits more spam and completely subsumes the existing hits

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=482641&r1=482640&r2=482641
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Tue Dec  5 05:27:20 2006
@@ -77,7 +77,8 @@
 
 endif # Mail::SpamAssassin::Plugin::MIMEHeader
 
-header RCVD_FORGED_WROTE    Received =~ /from [0-9.]+ \(HELO \S+[a-z]+\) by (\S+) with esmtp \(\S+\s\S+\) id \S{6}-\S{6}-\S\S for \S+@\1;/s
+# catches "by jmason.org with esmtp (;4OZ*/H/)>7. 4.2-+*)" gibberish
+header RCVD_FORGED_WROTE    Received =~ / by \S+ with esmtp \([^a-z ]{6,} [^a-z ]{3,}\) id/
 describe RCVD_FORGED_WROTE  Forged 'Received' header found ('wrote:' spam)
 score RCVD_FORGED_WROTE     2.8
 
@@ -161,9 +162,6 @@
 header __MOLE_2962  X-MimeOLE =~ /^Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2900\.2962$/
 header __NAKED_TO   To =~ /^[^\s<>]+\@[^\s<>]+$/
 meta JM_TORA_XM     (__MAILER_OL_6626 && __MOLE_2962 && __NAKED_TO)
-
-# catches "by jmason.org with esmtp (;4OZ*/H/)>7. 4.2-+*)" gibberish
-header RCVD_CORRUPT_ESMTP   Received =~ / by \S+ with esmtp \([^a-z ]{6,} [^a-z ]{3,}\) id/
 
 # ---------------------------------------------------------------------------
 # Testing bit