Update exim to 4.43 from 4.42

Update exim-exiscan to 4.43_28 from 4.42_27
Update exim-html to 4.40 from 4.30

exim-exiscan:

28  - Added F-Secure support, thanks to Johan Thelmen <jth@home.se>.

    - Upgraded SRS support to libsrs_alt 0.5 via Miles
      Wilton's patch.

    - REMOVED exiscan-acl implementation of custom header
      placement in favor of Philip Hazel's native implementation.
      However, a new option option was added for it to
      mimic the behaviour of the old header_pos_middle option.
      Read section 10 of exiscan-acl-spec.txt.

exim:
 1. Fixed a longstanding but relatively impotent bug: a long time ago, before
    PIPELINING, the function smtp_write_command() used to return TRUE or FALSE.
    Now it returns an integer. A number of calls were still expecting a T/F
    return. Fortuitously, in all cases, the tests worked in OK situations,
    which is the norm. However, things would have gone wrong on any write
    failures on the smtp file descriptor. This function is used when sending
    messages over SMTP and also when doing verify callouts.

 2. When Exim is called to do synchronous delivery of a locally submitted
    message (the -odf or -odi options), it no longer closes stderr before doing
    the delivery.

 3. Implemented the mua_wrapper option.

 4. Implemented mx_fail_domains and srv_fail_domains for the dnslookup router.

 5. Implemented the functions header_remove(), header_testname(),
    header_add_at_position(), and receive_remove_recipient(), and exported them
    to local_scan().

 6. If an ACL "warn" statement specified the addition of headers, Exim already
    inserted X-ACL-Warn: at the start if there was no header name. However, it
    was not making this test for the second and subsequent header lines if
    there were newlines in the string. This meant that an invalid header could
    be inserted if Exim was badly configured.

 7. Allow an ACL "warn" statement to add header lines at the start or after all
    the Received: headers, as well as at the end.

 8. Added the rcpt_4xx retry error code.

 9. Added postmaster_mailfrom=xxx to callout verification option.

10. Added mailfrom=xxxx to the callout verification option, for verify=
    header_sender only.

11. ${substr_1_:xxxx} and ${substr__3:xxxx} are now diagnosed as syntax errors
    (they previously behaved as ${substr_1_0:xxxx} and ${substr:_0_3:xxxx}).

12. Inserted some casts to stop certain compilers warning when using pointer
    differences as field lengths or precisions in printf-type calls (mostly
    affecting debugging statements).

13. Added optional readline() support for -be (dynamically loaded).

14. Obscure bug fix: if a message error (e.g. 4xx to MAIL) happened within the
    same clock tick as a message's arrival, so that its received time was the
    same as the "first fail" time on the retry record, and that message
    remained on the queue past the ultimate address timeout, every queue runner
    would try a delivery (because it was past the ultimate address timeout) but
    after another failure, the ultimate address timeout, which should have then
    bounced the address, did not kick in. This was a "< instead of <=" error;
    in most cases the first failure would have been in the next clock tick
    after the received time, and all would be well.

15. The special items beginning with @ in domain lists (e.g. @mx_any) were not
    being recognized when the domain list was tested by the match_domain
    condition in an expansion string.

