update to exiscan-acl 25

- Added expansion of av_scanner global variable
  when it starts with a dollar sign. This is useful
  for implementing multiple malware scanners.

- Added support for adding ACL headers at the beginning
  and in the "middle" of the message header block.
  (This is a preliminary solution, see comment in SPF
   section of exiscan-acl-spec).

6 files changed, 13 insertions, 29 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9243e86d7f06..324162c3a0c0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -28,7 +28,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/xpatch-exiscan2
 .endif
 
 EXIM_VERSION=	4.41
-EXISCAN_VERSION=24
+EXISCAN_VERSION=25
 
 .if !defined(EXIMON_ONLY)
 .if defined(PKGNAMESUFFIX)
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 0fe08737374f..aa16ce6dfaea 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
 MD5 (exim/exim-4.41.tar.bz2) = 769c8b03cdefcc98c9707dde965c96f1
 SIZE (exim/exim-4.41.tar.bz2) = 1340206
-MD5 (exim/exiscan-acl-4.41-24.patch.bz2) = 13eaeb6c5def7cdf4c9cea6d82f85bd8
-SIZE (exim/exiscan-acl-4.41-24.patch.bz2) = 80544
+MD5 (exim/exiscan-acl-4.41-25.patch.bz2) = 09abdec4413519d827d099fbce7b1edc
+SIZE (exim/exiscan-acl-4.41-25.patch.bz2) = 82830
diff --git a/mail/exim/files/patch-doc::spec.txt b/mail/exim/files/patch-doc::spec.txt
index 5293ecc1b7b4..0c7d97e9d11e 100644
--- a/mail/exim/files/patch-doc::spec.txt
+++ b/mail/exim/files/patch-doc::spec.txt
@@ -1,6 +1,6 @@
 --- doc/spec.txt.orig	Wed May  5 12:08:37 2004
 +++ doc/spec.txt	Wed May  5 15:10:17 2004
-@@ -14432,6 +14432,19 @@
+@@ -14962,6 +14962,19 @@
        message_prefix = "\1\1\1\1\n"
        message_suffix = "\1\1\1\1\n"
  
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index 2a7b4e56107a..e220d65009c9 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -66,7 +66,7 @@
  
  
  
-@@ -353,6 +356,7 @@
+@@ -373,6 +376,7 @@
  
  # ALT_CONFIG_PREFIX=/some/directory/
  # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
@@ -74,7 +74,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -397,7 +401,7 @@
+@@ -417,7 +421,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -83,7 +83,7 @@
  
  # If you are going to make use of $header_xxx expansions in your configuration
  # file, or if your users are going to use them in filter files, and the normal
-@@ -469,7 +473,7 @@
+@@ -489,7 +493,7 @@
  # SUPPORT_TLS=yes
  
  # Uncomment this setting if you are using OpenSSL
@@ -92,7 +92,7 @@
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -520,7 +524,7 @@
+@@ -540,7 +544,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -101,7 +101,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -533,7 +537,7 @@
+@@ -553,7 +557,7 @@
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -110,7 +110,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -670,12 +674,20 @@
+@@ -690,12 +694,20 @@
  #
  # USE_TCP_WRAPPERS=yes
  # CFLAGS=-O -I/usr/local/include
@@ -133,7 +133,7 @@
  #------------------------------------------------------------------------------
  # The default action of the exim_install script (which is run by "make
  # install") is to install the Exim binary with a unique name such as
-@@ -917,7 +929,7 @@
+@@ -937,7 +939,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
diff --git a/mail/exim/files/patch-src::configure.default b/mail/exim/files/patch-src::configure.default
index de3f6dc6b853..48deebea4806 100644
--- a/mail/exim/files/patch-src::configure.default
+++ b/mail/exim/files/patch-src::configure.default
@@ -28,7 +28,7 @@
    file_transport = address_file
    pipe_transport = address_pipe
  
-@@ -446,6 +449,7 @@
+@@ -454,6 +457,7 @@
    file_transport = address_file
    pipe_transport = address_pipe
    reply_transport = address_reply
@@ -36,7 +36,7 @@
  
  
  # This router matches local user mailboxes. If the router fails, the error
-@@ -491,8 +495,10 @@
+@@ -506,8 +510,10 @@
    delivery_date_add
    envelope_to_add
    return_path_add
diff --git a/mail/exim/files/xpatch-exiscan2 b/mail/exim/files/xpatch-exiscan2
index 0bb651fe385d..788cb56be842 100644
--- a/mail/exim/files/xpatch-exiscan2
+++ b/mail/exim/files/xpatch-exiscan2
@@ -226,22 +226,6 @@ diff -u src/routers/redirect.h src/routers/redirect.h
  #endif
  
    int   modemask;
-diff -u src/spf.h src/spf.h
---- src/spf.h	Sat Jul 17 11:12:00 2004
-+++ src/spf.h	Sat Jul 17 12:13:52 2004
-@@ -10,9 +10,9 @@
- 
- #ifdef SPF
- 
--#include <spf_alt/spf.h>
--#include <spf_alt/spf_dns_resolv.h>
--#include <spf_alt/spf_dns_cache.h>
-+#include <spf2/spf.h>
-+#include <spf2/spf_dns_resolv.h>
-+#include <spf2/spf_dns_cache.h>
- 
- typedef struct spf_result_id {
-   uschar *name;
 diff -u src/srs.c src/srs.c
 --- src/srs.c	Sat Jul 17 11:12:00 2004
 +++ src/srs.c	Sat Jul 17 12:28:31 2004