From: Don Armstrong <don@debian.org>
Date: Fri, 12 Oct 2007 17:36:27 +0000 (+0000)
Subject:  * Add LDOWHITELIST for lists
X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=3f736d226a8a6ff89836579af0761e68bb3c012b

 * Add LDOWHITELIST for lists
 * Make money rules better
 * Even more substitutions for the office spam
 * More urls for the software spam


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

diff --git a/common/money_spam b/common/money_spam
index 0dc8ff7..91dd3d4 100644
--- a/common/money_spam
+++ b/common/money_spam
@@ -257,10 +257,15 @@ 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))/
+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
+describe SUBJMONEY	Some amount of money in subject
+score SUBJMONEY		3
+
+
 body HIDDENCOSTS	/hidden\s*(costs|fees)/i
 describe HIDDENCOSTS	Hidden costs or fees?
 score HIDDENCOSTS	1.5
diff --git a/common/phrase_spam b/common/phrase_spam
index f8cb85d..8906819 100644
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -430,7 +430,7 @@ describe DELAFT		more pdf spam
 score DELAFT		3
 
 # blarson 2007-09-13
-header OFF1CE		subject =~ /\b[O0]ff[1i7l|]ce\s*\W?2[O0Qk]+7\b/i
+header OFF1CE		subject =~ /\b[O0Q]f+[1i7l|]ce\s*\W?2[O0Qk]+7\b/i
 describe OFF1CE		off1ce spam
 score OFF1CE		4
 
diff --git a/common/url_spam b/common/url_spam
index ccaa988..86369e0 100644
--- a/common/url_spam
+++ b/common/url_spam
@@ -179,7 +179,7 @@ tflags          URIBL_SBL       net
 score		URIBL_SBL	3.5
 
 # blarson 2007-09-17
-body MYCHEAP		/\b(?:my)?cheap(?:xp|adobe)?(?:oem|soft)(?:now)?\s*\.\s*com\b/i
+body MYCHEAP		/\b(?:my)?cheap(?:xp|adobe)?(?:oem|soft)(?:now|ware)?\s*\.\s*com\b/i
 describe MYCHEAP	software spam
 score MYCHEAP		4
 
diff --git a/lists/user_prefs b/lists/user_prefs
index 2cc3e91..1ffe214 100644
--- a/lists/user_prefs
+++ b/lists/user_prefs
@@ -47,6 +47,8 @@ use_pyzor		1
 bayes_auto_learn_threshold_nonspam  -4
 bayes_auto_learn_threshold_spam      27
 
+subscriber_file /var/list/whitelist/dist
+
 
 ################################################################
 # SARE-rules (http://www.rulesemporium.com/rules.htm)
@@ -107,9 +109,9 @@ include common/scores
 header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
 score EXINNEN 2.3
 
-header LDO_WHITELIST    eval:check_for_subscriber()
+header LDO_WHITELIST	eval:check_for_subscriber()
 description LDO_WHITELIST Subscribed to the whitelist
-score  LDO_WHITELIST    -5
+score  LDO_WHITELIST	-5
 
 header XXXPRON	    subject =~ /\bxxx\b/i
 score  XXXPRON	    8.0