Merge!

mail/debian/changelog

+bytemark-vhost-email (20090707183051) stable; urgency=low
+
+  * Fixed exim4 config to defer mail from non-bytemark antispam hosts if
+    bytemark-antispam is present.
+
+ -- Patrick J. Cherry <patrick@bytemark.co.uk>  Tue, 07 Jul 2009 18:30:52 +0100
+
 bytemark-vhost-email (20090707175243) stable; urgency=low
 
   * Updated checkpassword to have a better regex

mail/exim4/bytemark-vhost.d/00-main/21-bytemark-antispam-hostlist

+# ------------------------------------------------------------------------------
+
+# This is the list of machines and ranges Bytemark uses for its
+# anti-spam service.
+
+hostlist    bytemark_antispam_hosts = 89.16.184.144/28 : 89.16.176.76 : 89.16.176.77

mail/exim4/bytemark-vhost.d/10-acl/50-acl-check-rcpt/62-defer-non-bytemark-spam-hosts

+  # Defer mail from non-Bytemark-anti-spam hosts if
+  # VHOST_DIR/domain/VHOST_CONFIG_DIR/bytemark-antispam exists
+  #
+  defer   domains    = +vhost_domains
+          hosts      = !+bytemark_antispam_host
+          condition  = ${if exists{VHOST_DIR/${domain}/VHOST_CONFIG_DIR/bytemark-antispam}}
+