add changes from blarson

[spamassassin_config.git] / common / auto_response_spam

diff --git a/common/auto_response_spam b/common/auto_response_spam
index 60bc313ef83a2d3e1609943ee1da4283842348b5..d29d4f63adc2b4856f0fe791dcc77fc191886d9c 100644 (file)
--- a/common/auto_response_spam
+++ b/common/auto_response_spam
@@ -15,9 +15,9 @@ header RECEIVEDMAIL   subject =~ /(?:received\s*your\s*mail|(?:respuesta|risposta|
 describe RECEIVEDMAIL  It's great that you've received our mail and automatically responded. We don't care
 score RECEIVEDMAIL     4
 
 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
+body AUTOREBOD         /(?:received\s*your\s*mail|(?:(?:respuesta|risposta|response|message) auto(?:m.tica?|mated)?)|auto(?:m.tica?|mated)?\s*(?:respuesta|risposta|response|message))/i

 describe AUTOREBOD     It's great that you've automatically responded
 describe AUTOREBOD     It's great that you've automatically responded

-score AUTOREBOD                2
+score AUTOREBOD                4

 
 header YOURMESSAGE     subject =~ /your message/i
 describe YOURMESSAGE   It's great that our message did something; we don't care
 
 header YOURMESSAGE     subject =~ /your message/i
 describe YOURMESSAGE   It's great that our message did something; we don't care


@@ -27,7 +27,7 @@ body YOURMESSAGEBOD   /^Your message/i
 describe YOURMESSAGEBOD        It's great that our message did something; we don't care
 score YOURMESSAGEBOD   2.5
 
 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
+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
 
 describe NODELIVERY    We don't care if it could be or has not been delivered
 score NODELIVERY       1.5
 


@@ -71,6 +71,14 @@ header CR_SYSTEM6    subject =~ /^confirm\:/i
 describe CR_SYSTEM6    Subject asks us to confirm something; we don't want to
 score CR_SYSTEM6       2
 
 describe CR_SYSTEM6    Subject asks us to confirm something; we don't want to
 score CR_SYSTEM6       2
 

+header CR_SYSTEM7      x-cr-puzzleid =~ /./i
+describe CR_SYSTEM7    Has a X-cr-puzzleid: header
+score CR_SYSTEM7       5
+
+body CR_SYSTEM8                /reply to this message/i
+describe CR_SYSTEM8    Reply to this message? are you crazy?
+score CR_SYSTEM8       3
+

 body SUPPORTMAIL1      /assigned a ticket/
 describe SUPPORTMAIL1  Message from an automated support/response system
 score SUPPORTMAIL1     2
 body SUPPORTMAIL1      /assigned a ticket/
 describe SUPPORTMAIL1  Message from an automated support/response system
 score SUPPORTMAIL1     2


@@ -87,9 +95,9 @@ body SUPPORTMAIL4     /(reached an unmonitored e-mail address|no response will be gi
 describe SUPPORTMAIL4  Yeay for dumb auto-response bots that don't want a response
 score SUPPORTMAIL4     1.5
 
 describe SUPPORTMAIL4  Yeay for dumb auto-response bots that don't want a response
 score SUPPORTMAIL4     1.5
 

-header SUPPORTMAIL5    from =~ /\bsupport\@/i
-describe SUPPORTMAIL5  Message from an address that looks like support@
-score SUPPORTMAIL5     1.5
+header SUPPORTMAIL5    from =~ /\b(?:support|info)\@/i
+describe SUPPORTMAIL5  Message from an address that looks like support@ or info@
+score SUPPORTMAIL5     2

 
 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
 
 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


@@ -115,9 +123,9 @@ header FAILDELIVERY subject =~ /failed to deliver/i
 describe FAILDELIVERY  Oh noes! You failed to deliver spam!
 score FAILDELIVERY     2
 
 describe FAILDELIVERY  Oh noes! You failed to deliver spam!
 score FAILDELIVERY     2
 

-header NEWADDRESS      subject =~ /new e-?mail address/i
+header NEWADDRESS      subject =~ /(?:new e-?mail address|deaktivierung der mailadresse)/i

 describe NEWADDRESS    We don't care that you have a new e-mail address
 describe NEWADDRESS    We don't care that you have a new e-mail address

-score NEWADDRESS       2
+score NEWADDRESS       4

 
 header VACATIONMAIL1   user-agent =~ /vacation/i
 describe VACATIONMAIL1 Mail from the vacation user agent
 
 header VACATIONMAIL1   user-agent =~ /vacation/i
 describe VACATIONMAIL1 Mail from the vacation user agent