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 2008/05/20 00:34:07 UTC
svn commit: r658009 - in /spamassassin: rules/trunk/sandbox/jm/20_bug5496.cf
trunk/rules/20_ratware.cf
Author: jm
Date: Mon May 19 15:34:07 2008
New Revision: 658009
URL: http://svn.apache.org/viewvc?rev=658009&view=rev
Log:
bug 5496, bug 5910: clear some FORGED_MUA_OUTLOOK false positives, particularly on the new-format Message-ID generated by the Outlook Express version used in Windows XP service pack 3
Removed:
spamassassin/rules/trunk/sandbox/jm/20_bug5496.cf
Modified:
spamassassin/trunk/rules/20_ratware.cf
Modified: spamassassin/trunk/rules/20_ratware.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_ratware.cf?rev=658009&r1=658008&r2=658009&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_ratware.cf (original)
+++ spamassassin/trunk/rules/20_ratware.cf Mon May 19 15:34:07 2008
@@ -83,9 +83,14 @@
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 && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__VISTA_MSGID && !__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)
+
+# bug 5496: avoid some FPs
+header __FMO_EXCL_O3416 X-Mailer =~ /^Microsoft Outlook, Build 10.0.3416$/
+header __FMO_EXCL_OE3790 X-Mailer =~ /^Microsoft Outlook Express 6.00.3790.3959$/
+# bug 5910: __VISTA_MSGID also now used by Outlook Express from XP SP3
+#
+meta FORGED_MUA_OUTLOOK ((__FORGED_OE || __FORGED_OUTLOOK_DOLLARS) && !__FMO_EXCL_O3416 && !__FMO_EXCL_OE3790 && !__VISTA_MSGID)
describe FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook
# Outlook IMO (Internet Mail Only)