diff --git a/ChangeLog b/ChangeLog index f3d2839f..434b12d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better - filter apache-noscript now includes php cgi scripts. Thanks dani. Closes gh-503 - added ufw action. Thanks Guilhem Lettron. lp-#701522 + - exim-spam include spamassassin log entry. Thanks Ivo Truxa. Closes gh-533 - New Features: diff --git a/THANKS b/THANKS index 1919263e..04aa1f20 100644 --- a/THANKS +++ b/THANKS @@ -39,6 +39,7 @@ Guilhem Lettron Guillaume Delvit Hanno 'Rince' Wagner Iain Lea +Ivo Truxa Jacques Lav!gnotte Ioan Indreias Jonathan Kamens diff --git a/config/filter.d/exim-spam.conf b/config/filter.d/exim-spam.conf index 15737b2f..8303e7c1 100644 --- a/config/filter.d/exim-spam.conf +++ b/config/filter.d/exim-spam.conf @@ -12,6 +12,7 @@ before = exim-common.conf failregex = ^%(pid)s \S+ F=(<>|\S+@\S+) %(host_info)srejected by local_scan\(\): .{0,256}$ ^%(pid)s %(host_info)sF=(<>|[^@]+@\S+) rejected RCPT [^@]+@\S+: .*dnsbl.*\s*$ ^%(pid)s \S+ %(host_info)sF=(<>|[^@]+@\S+) rejected after DATA: This message contains a virus \(\S+\)\.\s*$ + ^%(pid)s \S+ SA: Action: silently tossed message: score=\d+\.\d+ required=\d+\.\d+ trigger=\d+\.\d+ \(scanned in \d+/\d+ secs \| Message-Id: \S+\)\. From \S+ \(host=(\S+ )?\[\]\) for \S+ ignoreregex =