X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=f3e9e151ab6a9d3f599fc2aaaf87e6d5729b450a;hp=f8cb85dae3a130e0962d7580e4d5a08d38849c19;hb=bce21112ab50be6527efdb21d85d94ad64d526a7;hpb=8fc6d391525e45126a3c1878f1edbe4fb4615109

diff --git a/common/phrase_spam b/common/phrase_spam
index f8cb85d..f3e9e15 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}/
@@ -348,19 +349,15 @@ describe ACRO8PR0	sales spam
 score ACRO8PR0	 	4	
 
 # blarson 2007-10-05
-body WBRS		/\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H|S\W?R\W?E\W?A|A\W?C\W?G\W?U|S\W?C\W?Y\W?F|C\W?H\W?V\W?C|D\W?M\W?X\W?C|F\W?R\W?L\W?E|M\W?A\W?K\W?U|C\W?W\W?T\W?E|F\W?R\W?L\W?E|M\W?X\W?X\W?R|P\W?R\W?T\W?H)\b/
+body WBRS		/\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H|S\W?R\W?E\W?A|A\W?C\W?G\W?U|S\W?C\W?Y\W?F|C\W?H\W?V\W?C|D\W?M\W?X\W?C|F\W?R\W?L\W?E|M\W?A\W?K\W?U|C\W?W\W?T\W?E|F\W?R\W?L\W?E|M\W?X\W?X\W?R|P\W?R\W?T\W?H|A\W?L\W?L\W?U)\b/
 describe WBRS		stock spam
 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
 
@@ -430,7 +427,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