Update exim to 4.42 and exim-exiscan to 4.42_27:

Feature changes in exim since 4.34 (bugfixes not listed):

    Version 4.42
    ------------

     1. The "personal" filter test is brought up-to-date with
	recommendations from the Sieve specification: (a) The list
	of non-personal From:  addresses now includes "listserv",
	"majordomo", and "*-request"; (b) If the message contains
	any header line starting with "List=-" it is treated as
	non-personal.

     2. The Sieve functionality has been extended to support the
	 "copy" and "vacation" extensions, and comparison tests.

     3. There is now an overall timeout for performing a callout
	verification. It defaults to 4 times the callout timeout,
	which applies to individual SMTP commands during the callout.
	The overall timeout applies when there is more than one
	host that can be tried. The timeout is checked before trying
	the next host. This prevents very long delays if there are
	a large number of hosts and all are timing out (e.g. when
	the network connections are timing out). The value of the
	overall timeout can be changed by specifying an additional
	sub-option for "callout", called "maxwait". For example:

	  verify = sender/callout=5s,maxwait=20s

     4. Changes to the "personal" filter test:

	(1) The list of non-personal local parts in From: addresses
	has been extended to include "listserv", "majordomo",
	"*-request", and "owner-*", taken from the Sieve specification
	recommendations.

	(2) If the message contains any header line starting with
	"List-" it is treated as non-personal.

	(3) The test for "circular" in the Subject: header line
	has been removed because it now seems ill-conceived.

     5. The autoreply transport has a new option called never_mail.
	This is an address list. If any run of the transport
	creates a message with a recipient that matches any item
	in the list, that recipient is quietly discarded. If all
	recipients are discarded, no message is created.

    Version 4.40
    ------------

    The documentation is up-to-date for the 4.40 release. What
    follows here is a brief list of the new features that have been
    added since 4.30.

     1. log_incoming_interface affects more log lines.

     2. New ACL modifier "control = submission".

     3. CONFIGURE_OWNER can be set at build time to define an
	 alternative owner for the configuration file, in addition
	to root and exim.

     4. Added expansion variables $body_zerocount, $recipient_data,
        and $sender_data.

     5. The time of last modification of the "new" subdirectory is
	 now used as the "mailbox time last read" when there is a
	quota error for a maildir delivery.

     6. The special item "+ignore_unknown" may now appear in host
        lists.

     7. The special domain-matching patterns @mx_any, @mx_primary,
        and @mx_secondary can now be followed by "/ignore=<ip list>".

     8. New expansion conditions: match_domain, match_address,
	 match_local_part, lt, lti, le, lei, gt, gti, ge, and new
	expansion operators time_interval, eval10, and base62d.

     9. New lookup type called "iplsearch".

    10. New log selectors ident_timeout, tls_certificate_verified,
	queue_time, deliver_time, outgoing_port, return_path_on_delivery.

    11. New global options smtp_active_hostname and tls_require_ciphers.

    12. Exinext has -C and -D options.

    13. "domainlist_cache" forces caching of an apparently variable
	list.

    14. For compatibility with Sendmail, the command line option
	-prval:sval is equivalent to -oMr rval -oMs sval.

    15. New callout options use_sender and use_postmaster for use
	when verifying recipients.

    16. John Jetmore's "exipick" utility has been added to the
	distribution.

    17. The TLS code now supports CRLs.

    18. The dnslookup router and the dnsdb lookup type now support
	the use of SRV records.

    19. The redirect router has a new option called qualify_domain.

    20. exigrep's output now also includes lines that are not
	related to any particular message, but which do match the
	pattern.

    21. New global option write_rejectlog. If it is set false, Exim
	no longer writes anything to the reject log.


