Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "SpamAssassin Dev" <dev@spamassassin.apache.org>
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r431116 - in /spamassassin/rules/branches/3.1:
 20_head_tests.cf
 20_ratware.cf
Date: Sun, 13 Aug 2006 00:08:28 -0000
To: commits@spamassassin.apache.org
From: felicity@apache.org
Message-Id: <20060813000828.A7D521A981A@eris.apache.org>

Author: felicity
Date: Sat Aug 12 17:08:27 2006
New Revision: 431116

URL: http://svn.apache.org/viewvc?rev=431116&view=rev
Log:
bug 5020: drop __OUTLOOK_DOLLARS_MSGID, replace with the superset rule __OE_MSGID_2

Modified:
    spamassassin/rules/branches/3.1/20_head_tests.cf
    spamassassin/rules/branches/3.1/20_ratware.cf

Modified: spamassassin/rules/branches/3.1/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/20_head_tests.cf?rev=431116&r1=431115&r2=431116&view=diff
==============================================================================
--- spamassassin/rules/branches/3.1/20_head_tests.cf (original)
+++ spamassassin/rules/branches/3.1/20_head_tests.cf Sat Aug 12 17:08:27 2006
@@ -134,7 +134,7 @@
 
 # catches a few spams missed by MSGID_OUTLOOK_INVALID
 header __HAS_OUTLOOK_IN_MAILER	X-Mailer =~ /\bMSCRM\b|Microsoft (?:CDO|Outlook|Office Outlook)\b/
-meta MSGID_DOLLARS		(__OUTLOOK_DOLLARS_MSGID && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
+meta MSGID_DOLLARS		(__OE_MSGID_2 && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
 describe MSGID_DOLLARS		Message-Id has pattern used in spam
 
 # negative lookahead exempts this MUA from circa 1997-2000 

Modified: spamassassin/rules/branches/3.1/20_ratware.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/branches/3.1/20_ratware.cf?rev=431116&r1=431115&r2=431116&view=diff
==============================================================================
--- spamassassin/rules/branches/3.1/20_ratware.cf (original)
+++ spamassassin/rules/branches/3.1/20_ratware.cf Sat Aug 12 17:08:27 2006
@@ -68,9 +68,6 @@
 meta FORGED_MUA_IMS		(__IMS_MUA && !__IMS_MSGID && !__UNUSABLE_MSGID)
 describe FORGED_MUA_IMS		Forged mail pretending to be from IMS
 
-# Outlook mailers often use this Message-ID
-header __OUTLOOK_DOLLARS_MSGID	MESSAGEID =~ /^<[0-9a-f]{12}\$[0-9a-f]{8}\$[0-9a-f]{8}\@\S+>$/m
-
 # Outlook Express 4, 5, and 6
 header __OE_MUA			X-Mailer =~ /\bOutlook Express [456]\./
 header __OE_MSGID_1		MESSAGEID =~ /^<[A-Za-z0-9-]{7}[A-Za-z0-9]{20}\@hotmail\.com>$/m
@@ -81,7 +78,7 @@
 # Outlook versions that usually use "dollar signs"
 header __OUTLOOK_DOLLARS_MUA	X-Mailer =~ /^Microsoft Outlook(?: 8| CWS, Build 9|, Build 10)\./
 header __OUTLOOK_DOLLARS_OTHER	MESSAGEID =~ /^<\!\~\!/m
-meta __FORGED_OUTLOOK_DOLLARS	(__OUTLOOK_DOLLARS_MUA && !__OUTLOOK_DOLLARS_MSGID && !__OUTLOOK_DOLLARS_OTHER && !__IMS_MSGID && !__UNUSABLE_MSGID)
+meta __FORGED_OUTLOOK_DOLLARS	(__OUTLOOK_DOLLARS_MUA && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__IMS_MSGID && !__UNUSABLE_MSGID)
 
 # use new meta rules to implement FORGED_MUA_OUTLOOK rule from 2.60
 meta FORGED_MUA_OUTLOOK		(__FORGED_OE || __FORGED_OUTLOOK_DOLLARS)
@@ -90,7 +87,7 @@
 # Outlook IMO (Internet Mail Only)
 header __OIMO_MUA		X-Mailer =~ /Outlook IMO/
 header __OIMO_MSGID		MESSAGEID =~ /^<[A-P]{26}A[ABC]\.[-\w.]+\@\S+>$/m
-meta FORGED_MUA_OIMO		(__OIMO_MUA && !__OIMO_MSGID && !__OUTLOOK_DOLLARS_MSGID && !__UNUSABLE_MSGID)
+meta FORGED_MUA_OIMO		(__OIMO_MUA && !__OIMO_MSGID && !__OE_MSGID_2 && !__UNUSABLE_MSGID)
 describe FORGED_MUA_OIMO	Forged mail pretending to be from MS Outlook IMO
 
 # QUALCOMM Eudora