X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=ba4cc768c4132d19690603e7e5247d893a29541e;hp=9adce57ef9455a43333623549ec856504f031888;hb=a02e1bc95908a74d8681584cdf36e2f82e9f4185;hpb=fc11a4f3177d655fd5d936b7c059b8f485fc8495

diff --git a/common/phrase_spam b/common/phrase_spam
index 9adce57..ba4cc76 100644
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -39,7 +39,7 @@ score	MDO_AUTORESP7	0.1
 meta	MDO_AUTORESP_META1	(MDO_AUTORESP1 + MDO_AUTORESP2 + MDO_AUTORESP3 + MDO_AUTORESP4 + MDO_AUTORESP5 + MDO_AUTORESP6 + MDO_AUTORESP7) > 1
 score	MDO_AUTORESP_META1	2.0
 
-body MURPHY_DIPLOMA	/Diploma/
+body MURPHY_DIPLOMA	/dip[l1]omas?/i
 describe MURPHY_DIPLOMA	No Diploma
 score MURPHY_DIPLOMA	1
 
@@ -164,8 +164,8 @@ score TEDIOUS_WITTER	2
 
 # cjwatson, 2004-03-12
 # blarson 2004-06-09
-header UNI_DIPLOMA	Subject =~ /\b(university|college)\s+(diploma|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		/(?:(?:masters|batchelor|m\s*b\s*a\s*|ph\.?\s*d)\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
 
@@ -449,7 +449,7 @@ score HASSENT		4
 # don 2008-04-19
 header WANTTOCHAT	subject =~ /\b(?:(?:would like|wants|feels?) (?:to chat|like chatting|to keep up with you))\b/i
 describe WANTTOCHAT	I want to chat/keep up with spam
-score WANTTOCHAT	4
+score WANTTOCHAT	5.5
 
 # blarson 2007-09-20
 header ORDERNUM		subject =~ /\b(?:Order|Recipet)\s*.?\d{3,}/i
@@ -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
@@ -872,3 +877,24 @@ score INVITATIONFROM	5
 header RERE		subject =~ /^Re\:\s+Re\:\s+/i
 describe RERE		Re: Re:
 score RERE			1
+
+# don 2008-04-30
+header CLAIMTICKETS	subject =~ /claim.+ticket/i
+describe CLAIMTICKETS	Blah blah claim ticket
+score CLAIMTICKETS	4
+
+# don 2008-05-05
+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
+