* 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 0dc8ff76fda6fc6742b02dbf1431addfc35a7ee6..91dd3d4d06f2ed7558ed872d88812c03bd724160 100644 (file)
--- 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 f8cb85dae3a130e0962d7580e4d5a08d38849c19..8906819644e95cdd3e1aab902739fdb2f85e7345 100644 (file)
--- 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 ccaa988212b6c70fd3c488c2ec24506668cd7718..86369e0736da72fe0ad9035c980fa70f415ff876 100644 (file)
--- 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 2cc3e912918b139ffbc283cb664c88bb31d9a3ed..1ffe214d726ac61c4256e689d5a28fefa50defe5 100644 (file)
--- 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