X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmoney_spam;h=7a7b4786be5e32df42ae0eec96e5b515beef64ae;hp=a89019a01e4f6a85f39beb53b976e82a7a405c79;hb=4e0037d7246017c7093f6dd267bc55f4b3a5094e;hpb=ac4891522d27c06ae7f27d0869c2ef8b9886312a

diff --git a/common/money_spam b/common/money_spam
index a89019a..7a7b478 100644
--- a/common/money_spam
+++ b/common/money_spam
@@ -1,3 +1,4 @@
+# -*- mode: spamassassin -*-
 # Spam dealing with selling stuff, stocks, etc. is matched by these
 # rules
 
@@ -161,7 +162,7 @@ score MRG		2
 # blarson 2004-11-08
 body CITIBANK		/\bciti.?bank\b/i
 describe CITIBANK	citibank scam
-score CITIBANK		2
+score CITIBANK		3
 
 # blarson 2005-01-14
 body HOMEOWNER		/home.?owner/i
@@ -261,7 +262,8 @@ body MONEY		/((usd|yen|eur?o?|dollar|\$)\s*\d[\d\.\,]+|\d[\d\.\,]+\s*(usd|yen|eu
 describe MONEY		Some amount of money in body
 score MONEY		0.5
 
-header SUBJMONEY	subject =~ /((usd|yen|eur?o?|dollar|\$)\s*[\d\.\, ]+|[\d\.\, ]+\s*(usd|yen|eur?o?|dollar|\$))/i
+# don 2015-01-11 (tweaking rule slightly; must contain at least one digit to be money
+header SUBJMONEY	subject =~ /((usd|yen|eur?o?|dollar|\$)(?:[\d\.\, ]*\d[\d\.\, ]*)|(?:[\d\.\, ]*\d[\d\.\, ]*)(usd|yen|eur?o?|dollar|\$))/i
 describe SUBJMONEY	Some amount of money in subject
 score SUBJMONEY		3
 
@@ -284,7 +286,7 @@ describe OPORTUNI	Oportunidade de Emprego
 score OPORTUNI		3.5
 
 # blarson 2007-12-10
-header WATCHES		subject =~ /\b(?:watches|time\s*piece|Replica)\b/i
+header WATCHES		subject =~ /\b(?:watches|time\s*piece|aRolex|Cartier|Omega)\b/i
 describe WATCHES	watches
 score WATCHES		2
 
@@ -292,3 +294,59 @@ score WATCHES		2
 body COUP0N		/\bCoup0n\b/i
 describe COUP0N		Coup0n
 score COUP0N		3
+
+header SOFTWARERETAIL	subject =~ /\bretail/i
+describe SOFTWARERETAIL Adobe RETAIL products
+score SOFTWARERETAIL	3.2
+
+# cord 2008-01-23
+full DEPOSIT		/deposit/i
+describe DEPOSIT	Deposit
+score DEPOSIT		2
+
+# blarson 2008-07-17
+body PRINCIPALSONLY	/\bPrincipals\s+Only\b/i
+describe PRINCIPALSONLY	Principals Only
+score PRINCIPALSONLY	3
+
+# don 2008-07-21
+full AMERO		/\bamero\b/i
+describe AMERO		Amero, whatever the hell it is, it's spam
+score AMERO		3
+
+# blarson 2008-07-27
+header GAGO		subject =~ /\bGA\s*G[O0]\b/
+describe GAGO		stock scam
+score GAGO		4
+
+# blarson 2008-07-31
+body NYSE		/\bNYSE\b/
+describe NYSE		stock scam
+score NYSE		2
+
+# cord 2008-11-30
+full LOAN		/\bloan\b/
+describe LOAN		loan spam
+score LOAN		2
+
+# cord 2008-11-30
+full CREDIT		/\[ck]redit\b/
+describe CREDIT		credit spam
+score CREDIT		2
+
+# cord 2008-12-05
+full LEASING		/\bleasing\b/
+describe LEASING	leasing spam
+score LEASING		2
+
+# formorer 2010-01-23
+header LOTTERY		from =~ /\blottery\b/i
+describe LOTTERY	lottery spam
+score LOTTERY		2
+
+# formorer 2016-08-10
+header SEO		subject =~ /\bSEO\b/i
+describe SEO		SEO spam
+score SEO		2
+
+