You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jg...@apache.org on 2005/12/28 23:08:32 UTC

svn commit: r359651 - in /spamassassin/rules/trunk: core/20_drugs.cf core/20_head_tests.cf sandbox/jgmyers/70_lint.cf

Author: jgmyers
Date: Wed Dec 28 14:08:30 2005
New Revision: 359651

URL: http://svn.apache.org/viewcvs?rev=359651&view=rev
Log:
Promote some rule fixes

Modified:
    spamassassin/rules/trunk/core/20_drugs.cf
    spamassassin/rules/trunk/core/20_head_tests.cf
    spamassassin/rules/trunk/sandbox/jgmyers/70_lint.cf

Modified: spamassassin/rules/trunk/core/20_drugs.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/core/20_drugs.cf?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- spamassassin/rules/trunk/core/20_drugs.cf (original)
+++ spamassassin/rules/trunk/core/20_drugs.cf Wed Dec 28 14:08:30 2005
@@ -64,7 +64,7 @@
 describe DRUG_DOSAGE		Talks about price per dose
 
 # jm: keep this case-sensitive, otherwise it FP's
-body DRUG_ED_CAPS		/\bCIALIS|LEVITRA|VIAGRA/
+body DRUG_ED_CAPS		/\b(?:CIALIS|LEVITRA|VIAGRA)/
 describe DRUG_ED_CAPS		Mentions an E.D. drug
 
 body DRUG_ED_COMBO		/\bviagra .{0,15}(?:phentermine|xenical|tenuate|zyban|propecia)\b/i
@@ -73,7 +73,7 @@
 body DRUG_ED_SILD		/\bsildenafil\b/i
 describe DRUG_ED_SILD		Talks about an E.D. drug using its chemical name
 
-body DRUG_ED_GENERIC		/Generic Viagra/
+body DRUG_ED_GENERIC		/\bGeneric Viagra\b/
 describe DRUG_ED_GENERIC	Mentions Generic Viagra
 
 body DRUG_ED_ONLINE		/\bviagra .{0,25}(?:express|online|overnight)/i

Modified: spamassassin/rules/trunk/core/20_head_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/core/20_head_tests.cf?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- spamassassin/rules/trunk/core/20_head_tests.cf (original)
+++ spamassassin/rules/trunk/core/20_head_tests.cf Wed Dec 28 14:08:30 2005
@@ -340,7 +340,7 @@
 # sometimes used to obscure the words.  \xb1\xa4\xb0\xed is the most common
 # tag and is sometimes very obscured so we look harder.
 #
-header KOREAN_UCE_SUBJECT	Subject =~ /[({[<][. ]*(?:\xbc\xba[. ]*\xc0\xce[. ]*)?(?:\xb1\xa4(?:[. ]*|[\x00-\x7f]{0,3})\xb0\xed|\xc1\xa4[. ]*\xba\xb8|\xc8\xab[. ]*\xba\xb8)[. ]*[)}\]>]/
+header KOREAN_UCE_SUBJECT	Subject =~ /[({[<][. ]*(?-i:\xbc\xba[. ]*\xc0\xce[. ]*)?(?-i:\xb1\xa4(?:[. ]*|[\x00-\x7f]{0,3})\xb0\xed|\xc1\xa4[. ]*\xba\xb8|\xc8\xab[. ]*\xba\xb8)[. ]*[)}\]>]/
 describe KOREAN_UCE_SUBJECT	Subject: contains Korean unsolicited email tag
 
 ###########################################################################

Modified: spamassassin/rules/trunk/sandbox/jgmyers/70_lint.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/sandbox/jgmyers/70_lint.cf?rev=359651&r1=359650&r2=359651&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/jgmyers/70_lint.cf (original)
+++ spamassassin/rules/trunk/sandbox/jgmyers/70_lint.cf Wed Dec 28 14:08:30 2005
@@ -1,19 +1,12 @@
+# Need to copy this in order to get baseline stats
+body T__FRAUD_DBI	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6,}|\$[0-9].{0,8}[mb]illion|\$[0-9.,]{2,10} ?m|\beuros?\b|u[.]?s[.]? [0-9.]+ m)/i
+
 body T__FRAUD_DBI_1	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion|\$[0-9.,]{2,10} ?m|\beuros?\b|u[.]?s[.]? [0-9.]+ m)/i
 body T__FRAUD_DBI_2	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion|\$[0-9.,]{2,10} ?m|\beuros?\b|u[.]?s[.]? [0-9.]{1,6} m)/i
 body T__FRAUD_DBI_3	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion\b|\$[0-9.,]{2,10} ?m|\beuros?\b|u[.]?s[.]? [0-9.]{1,6} m)/i
 body T__FRAUD_DBI_4	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion\b|\$[0-9.,]{2,10} ?m|\beuros?\b|u\.?s\.? [0-9.]{1,6} m)/i
 body T__FRAUD_DBI_5	/(?:\bdollars?\b|\busd(?:ollars)?(?:[0-9]|\b)|\bus\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion\b|\$[0-9.,]{2,10} ?m|\beuros?\b|\bu\.?s\.? [0-9.]{1,6} m)/i
-body T__FRAUD_DBI_6	/\b(?:dollars?\b|usd(?:ollars)?(?:[0-9]|\b)|us\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion\b|\$[0-9.,]{2,10} ?m|euros?\b|u\.?s\.? [0-9.]{1,6} m)/i
+#body T__FRAUD_DBI_6	/\b(?:dollars?\b|usd(?:ollars)?(?:[0-9]|\b)|us\$|\$[0-9,.]{6}|\$[0-9].{0,8}[mb]illion\b|\$[0-9.,]{2,10} ?m|euros?\b|u\.?s\.? [0-9.]{1,6} m)/i
 body T__FRAUD_DBI_7	/(?:\b(?:dollars?\b|usd(?:ollars)?(?:[0-9]|\b)|us\$|euros?\b|u\.?s\.? [0-9.]{1,6} m)|\$(?:[0-9,.]{6}|[0-9].{0,8}[mb]illion\b|[0-9.,]{2,10} ?m))/i
 
-
-rawbody T_INTERRUPTUS           /(?:[a-zA-Z0-9]<[\/ ]{0,2}?(?!br)(?!p)(?!sup)(?!li)(?!b)(?!i)(?!option)(?!a (?:href|name))(?:\b|!--)[^>]{0,64}?>[a-zA-Z0-9].{0,64}?){3}/i
-
-body T_DRUG_ED_CAPS		/\b(?:CIALIS|LEVITRA|VIAGRA)/
-
-body T_DRUG_ED_GENERIC		/\bGeneric Viagra\b/
-
-
-# Work around bug 3787
-header T_KOREAN_UCE_SUBJECT	Subject =~ /[({[<][. ]*(?-i:\xbc\xba[. ]*\xc0\xce[. ]*)?(?-i:\xb1\xa4(?:[. ]*|[\x00-\x7f]{0,3})\xb0\xed|\xc1\xa4[. ]*\xba\xb8|\xc8\xab[. ]*\xba\xb8)[. ]*[)}\]>]/