Update exim to 4.34, Update exim-exiscan to 4.34_22. From Jeremy C. Reed

Exim changes in 4.34

 1. Very minor rewording of debugging text in manualroute to say "list of
    hosts" instead of "hostlist".

 2. If verify=header_syntax was set, and a header line with an unqualified
    address (no domain) and a large number of spaces between the end of the
    name and the colon was received, the reception process suffered a buffer
    overflow, and (when I tested it) crashed. This was caused by some obsolete
    code that should have been removed. The fix is to remove it!

 3. When running in the test harness, delay a bit after writing a bounce
    message to get a bit more predictability in the log output.

 4. Added a call to search_tidyup() just before forking a reception process. In
    theory, someone could use a lookup in the expansion of smtp_accept_max_
    per_host which, without the tidyup, could leave open a database connection.

 5. Added the variables $recipient_data and $sender_data which get set from a
    lookup success in an ACL "recipients" or "senders" condition, or a router
    "senders" option, similar to $domain_data and $local_part_data.

 6. Moved the writing of debug_print from before to after the "senders" test
    for routers.

 7. Change 4.31/66 (moving the time when the Received: is generated) caused
    problems for message scanning, either using a data ACL, or using
    local_scan() because the Received: header was not generated till after they
    were called (in order to set the time as the time of reception completion).
    I have revised the way this works. The header is now generated after the
    body is received, but before the ACL or local_scan() are called. After they
    are run, the timestamp in the header is updated.

Exim-exiscan version 4.34

22  - added SPF support via libspf_alt. Please read the
      docs.

21  - Fix missing fclose() in regex.c. This was causing
      scan directories not to be deleted on NFS spools.

    - Remove "shutdown socket for writing" from clamd malware
      code. It seems to cause problems with the latest
      clamd 0.70 release.

    - Fix allow tables in acl.c to disallow exiscan conditions
      in the RCPT ACL.

    - adapted patch to exim 4.34

4 files changed, 8 insertions, 23 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index a1b7062c9a8..0a0ff4dcd66 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2004/06/04 23:21:34 reed Exp $
+# $NetBSD: Makefile,v 1.50 2004/06/06 22:10:51 abs Exp $
 
 DISTNAME=	exim-${EXIM_VERSION}
-PKGREVISION=	3
 CATEGORIES=	mail net
 
 MAINTAINER=	abs@NetBSD.org
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 1d49ca9561c..9b5a151822f 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/06/04 23:21:34 reed Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/06/06 22:10:51 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.33
+EXIM_VERSION=	4.34
 
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 26ce0c3b9a0..8282508875c 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.18 2004/06/04 00:10:34 reed Exp $
+$NetBSD: distinfo,v 1.19 2004/06/06 22:10:51 abs Exp $
 
-SHA1 (exim-4.33.tar.bz2) = 2e18138793e416a4934e6f2ac8d2cd9262ffae07
-Size (exim-4.33.tar.bz2) = 1327741 bytes
-SHA1 (exiscan-acl-4.33-20.patch.bz2) = e50b2570f5485827f63949eed944f90acdcc11e0
-Size (exiscan-acl-4.33-20.patch.bz2) = 74187 bytes
+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 (patch-ag) = 359c0b16da0ec85dea41472a4c67108b1f06824a
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
deleted file mode 100644
index 736b69fdc81..00000000000
--- a/mail/exim/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/05/07 17:47:32 abs Exp $
-
---- src/verify.c.orig	Fri May  7 18:23:09 2004
-+++ src/verify.c
-@@ -1270,7 +1270,7 @@ for (h = header_list; h != NULL; h = h->
-       uschar *verb = US"is";
-       int len;
- 
--      while (*t != ':') *tt++ = *t++;
-+      while (*t != ':' && tt < &hname[sizeof(hname)-2]) *tt++ = *t++;
-       *tt = 0;
- 
-       /* Arrange not to include any white space at the end in the