X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fauto_response_spam;h=bb6f9b6c591e6bafcfd81edf083afd2f50a35293;hp=ef3e22a9eff841913028e7ff2a79678dbe62c6dd;hb=e079087f2b8af6350e92f3dd9d66e3895ee11d57;hpb=f1c04fbf0d17f181f8d955b22ce237fe2c387987

diff --git a/common/auto_response_spam b/common/auto_response_spam
index ef3e22a..bb6f9b6 100644
--- a/common/auto_response_spam
+++ b/common/auto_response_spam
@@ -11,10 +11,14 @@ describe QMAILBOUNCE	Stupid qmail bounces; we don't want them
 score QMAILBOUNCE	2
 
 # don 2009-02-05 (the following are all for various stupid auto-repsonse things)
-header RECEIVEDMAIL	subject =~ /(?:received\s*your\s*mail|(?:respuesta|risposta) autom.tica)/i
+header RECEIVEDMAIL	subject =~ /(?:received\s*your\s*mail|(?:respuesta|risposta|response) (?:autom.tica|automatic)|auto(?:matic|m.tica)?\s*(?:respuesta|risposta|response))/i
 describe RECEIVEDMAIL	It's great that you've received our mail and automatically responded. We don't care
 score RECEIVEDMAIL	4
 
+body AUTOREBOD		/(?:received\s*your\s*mail|(?:respuesta|risposta|response) (?:autom.tica|automatic)|auto(?:matic|m.tica)?\s*(?:respuesta|risposta|response))/i
+describe AUTOREBOD	It's great that you've automatically responded
+score AUTOREBOD		2
+
 header YOURMESSAGE	subject =~ /your message/i
 describe YOURMESSAGE	It's great that our message did something; we don't care
 score YOURMESSAGE	2.5
@@ -23,8 +27,8 @@ body  NOTPROCBOUNCE	/was not processed by our system/i
 describe NOTPROCBOUNCE	Bounce by system that was not processed
 score NOTPROCBOUNCE	2
 
-body ACCOUNTNOTEXIST	/account\s+\S+\s+(does\s*not|doesn't)\s*exist/
-describe ACCOUNTNOTEXIST	It's not our problem if an account doesn't eixst
+body ACCOUNTNOTEXIST	/(?:account\s+\S+\s+(does\s*not|doesn't)\s*exist|(?:invalid|not a valid) e-?mail address)/i
+describe ACCOUNTNOTEXIST	It's not our problem if an account doesn't exist
 score ACCOUNTNOTEXIST		2
 
 body CR_SYSTEM1		/sent by a human and not a computer/i
@@ -78,10 +82,14 @@ score FROMAUTOREPLY	4
 
 header FROMABUSE	from =~ /\babbuse\@/i
 describe FROMABUSE	Message from abbuse@somedomain
-score FROMEABUSE	1.5
+score FROMABUSE		1.5
+
+header FROMSPAMCOP	from =~ /spamcop\@/i
+describe FROMSPAMCOP	Message from spamcop@somedomain
+score FROMSPAMCOP	3.5
 
-header SUBJECTSPAM	subject =~ /\*\*\s*spam\s*\*\*/i
-describe SUBJECTPSAM	Subject contains **spam**, so it's probably spam
+header SUBJECTSPAM	subject =~ /(?:\*\*|\[)\s*spam\s*(?:\*\*|\])/i
+describe SUBJECTSPAM	Subject contains **spam** or [spam], so it's probably spam
 score SUBJECTSPAM	3.5
 
 header MESBLOCKED	subject =~ /your message (?:is )?blocked/i