From eac3fe1c2ebfb180334bfa7d1465b3b2fa38df69 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Apr 2017 10:30:37 +0100
Subject: [PATCH] Generalise spam block

---
 cookbooks/exim/templates/default/exim4.conf.erb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 4b6071920..ca868683a 100644
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -498,11 +498,9 @@ acl_check_data:
 
 <% end -%>
   # Deny spammy messages with headers of the form:
-  #   X-PHP-Originating-Script: <digits>:SendMail.php
-  #   X-PHP-Originating-Script: <digits>:SendMail.class.php
-  #   X-PHP-Originating-Script: <digits>:ExtendedMail.php
-  #   X-PHP-Originating-Script: <digits>:ExtendedMail.class.php
-  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:(Send|Extended)[Mm]ail(\\.class)?\\.php\$}}
+  #   X-PHP-Originating-Script: <digits>:<name>.php
+  #   X-PHP-Originating-Script: <digits>:<name>.class.php
+  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:[A-Za-z]+(\\.class)?\\.php\$}}
           message    = This message failed local spam checks.
 
   # Accept the message.
-- 
2.43.2