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/07 19:18:23 UTC

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

Author: jm
Date: Sun Jan  7 10:18:22 2007
New Revision: 493792

URL: http://svn.apache.org/viewvc?view=rev&rev=493792
Log:
upgrade HELO_OEM, 'attachement' rule

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=493792&r1=493791&r2=493792
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Sun Jan  7 10:18:22 2007
@@ -163,6 +163,10 @@
 
 full DIV_CENTER_A_HREF  /<DIV align=3Dcenter><A href=3D=\n/
 
+header HELO_OEM  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=(?:pc|oem\S*) /i
+
+body JM_ATTACHEMENT    /Stocks Quotes in attachement/
+
 # ---------------------------------------------------------------------------
 # Testing bit
 
@@ -193,8 +197,6 @@
 header CTYPE_001C_A Content-Type =~ /multipart.{0,200}boundary=\"----=_NextPart_000_0001_01C[0-9A-F]{5}\.[0-9A-F]{7}0\"/
 header CTYPE_001C_B Content-Type =~ /multipart.{0,200}boundary=\"----=_NextPart_000_0000_01C[0-9A-F]{5}\.[0-9A-F]{7}0\"/
 
-body JM_ATTACHEMENT    /Stocks Quotes in attachement/
-
 header __MSOE_MID_WRONG_CASE   ALL =~ /\nMessage-Id: /
 header __XM_OUTLOOK_EXPRESS    X-Mailer =~ /^Microsoft Outlook Express \d/
 meta MSOE_MID_WRONG_CASE  (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
@@ -212,10 +214,7 @@
 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_PC  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=pc /i
-header HELO_NODOT  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=[^.]+ /i
 header HELO_ADMIN  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=admin\S* /i
-header HELO_OEM  X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=oem\S* /i
 
 
 # __UNUSABLE_MSGID without message-id expiration (bug 5278)