svn commit: r630866 - in /spamassassin/rules/trunk/sandbox/jm: 20_storm.cf 20_xmailer.cf

[jm...@apache.org]

Author: jm
Date: Mon Feb 25 06:55:54 2008
New Revision: 630866

URL: http://svn.apache.org/viewvc?rev=630866&view=rev
Log:
remove obsolete anti-Storm rules

Modified:
    spamassassin/rules/trunk/sandbox/jm/20_storm.cf
    spamassassin/rules/trunk/sandbox/jm/20_xmailer.cf

Modified: spamassassin/rules/trunk/sandbox/jm/20_storm.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_storm.cf?rev=630866&r1=630865&r2=630866&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_storm.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_storm.cf Mon Feb 25 06:55:54 2008
@@ -1,21 +1,3 @@
 
-header JM_STORM_ECARD    Subject =~ /^(?:Check out this greeting!|Check out your ecard\.|Did you open your ecard yet\?|Ecard greeting inside!|Have you seen this hilarious greeting\?|Here's your ecard!|I've never laughed so hard!|Now this is funny!|Please open your ecard\.|Someone Just sent you an ecard!|Someone is thinking of you! Open your ecard!|Someone just sent you a greeting!|There is an ecard waiting for you\.|This ecard is hillarious!|This greeting's for you!|This is hilarious!|We have a ecard for you\.|We have a ecard greeting for you\.|We have a ecard surprise!|You have an ecard|You have an online greeting waiting\.|You have just received an ecard\.|You have one new ecard waiting!|You have yet to open your ecard\.|You won't believe this greeting!|You've got a greeting just for you!|Your ecard greeting is available\.|Your ecard horoscope is waiting!|Your ecard joke is waiting!)$/
-
-
-body JM_PPYH        /Physical Property Holdings Inc\./
-body JM_PPYH_2      /\bPHYSICAL PROPERTY (?:HO|Inc|HLDGS|Holdings)/i
-body JM_EXTO        /(?:Exit Only Inc.|EXIT ONLY INC)/
-
-header JM_IDG_FUNDS   Subject =~ /^IDG FUNDS \(WORK AS OUR AGENT\)/
-body JM_KRACKIN   /\bKrackin\b/
-
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-mimeheader __CTYPE_STORM_MP3_1 Content-Type:raw =~ /^audio\/mpeg;\n name=\"[a-z]+\.mp3\"$/s
-mimeheader __CDISP_STORM_MP3_1 Content-Disposition:raw =~ /^inline;\n filename=\"[a-z]+\.mp3\"$/s
-mimeheader __CTYPE_STORM_MP3_2 Content-Type:raw =~ /^audio\/mpeg;\n\tname=\"[a-z]+\.mp3\"$/s
-mimeheader __CDISP_STORM_MP3_2 Content-Disposition:raw =~ /^attachment;\n\tfilename=\"[a-z]+\.mp3\"$/s 
-meta JM_STORM_MP3      ((__CTYPE_STORM_MP3_1&&__CDISP_STORM_MP3_1) || (__CTYPE_STORM_MP3_2&&__CDISP_STORM_MP3_2))
-endif
-
 body JM_HPGI    /\bHemisphere Gold \(HPGI\) \$/
 

Modified: spamassassin/rules/trunk/sandbox/jm/20_xmailer.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_xmailer.cf?rev=630866&r1=630865&r2=630866&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_xmailer.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_xmailer.cf Mon Feb 25 06:55:54 2008
@@ -161,10 +161,6 @@
 header __MO_OL_22B61  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2800\.1158/
 meta XMAILER_MIMEOLE_OL_22B61  (__XM_OL_22B61 && __MO_OL_22B61)
 
-header __XM_OL_C9068  X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2800\.1478/
-header __MO_OL_C9068  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2800\.1807/
-meta XMAILER_MIMEOLE_OL_C9068  (__XM_OL_C9068 && __MO_OL_C9068)
-
 header __XM_OL_EF20B  X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2800\.1478/
 header __MO_OL_EF20B  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2900\.2180/
 meta XMAILER_MIMEOLE_OL_EF20B  (__XM_OL_EF20B && __MO_OL_EF20B)