X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=e413f0704b3815bf57d16e18b7cba4ceb95a97de;hp=7fc5f0a68bfdd68ae0e06c461a6904f247e78593;hb=54e11f99b62979da9964192cf57425e2c6984c54;hpb=4ecae8c9595097f1170233d22aba9cc4cc60ad9a

diff --git a/common/phrase_spam b/common/phrase_spam
index 7fc5f0a..e413f07 100644
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -164,8 +164,8 @@ score TEDIOUS_WITTER	2
 
 # cjwatson, 2004-03-12
 # blarson 2004-06-09
-header UNI_DIPLOMA	Subject =~ /\b(university|college|doctora+te|bache+lor)\s+(dip[l1][o0]ma|cert|degree)/i
-describe UNI_DIPLOMA	Got one, thanks
+header UNI_DIPLOMA	subject =~ /\b(?:university|college|doctora+te|bache+lor|maste+rs?)[\/\s]+(?:(dip[l1][o0]ma|cert|degree)|(?:university|college|doctora+te|bache+lor|maste+rs?))/i
+describe UNI_DIPLOMA	Got a diploma, thanks
 score UNI_DIPLOMA	4
 
 # blarson 2004-04-27
@@ -174,7 +174,7 @@ describe UNI2	Got one, thanks
 score UNI2	4
 
 # don 2007-11-03
-body UNI3		/(?:(?:maste+rs|batche+lor|m\s*b\s*a\s*|ph\.?\s*d|doctora+te)\s*[,.]?\s*){2,}/i
+body UNI3		/(?:(?:maste+rs|batche+lor|m\s*b\s*a\s*|ph\.?\s*d|doctora+te)\s*[,.\/]?\s*){2,}/i
 describe UNI3		multiple types of degrees
 score UNI3		2
 
@@ -344,7 +344,7 @@ 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|A\W?L\W?L\W?U|C\W?W\W?T\W?D|T\W?A\W?D\W?F|D\W?M\W?H\W?N|C\W?A\W?O\W?N|Cwtd|N\W?C\W?S\W?H|F\W?R\W?L\W?E|M\W?A\W?K\W?U|d\W?m\W?h\W?n|T\W?R\W?T\W?M|[Ee]\W?[Tt]\W?[Gg]\W?[Uu]|P\W?E\W?R\W?T|EWIN|SXB\.F|OPLO|DCNM)\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|C\W?W\W?T\W?D|T\W?A\W?D\W?F|D\W?M\W?H\W?N|C\W?A\W?O\W?N|Cwtd|N\W?C\W?S\W?H|F\W?R\W?L\W?E|M\W?A\W?K\W?U|d\W?m\W?h\W?n|T\W?R\W?T\W?M|[Ee]\W?[Tt]\W?[Gg]\W?[Uu]|P\W?E\W?R\W?T|EWIN|SXB\.F|OPLO|DCNM|mpix|MPIX|UCSO)\b/
 describe WBRS		stock spam
 score WBRS		4
 
@@ -714,6 +714,11 @@ full OEMSOFT		/\b[O0]EM\s+s[o0][\W_]?ft_?(?:w_?a_?r_?e)?\b/i
 describe OEMSOFT	OEM software
 score OEMSOFT		2
 
+# tviehmann 2008-07-20
+full XORGBUGREPORTS     /\/usr\/lib\/xorg\/modules/
+describe XORGBUGREPORTS ameliorate score of xorg bug reports matching OEMSOFT
+score XORGBUGREPORTS    -5
+
 # don 2008-02-23
 body MSSOFTWARE		/(?:Microsoft|Windows) (?:Office Enterprise|Vista Ultimate)/i
 describe MSSOFTWARE	Microsoft Office Enterprise/Vista Ultimate
@@ -882,3 +887,18 @@ score CLAIMTICKETS	4
 header WAITINGREPLY	subject =~ /waiting for your? (reply|to repsond|response)/i
 describe WAITINGREPLY	Waiting for your reply
 score WAITINGREPLY	4
+
+# don 2008-05-15
+body CONTACTUS		/contact us by email:/
+score CONTACTUS		3
+describe CONTACTUS	Don't contact us, we'll spam you
+
+# don 2008-06-18
+header FASHION		subject =~ /(?:(?:armani|gucci|chanel|boss|versache|ugg|dsquared)(?:\,\s*|$)){2,}/i
+describe FASHION	Fashion designers in subject
+score FASHION		2
+
+# don 2008-07-30
+header SCOUR		subject =~ /Scour.com invite from/
+describe SCOUR		Scour invite from some spammer
+score SCOUR		3