From f214d9e00ae0539817a258325889c2a637bfc6ec Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 Apr 2017 10:36:23 +0100
Subject: [PATCH] Tweak spam block

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

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index e9cb2b9c1..2430e17be 100644
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -498,9 +498,11 @@ 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)Mail\\.class\\.php\$}}
+  deny    condition  = ${if match {$h_X-PHP-Originating-Script:}{^[0-9]+:(Send|Extended)Mail(\\.class)?\\.php\$}}
           message    = This message failed local spam checks.
 
   # Accept the message.
-- 
2.43.2