From: Don Armstrong <don@debian.org>
Date: Sat, 13 Oct 2007 20:38:43 +0000 (+0000)
Subject:  * Fix MONEY regex
X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=81279798452890eded2812bd2db08dfb09305ad5

 * Fix MONEY regex
 * Use MONEY and FOURLA to determine stock scams
 * Disable WIFE
 * Decrease score of FOURLA


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@67 0b7a5b0c-1f2c-0410-bd74-c376f8064c91
---

diff --git a/common/money_spam b/common/money_spam
index 91dd3d4..b239036 100644
--- a/common/money_spam
+++ b/common/money_spam
@@ -257,11 +257,11 @@ body DMXC               /Look at D-M-X-C!/
 describe DMXC           stock spam
 score DMXC              4
 
-body MONEY		/(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|$))/i
+body MONEY		/(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|\$))/i
 describe MONEY		Some amount of money
 score MONEY		1.5
 
-header SUBJMONEY	subject =~ /(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|$))/i
+header SUBJMONEY	subject =~ /(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|\$))/i
 describe SUBJMONEY	Some amount of money in subject
 score SUBJMONEY		3
 
diff --git a/common/phrase_spam b/common/phrase_spam
index 8906819..81cb885 100644
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -1,4 +1,5 @@
-# Added some rules from Rule du Jour that I've been testing for a while
+#
+ Added some rules from Rule du Jour that I've been testing for a while
 
 #Monotone (from airmax.cf)
 body     MONOTONE_WORDS_2_15            /^([a-z]{2,20}[\s\.]+){15}/
@@ -354,13 +355,9 @@ score WBRS		4
 
 body FOURLA		/\b([A-Z]\s?){4}\b/
 describe FOURLA		Four letter acronym (stock spam?)
-score FOURLA		1
+score FOURLA		0.1
 
-full WORDMONEY		/^\w+\s*:\s*(?:\$\s*[\d\.]+|[\d\.]+\s*USD)/mi
-describe WORDMONEY	Word Colon Money
-score WORDMONEY		1
-
-meta STOCKLIKE		(FOURLA && WORDMONEY)
+meta STOCKLIKE		(FOURLA && (MONEY || SUBJMONEY))
 describe STOCKLIKE	Four letter acronyms with money; stock scam
 score STOCKLIKE		2
 
diff --git a/common/pron_spam b/common/pron_spam
index aa20e51..2b4bc87 100644
--- a/common/pron_spam
+++ b/common/pron_spam
@@ -187,10 +187,11 @@ body ADULTDVD		/adult\s+dvd/i
 describe ADULTDVD	adult dvd
 score ADULTDVD		3
 
-# blarson 2005-01-07	2005-01-30 trollwife submits bugs
-body WIFE			/(?<!troll)wi[fv]e/i
-describe WIFE		wife
-score WIFE		2
+# don 2007-10-13 false positives; commenting out for now
+# # blarson 2005-01-07	2005-01-30 trollwife submits bugs
+# body WIFE		/(?<!troll)wi[fv]e/i
+# describe WIFE		wife
+# score WIFE		2
 
 # blarson 2005-07-10
 header JACKRABBIT	subject =~ /Jack Rabbit Vibrator/i