16. Added the ${str2b64: operator.

17. Exim was always calling setrlimit() to set a large limit for the number of
    processes, without checking whether the existing limit was already
    adequate. (It did check for the limit on file descriptors.) Furthermore,


18. Imported PCRE 5.0.

19. Trivial typo in log message " temporarily refused connection" (the leading
    space).

20. If the log selector return_path_on_delivery was set and an address was
    redirected to /dev/null, the delivery process crashed because it assumed
    that a return path would always be set for a "successful" delivery. In this
    case, the whole delivery is bypassed as an optimization, and therefore no
    return path is set.

21. Internal re-arrangement: the function for sending a challenge and reading
    a response while authentication was assuming a zero-terminated challenge
    string. It's now changed to take a pointer and a length, to allow for
    binary data in such strings.

22. Added the cyrus_sasl authenticator (code supplied by MBM).

23. Exim was not respecting finduser_retries when seeking the login of the
    uid under which it was called; it was always trying 10 times. (The default
    setting of finduser_retries is zero.) Also, it was sleeping after the final
    failure, which is pointless.

24. Implemented tls_on_connect_ports.

25. Implemented acl_smtp_predata.

26. If the domain in control=submission is set empty, Exim assumes that the
    authenticated id is a complete email address when it generates From: or
    Sender: header lines.

27. Added "#define SOCKLEN_T int" to OS/os.h-SCO and OS/os.h-SCO_SV. Also added
    definitions to OS/Makefile-SCO and OS/Makefile-SCO_SV that put basename,
    chown and chgrp in /bin and hostname in /usr/bin.

28. Exim was keeping the "process log" file open after each use, just as it
    does for the main log. This opens the possibility of it remaining open for
    long periods when the USR1 signal hits a daemon. Occasional processlog
    errors were reported, that could have been caused by this. Anyway, it seems
    much more sensible not to leave this file open at all, so that is what now
    happens.

29. The long-running daemon process does not normally write to the log once it
    has entered its main loop, and it closes the log before doing so. This is
    so that log files can straightforwardly be renamed and moved. However,
    there are a couple of unusual error situations where the daemon does write
    log entries, and I had neglected to close the log afterwards.

30. The text of an SMTP error response that was received during a remote
    delivery was being truncated at 512 bytes. This is too short for some of
    the long messages that one sometimes sees. I've increased the limit to
    1024.

31. It is now possible to make retry rules that apply only when a message has a
    specific sender, in particular, an empty sender.

32. Added "control = enforce_sync" and "control = no_enforce_sync". This makes
    it possible to be selective about when SMTP synchronization is enforced.

33. Added "control = caseful_local_part" and "control = "caselower_local_part".

32. Implemented hosts_connection_nolog.

33. Added an ACL for QUIT.

34. Setting "delay_warning=" to disable warnings was not working; it gave a
    syntax error.

35. Added mailbox_size and mailbox_filecount to appendfile.

36. Added control = no_multiline_responses to ACLs.

37. There was a bug in the logic of the code that waits for the clock to tick
    in the case where the clock went backwards by a substantial amount such
    that the microsecond fraction of "now" was more than the microsecond
    fraction of "then" (but the whole seconds number was less).

38. Added support for the libradius Radius client library this is found on
    FreeBSD (previously only the radiusclient library was supported).

7 files changed, 30 insertions, 27 deletions

diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile
index 2c5e9c1c50e..b16edc968d4 100644
--- a/mail/exim-exiscan/Makefile
+++ b/mail/exim-exiscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/08/27 10:46:52 abs Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/07 17:29:16 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=27
+EXISCAN_VERSION=28
 
 PATCH_SITES=    http://duncanthrax.net/exiscan-acl/
 PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 136f31fc43e..70be59922e5 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2004/05/07 18:12:58 abs Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/07 17:29:16 abs Exp $
 
-DISTNAME=	exim-html-4.30
+DISTNAME=	exim-html-4.40
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff --git a/mail/exim-html/PLIST b/mail/exim-html/PLIST
index f42e7d608a3..cfec61b78f0 100644
--- a/mail/exim-html/PLIST
+++ b/mail/exim-html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/05/07 18:08:29 abs Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/10/07 17:29:16 abs Exp $
 share/doc/html/exim/C002.txt
 share/doc/html/exim/C006.txt
 share/doc/html/exim/C022.txt
@@ -9,8 +9,8 @@ share/doc/html/exim/C044.txt
 share/doc/html/exim/C045.txt
 share/doc/html/exim/C046.txt
 share/doc/html/exim/C047.txt
-share/doc/html/exim/C048.txt
 share/doc/html/exim/C049.txt
+share/doc/html/exim/C050.txt
 share/doc/html/exim/F001.txt
 share/doc/html/exim/F002.txt
 share/doc/html/exim/F003.txt
@@ -71,6 +71,8 @@ share/doc/html/exim/FAQ_7.html
 share/doc/html/exim/FAQ_8.html
 share/doc/html/exim/FAQ_9.html
 share/doc/html/exim/L001.txt
+share/doc/html/exim/S001.txt
+share/doc/html/exim/S002.txt
 share/doc/html/exim/filter_0.html
 share/doc/html/exim/filter_1.html
 share/doc/html/exim/filter_2.html
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index d9f9d64c137..72e3baef440 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/05/07 17:47:32 abs Exp $
+$NetBSD: distinfo,v 1.7 2004/10/07 17:29:16 abs Exp $
 
-SHA1 (exim-html-4.30.tar.bz2) = 5d40155b92c07f8f077d3db23980a84ce9415145
-Size (exim-html-4.30.tar.bz2) = 518372 bytes
+SHA1 (exim-html-4.40.tar.bz2) = 36409d64402c80abf3e7d8086e72aee56c0ccaf3
+Size (exim-html-4.40.tar.bz2) = 542983 bytes
 SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 6dd9524ddff..a2acbda25a9 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/08/27 10:46:52 abs Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/10/07 17:29:16 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.42
+EXIM_VERSION=	4.43
 
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index f0ca713aa0d..073d80adff6 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2004/09/25 07:45:51 grant Exp $
+$NetBSD: distinfo,v 1.22 2004/10/07 17:29:16 abs Exp $
 
-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 (exim-4.43.tar.bz2) = 675f2c5453c93e01dbbb61d15a264a23f9e61b8f
+Size (exim-4.43.tar.bz2) = 1388183 bytes
+SHA1 (exiscan-acl-4.43-28.patch.bz2) = b2e26ae5743407746c3c0405cf7653840087ed67
+Size (exiscan-acl-4.43-28.patch.bz2) = 83405 bytes
+SHA1 (patch-aa) = ab149803121eb1ce7dc6875d8626a44454c2ae0a
 SHA1 (patch-ab) = efdbfd11ade8b7b6ab6a5b0511a1322abbc4c3d7
 SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106
 SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 812612b25a5..651a94ac599 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
+$NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2004-08-27 11:35:33.000000000 +0100
+--- Local/Makefile.pkgsrc.orig	2004-10-07 11:09:11.000000000 +0100
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -69,20 +69,21 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
  
  
  
-@@ -406,9 +406,9 @@ FIXED_NEVER_USERS=root
+@@ -406,10 +406,10 @@ 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.
  
 -# AUTH_CRAM_MD5=yes
++AUTH_CRAM_MD5=yes
+ # AUTH_CYRUS_SASL=yes
 -# AUTH_PLAINTEXT=yes
 -# AUTH_SPA=yes
-+AUTH_CRAM_MD5=yes
 +AUTH_PLAINTEXT=yes
 +AUTH_SPA=yes
  
  
  #------------------------------------------------------------------------------
-@@ -486,10 +486,11 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -495,10 +495,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 +97,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -553,7 +554,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -562,7 +563,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 +106,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs 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
-@@ -683,7 +684,8 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -707,7 +708,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 +116,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs 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:
-@@ -739,11 +741,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -782,11 +784,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 +133,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -937,7 +939,7 @@ TMPDIR="/tmp"
+@@ -980,7 +982,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 +142,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -973,3 +975,7 @@ TMPDIR="/tmp"
+@@ -1016,3 +1018,7 @@ TMPDIR="/tmp"
  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
  
  # End of EDITME for Exim 4.