Changes in exim-exiscan since 4.34_22

    27  - Changed algorithm of header_pos_middle to add headers
	  before the first header which is NOT Received: or
	  Resent-*:.

    exim 4.42 ---------------------------------------------------

    26  - Fixed header corruption when using header_pos_top.
	  (Thanks to Michael Deutschmann).

	- Fixed headers being added before any Received-SPF:
	  header when using header_pos_middle (Thanks to
	  Michael Deutschmann).

	- DrWeb malware support: Add flag to treat .eml file
	  as plain mail (Thanks to Alex Miller).

    25  - Fixed include location of libspf2 headers.

	- Added support for Kaspersky AV Version 5 (aveserver).

	- 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).

    24  - Changed documentation to reflect libspf_alt->libspf2
	  name change.

	- Upgraded included SRS patch to 0.3 (author Miles Wilton).
	  Also added a small doc chapter for SRS.

	- Brightmail: put notes for users of new 6.x version in the
	  docs (search for "BMI6.x").
	  BMI Version 6 should work OK, an upgraded SDK is now on
	  Brightmail's download site.

    exim 4.41 ----------------------------------------------------

    23  - Added patch to support SRS in the redirect router, done
	  by Miles Wilton. Please check http://srs.mirtol.com/
	  for more information.

	- Fixed the negation operator for SPF support. Thanks
	  to Michael Haardt for sending a patch.

	- Increased buffer size for large SA reports (when using
	  custom SA rulesets).

	- Increased buffer size for large BMI verdicts. Should now
	  handle large number of recipients gracefully.

9 files changed, 31 insertions, 63 deletions

diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile
index 7b4ccf964ab..2c5e9c1c50e 100644
--- a/mail/exim-exiscan/Makefile
+++ b/mail/exim-exiscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/08/13 15:10:48 abs Exp $
+# $NetBSD: Makefile,v 1.14 2004/08/27 10:46:52 abs Exp $
 
 DISTNAME=	exim-${EXIM_VERSION}
 PKGNAME=	exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION}
@@ -10,7 +10,7 @@ COMMENT=	The Exim mail transfer agent, with exiscan-acl patches
 
 CONFLICTS+=	exim-[0-9]*
 
-EXISCAN_VERSION=22
+EXISCAN_VERSION=27
 
 PATCH_SITES=    http://duncanthrax.net/exiscan-acl/
 PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 5141e8ae3bb..6dd9524ddff 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/08/27 06:29:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/08/27 10:46:52 abs Exp $
 
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -10,7 +10,7 @@ USE_PKGINSTALL= yes
 
 MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
 
-EXIM_VERSION=	4.34
+EXIM_VERSION=	4.42
 
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 8282508875c..fbc0d6d513e 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.19 2004/06/06 22:10:51 abs Exp $
+$NetBSD: distinfo,v 1.20 2004/08/27 10:46:52 abs Exp $
 
-SHA1 (exim-4.34.tar.bz2) = ed77428c4dfa4718c1bd4ddb5de2d99d37cec2de
-Size (exim-4.34.tar.bz2) = 1328742 bytes
-SHA1 (exiscan-acl-4.34-22.patch.bz2) = 30134a680d0bb863b8d7241cefbd838582f3d671
-Size (exiscan-acl-4.34-22.patch.bz2) = 76947 bytes
-SHA1 (patch-aa) = 07ce41a5ee3a29c29a05ad556f5fef53a5a2285b
-SHA1 (patch-ab) = 5134367d16c56ad7c2820393e102a9aad73511c8
-SHA1 (patch-ac) = 48160bf4ef4379f4b4ce5dafeb33c85ddcfde65c
-SHA1 (patch-ad) = 6323899062b33ec34610fd93dfc181cdc9d7f369
-SHA1 (patch-ae) = b806857f4fa0c9d4c3603e8ee5f9c4419e643956
-SHA1 (patch-af) = 483fe63aa9c6b524ab61a53a20968e5a7fa3d095
+SHA1 (exim-4.42.tar.bz2) = 54e9ccd295cd30994761acf3ecbb335517507e0d
+Size (exim-4.42.tar.bz2) = 1360728 bytes
+SHA1 (exiscan-acl-4.42-27.patch.bz2) = 7783a4202bbefaed1576d2b6d538c7e582ae76da
+Size (exiscan-acl-4.42-27.patch.bz2) = 83039 bytes
+SHA1 (patch-aa) = 56747e91fc9065bb564bc65f12633d52a6fff385
+SHA1 (patch-ab) = efdbfd11ade8b7b6ab6a5b0511a1322abbc4c3d7
+SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106
+SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a
+SHA1 (patch-ae) = d65205adf8c2ae8a874825e68c163014c13d1628
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 803a23ffb13..812612b25a5 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
+$NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2004-06-03 13:36:01.871153448 -0700
+--- Local/Makefile.pkgsrc.orig	2004-08-27 11:35:33.000000000 +0100
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  
  
