3 files changed, 14 insertions, 14 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 6d2f0a3c3eec..3ae510e975a0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -27,8 +27,8 @@ PATCH_DIST_STRIP=	-p1
 EXTRA_PATCHES+=	${PATCHDIR}/xpatch-exiscan2
 .endif
 
-EXIM_VERSION=	4.41
-EXISCAN_VERSION=25
+EXIM_VERSION=	4.42
+EXISCAN_VERSION=27
 
 .if !defined(EXIMON_ONLY)
 .if defined(PKGNAMESUFFIX)
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index aa16ce6dfaea..acc24a5b31e4 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-25.patch.bz2) = 09abdec4413519d827d099fbce7b1edc
-SIZE (exim/exiscan-acl-4.41-25.patch.bz2) = 82830
+MD5 (exim/exim-4.42.tar.bz2) = eb6a06e70a78a03200b4e4aefbb7b0aa
+SIZE (exim/exim-4.42.tar.bz2) = 1360728
+MD5 (exim/exiscan-acl-4.42-27.patch.bz2) = bc81a47009d24433a282e5c3a668fcb3
+SIZE (exim/exiscan-acl-4.42-27.patch.bz2) = 83039
diff --git a/mail/exim/files/xpatch-exiscan2 b/mail/exim/files/xpatch-exiscan2
index 788cb56be842..925453a892bc 100644
--- a/mail/exim/files/xpatch-exiscan2
+++ b/mail/exim/files/xpatch-exiscan2
@@ -1,7 +1,7 @@
 diff -u scripts/MakeLinks scripts/MakeLinks
 --- scripts/MakeLinks	Sat Jul 17 11:12:00 2004
 +++ scripts/MakeLinks	Sat Jul 17 11:34:48 2004
-@@ -184,7 +184,7 @@
+@@ -185,7 +185,7 @@
  ln -s ../src/osfunctions.h     osfunctions.h
  ln -s ../src/spam.h            spam.h
  ln -s ../src/spf.h             spf.h
@@ -25,7 +25,7 @@ diff -u src/expand.c src/expand.c
 diff -u src/globals.c src/globals.c
 --- src/globals.c	Sat Jul 17 11:12:00 2004
 +++ src/globals.c	Sat Jul 17 11:38:52 2004
-@@ -974,9 +974,12 @@
+@@ -975,9 +975,12 @@
  uschar *spool_directory        = US SPOOL_DIRECTORY
                             "\0<--------------Space to patch spool_directory->";
  #ifdef SRS
@@ -44,7 +44,7 @@ diff -u src/globals.c src/globals.c
 diff -u src/globals.h src/globals.h
 --- src/globals.h	Sat Jul 17 11:12:00 2004
 +++ src/globals.h	Sat Jul 17 11:43:06 2004
-@@ -589,13 +589,16 @@
+@@ -590,13 +590,16 @@
  #endif
  extern uschar *spool_directory;        /* Name of spool directory */
  #ifdef SRS
@@ -88,7 +88,7 @@ diff -u src/readconf.c src/readconf.c
 diff -u src/routers/redirect.c src/routers/redirect.c
 --- src/routers/redirect.c	Sat Jul 17 11:12:00 2004
 +++ src/routers/redirect.c	Sat Jul 17 12:26:47 2004
-@@ -96,11 +96,7 @@
+@@ -98,11 +98,7 @@
        (void *)offsetof(redirect_router_options_block, skip_syntax_errors) },
  #ifdef SRS
    { "srs",                opt_stringptr,
@@ -101,7 +101,7 @@ diff -u src/routers/redirect.c src/routers/redirect.c
  #endif
    { "syntax_errors_text", opt_stringptr,
        (void *)offsetof(redirect_router_options_block, syntax_errors_text) },
-@@ -136,8 +132,6 @@
+@@ -139,8 +135,6 @@
    NULL,        /* owngroups */
  #ifdef SRS
    NULL,        /* srs */
@@ -110,7 +110,7 @@ diff -u src/routers/redirect.c src/routers/redirect.c
  #endif
    022,         /* modemask */
    RDO_REWRITE, /* bit_options */
-@@ -532,39 +526,33 @@
+@@ -535,39 +529,33 @@
    ugid.gid_set = TRUE;
    }
  
@@ -169,7 +169,7 @@ diff -u src/routers/redirect.c src/routers/redirect.c
  /* Call the function that interprets redirection data, either inline or from a
  file. This is a separate function so that the system filter can use it. It will
  run the function in a subprocess if necessary. If qualify_preserve_domain is
-@@ -792,28 +780,23 @@
+@@ -795,28 +783,23 @@
  #ifdef SRS
  /* On successful redirection, check for SRS forwarding and adjust sender */
  
@@ -217,7 +217,7 @@ diff -u src/routers/redirect.c src/routers/redirect.c
 diff -u src/routers/redirect.h src/routers/redirect.h
 --- src/routers/redirect.h	Sat Jul 17 11:12:00 2004
 +++ src/routers/redirect.h	Sat Jul 17 11:55:47 2004
-@@ -32,8 +32,6 @@
+@@ -33,8 +33,6 @@
  
  #ifdef SRS
    uschar *srs;