Mailing List Archive

svn commit: rev 6642 - incubator/spamassassin/trunk/rules
Author: quinlan
Date: Fri Feb 13 13:05:09 2004
New Revision: 6642

Modified:
incubator/spamassassin/trunk/rules/20_head_tests.cf
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
promote T_MSGID_DOLLARS_1 to T_MSGID_DOLLARS
remove other T_MSGID_DOLLARS_* variants (equal or worse accuracy)


Modified: incubator/spamassassin/trunk/rules/20_head_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_head_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_head_tests.cf Fri Feb 13 13:05:09 2004
@@ -128,6 +128,10 @@
header MSGID_OUTLOOK_INVALID eval:check_outlook_message_id()
describe MSGID_OUTLOOK_INVALID Message-Id is fake (in Outlook Express format)

+# catches a few spams missed by MSGID_OUTLOOK_INVALID
+meta MSGID_DOLLARS (__OUTLOOK_DOLLARS_MSGID && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
+describe MSGID_DOLLARS Message-Id has pattern used in spam
+
###########################################################################

header MSGID_FROM_MTA_SHORT eval:mta_added_message_id('short')

Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Fri Feb 13 13:05:09 2004
@@ -129,14 +129,6 @@
header T_USERNAME_IN_SUBJECT3 eval:check_for_to_in_subject('3')
describe T_USERNAME_IN_SUBJECT3 Full To: address listed at front of Subject:

-# catches a few spams missed by MSGID_OUTLOOK_INVALID
-meta T_MSGID_DOLLARS_1 (__OUTLOOK_DOLLARS_MSGID && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
-meta T_MSGID_DOLLARS_2 (__OE_MSGID_2 && !__HAS_OUTLOOK_IN_MAILER && !__UNUSABLE_MSGID)
-header __T_DOLLAR_MUA_1 X-Mailer =~ /^Microsoft (?:CDO|Outlook)/
-header __T_DOLLAR_MUA_2 X-Mailer =~ /^Microsoft (?:CDO|Outlook(?: 8|,Build 10| Express [456]|(?:IMO|CWS), Build 9))/
-meta T_MSGID_DOLLARS_3 (__OUTLOOK_DOLLARS_MSGID && !__T_DOLLAR_MUA_1 && !__UNUSABLE_MSGID)
-meta T_MSGID_DOLLARS_4 (__OUTLOOK_DOLLARS_MSGID && !__T_DOLLAR_MUA_2 && !__UNUSABLE_MSGID)
-
# This is hitting nothing. Maybe it's gone again...
header T_RCVD_IN_PDL rbleval:check_rbl_txt('pdl-notfirsthop', 'dialups.visi.com.')
describe T_RCVD_IN_PDL Received via a relay in PDL, http://www.pan-am.ca/pdl/