-@@ -386,9 +386,9 @@ FIXED_NEVER_USERS=root
+@@ -406,9 +406,9 @@ FIXED_NEVER_USERS=root
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -466,10 +466,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -486,10 +486,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -533,7 +534,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -553,7 +554,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %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:
  
@@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  # 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
-@@ -663,7 +664,8 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -683,7 +684,8 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  #
@@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  #
  # You may well also have to specify a local "include" file and an additional
  # library for TCP wrappers, so you probably need something like this:
-@@ -719,11 +721,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -739,11 +741,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -132,7 +132,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -917,7 +919,7 @@ TMPDIR="/tmp"
+@@ -937,7 +939,7 @@ TMPDIR="/tmp"
  # (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:
  
@@ -141,7 +141,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -953,3 +955,7 @@ TMPDIR="/tmp"
+@@ -973,3 +975,7 @@ TMPDIR="/tmp"
  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
  
  # End of EDITME for Exim 4.
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 57a21b6a8ac..61b816e426f 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2004/05/07 17:47:32 abs Exp $
+$NetBSD: patch-ab,v 1.11 2004/08/27 10:46:52 abs Exp $
 
---- OS/Makefile-Default.orig	Wed May  5 11:08:35 2004
+--- OS/Makefile-Default.orig	2004-08-26 15:09:59.000000000 +0100
 +++ OS/Makefile-Default
 @@ -69,7 +69,7 @@ PERL_COMMAND=/usr/bin/perl
  
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index 126ace02032..6761c969e3b 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2004/05/07 17:47:32 abs Exp $
+$NetBSD: patch-ac,v 1.8 2004/08/27 10:46:52 abs Exp $
 
---- OS/Makefile-NetBSD-a.out.orig	Wed May  5 11:08:35 2004
+--- OS/Makefile-NetBSD-a.out.orig	2004-08-26 15:09:59.000000000 +0100
 +++ OS/Makefile-NetBSD-a.out
 @@ -1,7 +1,7 @@
  # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
index 2f199f33be8..dd260f6d30a 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2004/05/07 17:47:32 abs Exp $
+$NetBSD: patch-ad,v 1.7 2004/08/27 10:46:52 abs Exp $
 
---- OS/Makefile-NetBSD.orig	Wed May  5 11:08:35 2004
+--- OS/Makefile-NetBSD.orig	2004-08-26 15:09:59.000000000 +0100
 +++ OS/Makefile-NetBSD
 @@ -1,7 +1,7 @@
  # Exim: OS-specific make file for NetBSD (ELF object format)
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index 745284a68c9..23b27ce66ad 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2004/05/07 17:47:32 abs Exp $
+$NetBSD: patch-ae,v 1.7 2004/08/27 10:46:52 abs Exp $
 
---- scripts/exim_install.orig	Wed May  5 11:08:35 2004
+--- scripts/exim_install.orig	2004-08-26 15:09:59.000000000 +0100
 +++ scripts/exim_install
 @@ -79,6 +79,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
deleted file mode 100644
index c1bdb0dae6f..00000000000
--- a/mail/exim/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $
-
---- src/daemon.c.orig	Wed May  5 11:08:35 2004
-+++ src/daemon.c
-@@ -756,6 +756,7 @@ daemon_go(void)
- {
- int *listen_sockets = NULL;
- int listen_socket_count = 0;
-+int fd;
- ip_address_item *addresses = NULL;
- 
- /* If any debugging options are set, turn on the D_pid bit so that all
-@@ -1082,9 +1083,17 @@ if (background_daemon)
-   {
-   log_close_all();  /* Just in case anything was logged earlier */
-   search_tidyup();  /* Just in case any were used in reading the config. */
--  close(0);         /* Get rid of stdin/stdout/stderr */
-+  /* Get rid of stdin/stdout/stderr 
-+  close(0);
-   close(1);
-   close(2);
-+  */
-+  /* Instead of closing, dup them to /dev/null */
-+  fd= open( "/dev/null", O_RDWR );
-+  dup2( fd, 0 ); 
-+  dup2( fd, 1 ); 
-+  dup2( fd, 2 );
-+  if( fd > 2 ) close( fd );
-   log_stderr = NULL;  /* So no attempt to copy paniclog output */
- 
-   /* If the parent process of this one has pid == 1, we are re-initializing the