Author: jm
Date: Thu Dec 21 05:38:55 2006
New Revision: 489354
URL: http://svn.apache.org/viewvc?view=rev&rev=489354
Log:
clean out the litter tray. move MSOE_MID_WRONG_CASE2 to MSOE_MID_WRONG_CASE, it kills the FPs nicely; remove dead rules JM_RCVD_FROM_2, MOLE_28001106; add credit note for SB_GIF_AND_NO_URIS for Spambouncer
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=489354&r1=489353&r2=489354
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Thu Dec 21 05:38:55 2006
@@ -171,14 +171,11 @@
meta STOCK_IMG_CTYPE (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__CTYPE_ONETAB_GIF&&__HTML_IMG_ONLY)
describe STOCK_IMG_CTYPE Stock spam image part, with distinctive Content-Type header
+# this is a trick from Spambouncer -- thx Catherine!
uri __HAS_ANY_URI /./
body __HAS_ANY_EMAIL /\w@\S+\.\w/
meta SB_GIF_AND_NO_URIS (__GIF_ATTACH&&!__HAS_ANY_URI&&!__HAS_ANY_EMAIL)
-meta JM_RCVD_FROM_2 (JM_RCVD_FROM && __ENV_AND_HDR_FROM_MATCH)
-
-header MOLE_28001106 X-MimeOLE =~ /^Produced By Microsoft MimeOLE V6\.00\.2800\.1106$/
-
# note: no dots allowed in hostname
header MID_START_001C_2 Message-ID =~ /^<000001c[a-f0-9]{5}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[A-Za-z0-9_]{2,16}$/
header MID_START_001C_3 Message-ID =~ /^<000001c[a-f0-9]{5}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[a-z]{4,8}$/
@@ -194,8 +191,7 @@
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)
-meta MSOE_MID_WRONG_CASE2 (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
+meta MSOE_MID_WRONG_CASE (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
header STOX_REPLY_TYPE Content-Type =~ /text\/plain; .* reply-type=original/
body CURR_PRICE /\bCurrent Price:/
Date: Thu Dec 21 05:38:55 2006
New Revision: 489354
URL: http://svn.apache.org/viewvc?view=rev&rev=489354
Log:
clean out the litter tray. move MSOE_MID_WRONG_CASE2 to MSOE_MID_WRONG_CASE, it kills the FPs nicely; remove dead rules JM_RCVD_FROM_2, MOLE_28001106; add credit note for SB_GIF_AND_NO_URIS for Spambouncer
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=489354&r1=489353&r2=489354
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Thu Dec 21 05:38:55 2006
@@ -171,14 +171,11 @@
meta STOCK_IMG_CTYPE (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__CTYPE_ONETAB_GIF&&__HTML_IMG_ONLY)
describe STOCK_IMG_CTYPE Stock spam image part, with distinctive Content-Type header
+# this is a trick from Spambouncer -- thx Catherine!
uri __HAS_ANY_URI /./
body __HAS_ANY_EMAIL /\w@\S+\.\w/
meta SB_GIF_AND_NO_URIS (__GIF_ATTACH&&!__HAS_ANY_URI&&!__HAS_ANY_EMAIL)
-meta JM_RCVD_FROM_2 (JM_RCVD_FROM && __ENV_AND_HDR_FROM_MATCH)
-
-header MOLE_28001106 X-MimeOLE =~ /^Produced By Microsoft MimeOLE V6\.00\.2800\.1106$/
-
# note: no dots allowed in hostname
header MID_START_001C_2 Message-ID =~ /^<000001c[a-f0-9]{5}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[A-Za-z0-9_]{2,16}$/
header MID_START_001C_3 Message-ID =~ /^<000001c[a-f0-9]{5}\$[a-f0-9]{8}\$[a-f0-9]{8}\@[a-z]{4,8}$/
@@ -194,8 +191,7 @@
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)
-meta MSOE_MID_WRONG_CASE2 (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
+meta MSOE_MID_WRONG_CASE (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
header STOX_REPLY_TYPE Content-Type =~ /text\/plain; .* reply-type=original/
body CURR_PRICE /\bCurrent Price:/