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 2006/11/15 17:25:55 UTC
svn commit: r475298 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf
Author: jm
Date: Wed Nov 15 08:25:54 2006
New Revision: 475298
URL: http://svn.apache.org/viewvc?view=rev&rev=475298
Log:
move up a few good rules
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=475298&r1=475297&r2=475298
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Wed Nov 15 08:25:54 2006
@@ -128,16 +128,24 @@
# Spammy X-Mailer version strings; no longer seen in ham, due to MS'
# auto-updates, but still appearing in plenty of spam template text
-header XM_OL_29196700 X-Mailer =~ /^Microsoft Outlook Express 5.00.2919.6700$/
-header XM_OL_41332400 X-Mailer =~ /^Microsoft Outlook Express 5.50.4133.2400$/
-header XM_OL_48071700 X-Mailer =~ /^Microsoft Outlook Express 5.50.4807.1700$/
-header XM_OL_28001441 X-Mailer =~ /^Microsoft Outlook Express 6.00.2800.1441$/
-header XM_OL_29196600 X-Mailer =~ /^Microsoft Outlook Express 5.00.2919.6600$/
-header XM_OL_49631700 X-Mailer =~ /^Microsoft Outlook Express 5.50.4963.1700$/
-header XM_OL_48072300 X-Mailer =~ /^Microsoft Outlook Express 5.50.4807.2300$/
-header XM_OL_28004682 X-Mailer =~ /^Microsoft Outlook Express 6.00.2800.4682$/
-header XM_OL_10_0_4115 X-Mailer =~ /^Microsoft Outlook, Build 10.0.4115$/
-header XM_OL_4_72_2106_4 X-Mailer =~ /^Microsoft Outlook Express 4.72.2106.4$/
+header __XM_OL_29196700 X-Mailer =~ /^Microsoft Outlook Express 5.00.2919.6700$/
+header __XM_OL_41332400 X-Mailer =~ /^Microsoft Outlook Express 5.50.4133.2400$/
+header __XM_OL_48071700 X-Mailer =~ /^Microsoft Outlook Express 5.50.4807.1700$/
+header __XM_OL_28001441 X-Mailer =~ /^Microsoft Outlook Express 6.00.2800.1441$/
+header __XM_OL_29196600 X-Mailer =~ /^Microsoft Outlook Express 5.00.2919.6600$/
+header __XM_OL_49631700 X-Mailer =~ /^Microsoft Outlook Express 5.50.4963.1700$/
+header __XM_OL_48072300 X-Mailer =~ /^Microsoft Outlook Express 5.50.4807.2300$/
+header __XM_OL_28004682 X-Mailer =~ /^Microsoft Outlook Express 6.00.2800.4682$/
+header __XM_OL_10_0_4115 X-Mailer =~ /^Microsoft Outlook, Build 10.0.4115$/
+header __XM_OL_4_72_2106_4 X-Mailer =~ /^Microsoft Outlook Express 4.72.2106.4$/
+meta SPAMMY_XMAILER (__XM_OL_29196700||__XM_OL_41332400||__XM_OL_48071700||__XM_OL_28001441||__XM_OL_29196600||__XM_OL_49631700||__XM_OL_48072300||__XM_OL_28004682||__XM_OL_10_0_4115||__XM_OL_4_72_2106_4)
+describe SPAMMY_XMAILER X-Mailer string is common in spam and not in ham
+
+meta SHORT_HELO_AND_INLINE_IMAGE (__HELO_NO_DOMAIN && __ANY_IMAGE_ATTACH)
+describe SHORT_HELO_AND_INLINE_IMAGE Short HELO string, with inline image
+
+meta DYN_RDNS_SHORT_HELO_IMAGE (__HELO_NO_DOMAIN && RDNS_DYNAMIC && __ANY_IMAGE_ATTACH)
+describe DYN_RDNS_SHORT_HELO_IMAGE Short HELO string, dynamic rDNS, inline image
# ---------------------------------------------------------------------------
# Testing bit
@@ -159,9 +167,6 @@
meta HDR_ORDER_FTSDMCXX2 (__HDR_ORDER_FTSDMCXXXX && __BAT_BOUNDARY)
meta HDR_ORDER_FTSDMCXX3 (__HDR_ORDER_FTSDMCXXXX && __MID_START_001C)
# describe HDR_ORDER_FTSDMCXX Header order is similar to spam (FTSDMCXX variant)
-
-meta SHORT_HELO_AND_INLINE_IMAGE (__HELO_NO_DOMAIN && __ANY_IMAGE_ATTACH)
-meta DYN_RDNS_SHORT_HELO_IMAGE (__HELO_NO_DOMAIN && RDNS_DYNAMIC && __ANY_IMAGE_ATTACH)
uri __HAS_ANY_URI /./
body __HAS_ANY_EMAIL /\w@\S+\.\w/