X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=76cf98eb1eec82f062c78c91c1feb26f313bbc82;hp=ebf6a82198477bb77fd38a9952a5f7a0435b7c88;hb=b9a2e3952237811f1bc90a67081187463b39d549;hpb=aaf90da6a242af52b643f6d2fe733af64c4404ec

diff --git a/common/phrase_spam b/common/phrase_spam
index ebf6a82..76cf98e 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,7 +164,7 @@ score TEDIOUS_WITTER	2
 
 # cjwatson, 2004-03-12
 # blarson 2004-06-09
-header UNI_DIPLOMA	Subject =~ /\b(university|college)\s+(diploma|cert|degree)/i
+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
 score UNI_DIPLOMA	4
 
@@ -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
 
@@ -188,11 +188,6 @@ header MESSAGESUB	subject =~ /^\s*\(?message\s*(subject)?\)?$/i
 describe MESSAGESUB	really descriptive subject
 score MESSAGESUB	3
 
-# don 2007-09-20
-header SENTMESSAGE	subject =~ /(sent you a( personal|) message|would like to chat)/i
-describe SENTMESSAGE	Sent you a message (like duh?)
-score SENTMESSAGE	2
-
 # blarson 2006-03-16 2007-09-18 not working, replaced 2007-12-08
 # body DEARDIGIT		/^(?:well\s+)?(?:Dear|Hey|H[ea]y?ll?.?o|To|Attention|Hi+|Hey+a?|Bonjorno|(?:Yo\s*)+|(?:g[o0]+d\s*)?(?:d?ay|morning|evening?|afternoon|night)|what.?i?s\s+up|wa(?:s|z)+up|greetings?|Salutations|(Mail|News)\s+to|how(?:.?s|\s+is)?\s*(?:(?:it)?(?:\s+is)??\s*going|have\s+you\s+been|are you).?\s*(?:there|to\s+you)?|compliments|Regards|Adieu)\,?\s+(?:Account\s+\#?|\=?3d|)(?:bro|there|sir|Mr\.?)\s*?\d{3,}/i
 body DEARDIGIT		/^\s*(?:Good\s*)?(?:evenin|night|day|hi|hello|greetin|Compliment|Wa[sz]+up|dear|Regard|Mornin|(?:yo\s*)+)[sg]?\s+(?:there\s+)?\d{3,}/i
@@ -447,10 +442,15 @@ describe BIGINTER	job spam
 score BIGINTER		4
 
 # blarson 2007-09-20
-header HASSENT		subject =~ /\b(?:sent you a (?:personal|confidential)?\s*(?:message|note)|would like to chat)\b/i
+header HASSENT		subject =~ /\b(?:sent you a (?:personal|confidential)?\s*(?:message|note))\b/i
 describe HASSENT	sent a message
 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
+
 # blarson 2007-09-20
 header ORDERNUM		subject =~ /\b(?:Order|Recipet)\s*.?\d{3,}/i
 describe ORDERNUM	order number
@@ -540,11 +540,6 @@ body NICEGIRL		/\b(?:nice|young|lonley|unmarried)\s+(?:girl|woman|female)\b/i
 describe NICEGIRL	nice girl
 score NICEGIRL		3
 
-# blarson 2007-10-16
-header FEALCHAT		subject =~ /\bFeel Like Chatting\b/i
-describe FEALCHAT	Feel Like Chatting
-score FEALCHAT		3
-
 # blarson 2007-10-18
 header DFF1CE		subject =~ /UmU6INDSydfF1CE/i
 describe DFF1CE		korean spam
@@ -867,3 +862,18 @@ score PEROFF		3
 header SUMHERE		subject =~ /\b(?:summer|winter|fall|spring) is here\b/i
 describe SUMHERE	summer is here
 score SUMHERE		3
+
+# don 2008-04-24
+header INVITATIONFROM	subject =~ /^\s*Invitation\s*from\s*\w+\s*$/i
+describe INVITATIONFROM	Invitation from Spammer
+score INVITATIONFROM	5
+
+# blarson 2008-04-28
+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