Update exim3 to exim-3.36nb2

  - Fix buffer overflows listed at http://www.guninski.com/exim1.html

Update exim to exim-4.33nb1 (from 4.22nb5)
  - Fix buffer overflow listed at http://www.guninski.com/exim1.html
  - Leave nb1 to indicate we have a local change from stock 4.33
  - 1086 lines of changes - http://www.exim.org/ftp/ChangeLogs/ChangeLog-4.33
  - Remove dependancy on exim-user - now looks up EXIM_{USER,GROUP} at runtime

Update exim-exiscan to 4.33_20nb1 (from 4.22-12)
  - Fix buffer overflow listed at http://www.guninski.com/exim1.html
  - Leave nb1 to indicate we have a local change from stock 4.33_20
  - Same exim changes - http://www.exim.org/ftp/ChangeLogs/ChangeLog-4.33
  - Changes (http://duncanthrax.net/exiscan-acl/CHANGELOG) include
    - added option to use multiple spamd servers
    - many mime changes
    - Added Brightmail Antispam support
    - clamd fixes

Update exim-html to 4.30 (from 4.20)
  - Update to latest docs

Delete exim-user
  - No longer required - exim now looks up EXIM_{USER,GROUP} at runtime

10 files changed, 62 insertions, 45 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7529b1c1836..124cecb3335 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.45 2004/05/07 11:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2004/05/07 17:47:32 abs Exp $
 
 DISTNAME=	exim-${EXIM_VERSION}
-PKGREVISION=	5
+PKGREVISION=	1
 CATEGORIES=	mail net
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.exim.org/
 COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
-DEPENDS+=	exim-user>=4.10nb1:../../mail/exim-user
 CONFLICTS+=	exim-exiscan-[0-9]*
 
 .include "Makefile.common"
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 02e0e6c2c85..22372cd627f 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/05/07 17:47:32 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.22
+EXIM_VERSION=	4.33
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -18,6 +18,9 @@ EXTRACT_SUFX=	.tar.bz2
 
 BUILD_DEFS=		EXIM_USER EXIM_GROUP
 
+PKG_GROUPS=	${EXIM_GROUP}
+PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+
 WRKSRC=		${WRKDIR}/exim-${EXIM_VERSION}
 PKG_SYSCONFSUBDIR?=	exim
 EXAMPLESDIR=		${PREFIX}/share/examples/exim
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index db8683108b7..f438304f3f2 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.16 2004/03/05 12:28:45 abs Exp $
+$NetBSD: distinfo,v 1.17 2004/05/07 17:47:32 abs Exp $
 
-SHA1 (exim-4.22.tar.bz2) = aa4d67313cfa262135ec455134ecacab5449c937
-Size (exim-4.22.tar.bz2) = 1249633 bytes
-SHA1 (exiscan-acl-4.22-12.patch) = 77f4c7bbb316531e8dc672cad7095aed2ca12a89
-Size (exiscan-acl-4.22-12.patch) = 289700 bytes
-SHA1 (patch-aa) = a3007fe9d23cf8c5a89ad2bb31cc5c5873ac9b0f
-SHA1 (patch-ab) = afccbaec6ece925f87384535e70da8dd79d8e978
-SHA1 (patch-ac) = 8f3bd109cf961dc72fa11bd738aa69995bebc929
-SHA1 (patch-ad) = ad4cc6c2b2db445504613c04affcd5fc7b012d35
-SHA1 (patch-ae) = f5809185329771a691a75677c352fb54405e525d
-SHA1 (patch-af) = 7b049e94d1113dde732b92094e35a45dd33f12d8
+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 (patch-aa) = 3d6047aacdfff69350e58727f116b467cd4fe18d
+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-aa b/mail/exim/patches/patch-aa
index 1d2758874ad..192c502ee7b 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/07 17:47:32 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2004-03-05 12:23:22.000000000 +0000
+--- Local/Makefile.pkgsrc.orig	Fri May  7 18:22:09 2004
 +++ Local/Makefile.pkgsrc
 @@ -98,7 +98,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -20,15 +20,16 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -132,14 +132,14 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -132,7 +132,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged. These values are compiled into the binary.
+ # discouraged.
  
 -EXIM_USER=
-+EXIM_USER=@EXIM_USER@
++EXIM_USER=ref:@EXIM_USER@
  
- # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
- # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
+ # If you specify EXIM_USER as a name, this is looked up at build time, and the
+ # uid number is built into the binary. However, you can specify that this
+@@ -153,7 +153,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -37,7 +38,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -213,7 +213,7 @@ TRANSPORT_SMTP=yes
+@@ -227,7 +227,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -46,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -222,9 +222,9 @@ TRANSPORT_SMTP=yes
+@@ -236,9 +236,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -59,7 +60,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -289,7 +289,7 @@ LOOKUP_LSEARCH=yes
+@@ -310,7 +310,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -68,7 +69,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  
  
-@@ -310,9 +310,9 @@ EXIM_MONITOR=eximon.bin
+@@ -386,9 +386,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.
  
@@ -81,7 +82,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -390,10 +390,11 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -466,10 +466,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -95,7 +96,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -457,7 +458,7 @@ HEADER_DECODE_TO="ISO-8859-1"
+@@ -533,7 +534,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:
  
@@ -104,7 +105,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 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
-@@ -587,7 +588,8 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -663,7 +664,8 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  #
@@ -114,7 +115,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 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:
-@@ -643,11 +645,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -719,11 +721,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.
  
@@ -131,7 +132,7 @@ $NetBSD: patch-aa,v 1.7 2004/03/05 12:28:45 abs Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -841,7 +843,7 @@ TMPDIR="/tmp"
+@@ -917,7 +919,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:
  
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index ad85bff7a56..57a21b6a8ac 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2003/09/02 10:33:41 abs Exp $
+$NetBSD: patch-ab,v 1.10 2004/05/07 17:47:32 abs Exp $
 
---- OS/Makefile-Default.orig	2003-08-12 16:39:51.000000000 +0100
+--- OS/Makefile-Default.orig	Wed May  5 11:08:35 2004
 +++ 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 7f21c9770c3..126ace02032 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2003/09/02 10:33:42 abs Exp $
+$NetBSD: patch-ac,v 1.7 2004/05/07 17:47:32 abs Exp $
 
---- OS/Makefile-NetBSD-a.out.orig	2003-08-12 16:39:51.000000000 +0100
+--- OS/Makefile-NetBSD-a.out.orig	Wed May  5 11:08:35 2004
 +++ 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 8f55f66d052..2f199f33be8 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2003/09/02 10:33:42 abs Exp $
+$NetBSD: patch-ad,v 1.6 2004/05/07 17:47:32 abs Exp $
 
---- OS/Makefile-NetBSD.orig	2003-08-12 16:39:51.000000000 +0100
+--- OS/Makefile-NetBSD.orig	Wed May  5 11:08:35 2004
 +++ 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 e440e7c7d24..745284a68c9 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2003/09/02 10:33:42 abs Exp $
+$NetBSD: patch-ae,v 1.6 2004/05/07 17:47:32 abs Exp $
 
---- scripts/exim_install.orig	2003-08-12 16:39:53.000000000 +0100
+--- scripts/exim_install.orig	Wed May  5 11:08:35 2004
 +++ scripts/exim_install
 @@ -79,6 +79,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2003/09/02 10:33:42 abs Exp $
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY"       in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
  case "$INST_CONFIGURE_FILE"      in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
-@@ -381,15 +383,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+@@ -389,15 +391,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
    fi
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
index bc6c7c763d4..c1bdb0dae6f 100644
--- a/mail/exim/patches/patch-af
+++ b/mail/exim/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2004/03/14 19:26:37 abs Exp $
+$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $
 
---- src/daemon.c.orig	2003-08-18 13:52:53.000000000 +0100
+--- src/daemon.c.orig	Wed May  5 11:08:35 2004
 +++ src/daemon.c
-@@ -719,6 +719,7 @@ daemon_go(void)
+@@ -756,6 +756,7 @@ daemon_go(void)
  {
  int *listen_sockets = NULL;
  int listen_socket_count = 0;
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.1 2004/03/14 19:26:37 abs Exp $
  ip_address_item *addresses = NULL;
  
  /* If any debugging options are set, turn on the D_pid bit so that all
-@@ -736,9 +737,17 @@ if (background_daemon)
+@@ -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. */
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
new file mode 100644
index 00000000000..736b69fdc81
--- /dev/null
+++ b/mail/exim/patches/patch-ag
@@ -0,0 +1,13 @@
+$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