X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fauto_response_spam;h=60bc313ef83a2d3e1609943ee1da4283842348b5;hp=29f71e625b2a83850ab8d876dde64f3cbf932690;hb=cec6b50134cd683662f6493ff137e6146cdda0cc;hpb=87934e9e1fb7fbc4a616a69ecc33f2e49245f30a

diff --git a/common/auto_response_spam b/common/auto_response_spam
index 29f71e6..60bc313 100644
--- a/common/auto_response_spam
+++ b/common/auto_response_spam
@@ -23,6 +23,22 @@ header YOURMESSAGE	subject =~ /your message/i
 describe YOURMESSAGE	It's great that our message did something; we don't care
 score YOURMESSAGE	2.5
 
+body YOURMESSAGEBOD	/^Your message/i
+describe YOURMESSAGEBOD	It's great that our message did something; we don't care
+score YOURMESSAGEBOD	2.5
+
+body NODELIVERY		/(?could not be|has not been) delivered/i
+describe NODELIVERY	We don't care if it could be or has not been delivered
+score NODELIVERY	1.5
+
+body NORESEND		/do not resend your original message/i
+describe NORESEND	If you don't want us to resend our message, why tell us?
+score NORESEND		2
+
+header PROOFPOINT	from =~ /proofpoint/
+describe PROOFPOINT	Automatic mail from proofpoint (some MTA thingie)
+score PROOFPOINT	3.5
+
 body  NOTPROCBOUNCE	/was not processed by our system/i
 describe NOTPROCBOUNCE	Bounce by system that was not processed
 score NOTPROCBOUNCE	2
@@ -75,7 +91,6 @@ header SUPPORTMAIL5	from =~ /\bsupport\@/i
 describe SUPPORTMAIL5	Message from an address that looks like support@
 score SUPPORTMAIL5	1.5
 
-
 header FROMAUTOREPLY 	from =~ /(autoreply|no-?repl(?:y|ies))/i
 describe FROMAUTOREPLY	Message from an autoreplier or something who doesn't seem to want a reply
 score FROMAUTOREPLY	4
@@ -88,8 +103,8 @@ header FROMSPAMCOP	from =~ /spamcop\@/i
 describe FROMSPAMCOP	Message from spamcop@somedomain
 score FROMSPAMCOP	3.5
 
-header SUBJECTSPAM	subject =~ /\*\*\s*spam\s*\*\*/i
-describe SUBJECTSPAM	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
@@ -99,3 +114,19 @@ score	 MESBLOCKED	2
 header FAILDELIVERY	subject =~ /failed to deliver/i
 describe FAILDELIVERY	Oh noes! You failed to deliver spam!
 score FAILDELIVERY	2
+
+header NEWADDRESS	subject =~ /new e-?mail address/i
+describe NEWADDRESS	We don't care that you have a new e-mail address
+score NEWADDRESS	2
+
+header VACATIONMAIL1	user-agent =~ /vacation/i
+describe VACATIONMAIL1	Mail from the vacation user agent
+score VACATIONMAIL1	0.1
+
+header VACATIONMAIL2	X-Vacation =~ /./
+describe VACATIONMAIL2	Has an X-Vacation header
+score VACATIONMAIL2	0.1
+
+meta  VACATIONMAIL	(VACATIONMAIL1 || VACATIONMAIL2)
+describe VACATIONMAIL	Looks like a vacation message
+score VACATIONMAIL	1
\ No newline at end of file