From 41072c693aa53a0072963119c8cf7919096eaad5 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Thu, 30 May 2013 19:29:33 -0700 Subject: Backported fixes for lp:1074592, lp:1079249 and lp:1079254 from lp:flufl.bounce. Actually, lp:1074592 doesn't affect MM 2, but I included the test case. --- Mailman/Bouncers/SimpleMatch.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Mailman/Bouncers') diff --git a/Mailman/Bouncers/SimpleMatch.py b/Mailman/Bouncers/SimpleMatch.py index 0607ce86..2aa082a2 100644 --- a/Mailman/Bouncers/SimpleMatch.py +++ b/Mailman/Bouncers/SimpleMatch.py @@ -42,7 +42,7 @@ PATTERNS = [ # sz-sb.de, corridor.com, nfg.nl (_c('the following addresses had'), _c('transcript of session follows'), - _c(r'<(?P[^>]*)>|\(expanded from: [^>)]*)>?\)')), + _c(r'^ *(\(expanded from: )?[^\s@]+@[^\s@>]+?)>?\)?\s*$')), # robanal.demon.co.uk (_c('this message was created automatically by mail delivery software'), _c('original message follows'), @@ -184,6 +184,10 @@ PATTERNS = [ _c( 'Your message to (?P[^\s@]+@[^\s@]+) was automatically rejected' )), + # mail.ru + (_c('A message that you sent was rejected'), + _c('This is a copy of your message'), + _c('\s(?P[^\s@]+@[^\s@]+)')), # Next one goes here... ] -- cgit v1.2.3