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
author: abs <abs> 2004-05-07 17:47:32 +0000
committer: abs <abs> 2004-05-07 17:47:32 +0000
commit: 50c73bfed4e6962f73653530c24d0eaf5dbaa436 (patch)
tree: e866d595608d988f154504f5c5c321aab3eeaa65
parent: ab722b78562f1c17ab06da7b41c17c5727d19b5b (diff)
download: pkgsrc-50c73bfed4e6962f73653530c24d0eaf5dbaa436.tar.gz
27 files changed, 293 insertions, 267 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 2465368c242..2235bbbd365 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5860 2004/05/07 16:38:53 hrs Exp $
+$NetBSD: CHANGES,v 1.5861 2004/05/07 17:48:43 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2399,3 +2399,9 @@ Changes to the packages collection and infrastructure in 2004:
 	Added p5-Mail-Mbox-MessageParser-0.14 [wiz 2004-05-07]
 	Updated grepmail to 5.22nb1 [wiz 2004-05-07]
 	Updated dsssl-docbook-modular to 1.78 [hrs 2004-05-07]
+	Updated exim3 to 3.36nb2 [abs 2004-05-07]
+	Updated exim to 4.33nb1 [abs 2004-05-07]
+	Updated exim-exiscan to 4.33_20nb1 [abs 2004-05-07]
+	Updated exim-html to 4.30 [abs 2004-05-07]
+	Deleted exim-user [abs 2004-05-07]
+
diff --git a/doc/TODO b/doc/TODO
index a4cea4f91cd..83cae9ce454 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1720 2004/05/07 13:51:54 adam Exp $
+$NetBSD: TODO,v 1.1721 2004/05/07 17:48:43 abs Exp $
 
 Suggested new packages
 ======================
@@ -137,6 +137,10 @@ Suggested new packages
 	Vnc2swf captures the live motion of a screen with VNC protocol
 	and generates a Macromedia Flash(TM) movie (.swf).
 
+	Filelight
+	http://www.methylblue.com/filelight/
+	Graphical representation of disk space usage
+
 Suggested package updates
 =========================
 
diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile
index 5241362118e..954327aa04d 100644
--- a/mail/exim-exiscan/Makefile
+++ b/mail/exim-exiscan/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/07 17:47:32 abs Exp $
 
 DISTNAME=	exim-${EXIM_VERSION}
-PKGREVISION=	3
-PKGNAME=	exim-exiscan-${EXIM_VERSION}-${EXISCAN_VERSION}
+PKGREVISION=	1
+PKGNAME=	exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION}
 CATEGORIES=	mail net
 
 MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://duncanthrax.net/exiscan-acl/
 COMMENT=	The Exim mail transfer agent, with exiscan-acl patches
 
-DEPENDS+=	exim-user>=1.0:../../mail/exim-user
 CONFLICTS+=	exim-[0-9]*
 
-EXISCAN_VERSION=12
+EXISCAN_VERSION=20
 
 PATCH_SITES=    http://duncanthrax.net/exiscan-acl/
-PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch
+PATCHFILES=     exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2
 
 DISTINFO_FILE=	${.CURDIR}/../../mail/exim/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/exim/patches
diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index e8a1d43ebe2..7000cd3af2e 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/05/07 11:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/07 17:47:32 abs Exp $
 
-DISTNAME=	exim-html-4.20
+DISTNAME=	exim-html-4.30
 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/distinfo b/mail/exim-html/distinfo
index 5685ed9b243..d9f9d64c137 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/09/02 12:16:19 abs Exp $
+$NetBSD: distinfo,v 1.6 2004/05/07 17:47:32 abs Exp $
 
-SHA1 (exim-html-4.20.tar.bz2) = 60c8b2576bb3e6cfdc8d3d7a3c2ff1004815ee71
-Size (exim-html-4.20.tar.bz2) = 475771 bytes
+SHA1 (exim-html-4.30.tar.bz2) = 5d40155b92c07f8f077d3db23980a84ce9415145
+Size (exim-html-4.30.tar.bz2) = 518372 bytes
 SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52
diff --git a/mail/exim-user/DESCR b/mail/exim-user/DESCR
deleted file mode 100644
index e38a7cb0b83..00000000000
--- a/mail/exim-user/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a pre-req package which ensures the existance of the mail user
-which is required for exim to build (and therefore must exist pre-build for
-the exim package itself).
diff --git a/mail/exim-user/Makefile b/mail/exim-user/Makefile
deleted file mode 100644
index 9b5d14be1bc..00000000000
--- a/mail/exim-user/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/08/02 17:00:07 jmmv Exp $
-
-DISTNAME=	exim-user-4.10
-PKGREVISION=	1
-CATEGORIES=	mail net
-MASTER_SITES=   # empty
-DISTFILES=      # empty
-
-MAINTAINER=	jmc@NetBSD.org
-HOMEPAGE=	# empty
-COMMENT=	Pre-req package for exim to setup user needed for build/use
-
-USE_PKGINSTALL=	yes
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=	EXIM_GROUP EXIM_USER
-PKG_GROUPS=	${EXIM_GROUP}
-PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}:8:Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim-user/PLIST b/mail/exim-user/PLIST
deleted file mode 100644
index f8327cae805..00000000000
--- a/mail/exim-user/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/23 16:10:57 jmc Exp $
-@comment this plist intentionally left empty
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
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 9d39901e2e5..e999f89f529 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/05/06 22:34:27 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/07 17:47:32 abs Exp $
 
 DISTNAME=	exim-3.36
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
 		http://public.planetmirror.com.au/pub/exim/exim3/
diff --git a/mail/exim3/distinfo b/mail/exim3/distinfo
index f4151514c24..278419516f3 100644
--- a/mail/exim3/distinfo
+++ b/mail/exim3/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.2 2004/01/15 02:05:10 grant Exp $
+$NetBSD: distinfo,v 1.3 2004/05/07 17:47:32 abs Exp $
 
 SHA1 (exim-3.36.tar.bz2) = 2a06a2858ebf8cdedf2e41fa3f258b5e468e270d
 Size (exim-3.36.tar.bz2) = 982104 bytes
-SHA1 (patch-ab) = 3650487acdc2b0e67ab0dee08a6715e90b2a4205
-SHA1 (patch-ac) = 39122ca045ca7bb61500acae2abf5683c8ec4530
-SHA1 (patch-ae) = 24009dd4807f0215e79cc0a86582297bf310c913
-SHA1 (patch-af) = ac3bea9fe84bc760fec21858bc818c1b01dd34a4
-SHA1 (patch-ag) = f56725acec715468889bf1049e0fd4208101be25
+SHA1 (patch-aa) = f137e07e597a72fede1ee8d2e78f2f284e0061c6
+SHA1 (patch-ab) = 6664ab8fa62ad56e933d87319abb4505abcf7a5b
+SHA1 (patch-ac) = 3a74d412a1c6c00cb23ae63ed018d02002fa4595
+SHA1 (patch-ad) = d4962927418489f77a8e0234f7f95628ed506026
+SHA1 (patch-ae) = 0a01f3cfd2bfe59577edcb09b0f2f355185e28f0
+SHA1 (patch-af) = bb171d4048ab3f802243dfec1aade86c0a7e0d21
+SHA1 (patch-ag) = 9248e3fde82fed7a464c28f3335d4c419c038a03
diff --git a/mail/exim3/patches/patch-aa b/mail/exim3/patches/patch-aa
new file mode 100644
index 00000000000..b6b977ac965
--- /dev/null
+++ b/mail/exim3/patches/patch-aa
@@ -0,0 +1,104 @@
+$NetBSD: patch-aa,v 1.1 2004/05/07 17:47:32 abs Exp $
+
+--- Local/Makefile.netbsd.orig	Fri May  7 18:36:39 2004
++++ Local/Makefile.netbsd
+@@ -78,7 +78,7 @@
+ # CHGRP_COMMAND=/usr/bin/chgrp
+ # MV_COMMAND=/bin/mv
+ # RM_COMMAND=/bin/rm
+-# PERL_COMMAND=/usr/bin/perl
++PERL_COMMAND=@PREFIX@/bin/perl
+ 
+ 
+ # The following macro can be used to change the command for building a library
+@@ -92,8 +92,8 @@
+ # appropriate code is included in the binary. You then need to set up the
+ # runtime configuration to make use of the mechanism(s) selected.
+ 
+-# AUTH_CRAM_MD5=yes
+-# AUTH_PLAINTEXT=yes
++AUTH_CRAM_MD5=yes
++AUTH_PLAINTEXT=yes
+ 
+ 
+ # The binary directory: This variable defines where the exim binary will be
+@@ -103,7 +103,7 @@
+ # installed in this directory. There is no default for this variable built into
+ # the source files; it must be set in one of the local configuration files.
+ 
+-BIN_DIRECTORY=/usr/exim/bin
++BIN_DIRECTORY=@PREFIX@/sbin
+ 
+ 
+ # The default distribution of Exim contains only the plain text form of the
+@@ -121,14 +121,14 @@ BIN_DIRECTORY=/usr/exim/bin
+ # files. Both the name of the command and the suffix that it adds to files
+ # need to be defined here. See also the EXICYCLOG_MAX configuration.
+ 
+-COMPRESS_COMMAND=/opt/gnu/bin/gzip
++COMPRESS_COMMAND=@GZIP_CMD@
+ COMPRESS_SUFFIX=gz
+ 
+ 
+ # If the exigrep utility is fed compressed log files, it tries to uncompress
+ # them using this command.
+ 
+-ZCAT_COMMAND=/opt/gnu/bin/zcat
++ZCAT_COMMAND=@GZCAT@
+ 
+ 
+ # The runtime configuration file: This variable defines where Exim's runtime
+@@ -137,7 +137,7 @@ ZCAT_COMMAND=/opt/gnu/bin/zcat
+ # location of all other runtime files and directories can be changed in the
+ # runtime configuration file.
+ 
+-CONFIGURE_FILE=/usr/exim/configure
++CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
+ 
+ 
+ # In some installations there may be multiple machines sharing file systems,
+@@ -243,7 +243,7 @@ EXICYCLOG_MAX=10
+ # are defaulted in the OS/Makefile-Default file, and can be overridden
+ # in local OS-specific make files.
+ 
+-EXIM_MONITOR=eximon.bin
++# EXIM_MONITOR=eximon.bin
+ 
+ 
+ # Compiling in support for embedded Perl: If you want to be able to
+@@ -286,7 +286,7 @@ EXIM_MONITOR=eximon.bin
+ # "panic", or "reject" to form the final file name. For example, some
+ # installations may want something like this:
+ 
+-# LOG_FILE_PATH=/var/log/exim_%slog
++LOG_FILE_PATH=/var/log/exim/%slog
+ 
+ # 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
+@@ -411,7 +411,7 @@ LOOKUP_LSEARCH=yes
+ # the file name, allowing sites that run two separate daemons to distinguish
+ # them. Some installations may want something like this
+ 
+-# PID_FILE_PATH=/var/lock/exim%s.pid
++PID_FILE_PATH=/var/run/exim%s.pid
+ 
+ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
+ # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
+@@ -460,7 +460,7 @@ ROUTER_QUERYPROGRAM=yes
+ # uid and gid.
+ 
+ # Many installations will want something like this:
+-# SPOOL_DIRECTORY=/var/spool/exim
++SPOOL_DIRECTORY=/var/spool/exim
+ 
+ # Others may prefer to keep all Exim things under one directory:
+ # SPOOL_DIRECTORY=/usr/exim/spool
+@@ -567,7 +567,7 @@ TRANSPORT_SMTP=yes
+ # This one is special-purpose, and commonly not required, so do not include
+ # it by default.
+ 
+-# TRANSPORT_LMTP=yes
++TRANSPORT_LMTP=yes
+ 
+ 
+ # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
diff --git a/mail/exim3/patches/patch-ab b/mail/exim3/patches/patch-ab
index ae991869cc9..1343a773a2d 100644
--- a/mail/exim3/patches/patch-ab
+++ b/mail/exim3/patches/patch-ab
@@ -1,104 +1,44 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/07 17:47:32 abs Exp $
 
---- Local/Makefile.netbsd.orig	2003-11-30 16:06:49.000000000 +1100
-+++ Local/Makefile.netbsd
-@@ -78,7 +78,7 @@
- # CHGRP_COMMAND=/usr/bin/chgrp
- # MV_COMMAND=/bin/mv
- # RM_COMMAND=/bin/rm
--# PERL_COMMAND=/usr/bin/perl
-+PERL_COMMAND=@PREFIX@/bin/perl
- 
- 
- # The following macro can be used to change the command for building a library
-@@ -92,8 +92,8 @@
- # appropriate code is included in the binary. You then need to set up the
- # runtime configuration to make use of the mechanism(s) selected.
- 
--# AUTH_CRAM_MD5=yes
--# AUTH_PLAINTEXT=yes
-+AUTH_CRAM_MD5=yes
-+AUTH_PLAINTEXT=yes
- 
- 
- # The binary directory: This variable defines where the exim binary will be
-@@ -103,7 +103,7 @@
- # installed in this directory. There is no default for this variable built into
- # the source files; it must be set in one of the local configuration files.
- 
--BIN_DIRECTORY=/usr/exim/bin
-+BIN_DIRECTORY=@PREFIX@/sbin
- 
- 
- # The default distribution of Exim contains only the plain text form of the
-@@ -121,14 +121,14 @@ BIN_DIRECTORY=/usr/exim/bin
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
- 
--COMPRESS_COMMAND=/opt/gnu/bin/gzip
-+COMPRESS_COMMAND=@GZIP_CMD@
- COMPRESS_SUFFIX=gz
- 
- 
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
- 
--ZCAT_COMMAND=/opt/gnu/bin/zcat
-+ZCAT_COMMAND=@GZCAT@
- 
- 
- # The runtime configuration file: This variable defines where Exim's runtime
-@@ -137,7 +137,7 @@ ZCAT_COMMAND=/opt/gnu/bin/zcat
- # location of all other runtime files and directories can be changed in the
- # runtime configuration file.
- 
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
- 
- 
- # In some installations there may be multiple machines sharing file systems,
-@@ -243,7 +243,7 @@ EXICYCLOG_MAX=10
- # are defaulted in the OS/Makefile-Default file, and can be overridden
- # in local OS-specific make files.
- 
--EXIM_MONITOR=eximon.bin
-+# EXIM_MONITOR=eximon.bin
- 
- 
- # Compiling in support for embedded Perl: If you want to be able to
-@@ -286,7 +286,7 @@ EXIM_MONITOR=eximon.bin
- # "panic", or "reject" to form the final file name. For example, some
- # installations may want something like this:
- 
--# LOG_FILE_PATH=/var/log/exim_%slog
-+LOG_FILE_PATH=/var/log/exim/%slog
- 
- # 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
-@@ -411,7 +411,7 @@ LOOKUP_LSEARCH=yes
- # the file name, allowing sites that run two separate daemons to distinguish
- # them. Some installations may want something like this
- 
--# PID_FILE_PATH=/var/lock/exim%s.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
- 
- # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-@@ -460,7 +460,7 @@ ROUTER_QUERYPROGRAM=yes
- # uid and gid.
- 
- # Many installations will want something like this:
--# SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=/var/spool/exim
- 
- # Others may prefer to keep all Exim things under one directory:
- # SPOOL_DIRECTORY=/usr/exim/spool
-@@ -567,7 +567,7 @@ TRANSPORT_SMTP=yes
- # This one is special-purpose, and commonly not required, so do not include
- # it by default.
- 
--# TRANSPORT_LMTP=yes
-+TRANSPORT_LMTP=yes
- 
- 
- # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
+--- OS/Makefile-NetBSD.orig	Thu Apr  4 13:56:13 2002
++++ OS/Makefile-NetBSD
+@@ -3,15 +3,31 @@
+ 
+ # Include Makfile.NetBSD-a.out
+ 
+-.if exists(OS/Makefile-NetBSD-a.out)
+-.include "OS/Makefile-NetBSD-a.out"
+-.elif exists(../OS/Makefile-NetBSD-a.out)
+-.include "../OS/Makefile-NetBSD-a.out"
+-.else
+-.include "Makefile.NetBSD-a.out, submit a bug report."
+-.endif
++# Exim: OS-specific make file for NetBSD (a.out binary format)
++
++CHOWN_COMMAND=/usr/sbin/chown
++CFLAGS=-O
++
++HAVE_SA_LEN=YES
++LIBS=-lcrypt
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=-ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_KILL_ARG=-USR1
++
++# NetBSD always ships with Berkeley DB
++
++USE_DB=yes
++
++# End
++
+ 
+ # NetBSD ELF linker needs a -R flag.
+-XLFLAGS+=-Wl,-R$(X11)/lib/
++#XLFLAGS+=-Wl,-R$(X11)/lib/
+ 
+ # End
diff --git a/mail/exim3/patches/patch-ac b/mail/exim3/patches/patch-ac
index 5945e2524d0..071ec4b0570 100644
--- a/mail/exim3/patches/patch-ac
+++ b/mail/exim3/patches/patch-ac
@@ -1,44 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/07 17:47:32 abs Exp $
 
---- OS/Makefile-NetBSD.orig	Sat Jul 14 19:09:00 2001
-+++ OS/Makefile-NetBSD	Sat Jul 14 19:14:34 2001
-@@ -3,15 +3,31 @@
- 
- # Include Makfile.NetBSD-a.out
- 
--.if exists(OS/Makefile-NetBSD-a.out)
--.include "OS/Makefile-NetBSD-a.out"
--.elif exists(../OS/Makefile-NetBSD-a.out)
--.include "../OS/Makefile-NetBSD-a.out"
--.else
--.include "Makefile.NetBSD-a.out, submit a bug report."
--.endif
-+# Exim: OS-specific make file for NetBSD (a.out binary format)
-+
-+CHOWN_COMMAND=/usr/sbin/chown
-+CFLAGS=-O
-+
-+HAVE_SA_LEN=YES
-+LIBS=-lcrypt
-+
-+X11=/usr/X11R6
-+XINCLUDE=-I$(X11)/include
-+XLFLAGS=-L$(X11)/lib
-+X11_LD_LIB=$(X11)/lib
-+
-+EXIWHAT_PS_ARG=-ax
-+EXIWHAT_EGREP_ARG='/exim( |$$)'
-+EXIWHAT_KILL_ARG=-USR1
-+
-+# NetBSD always ships with Berkeley DB
-+
-+USE_DB=yes
-+
-+# End
-+
- 
- # NetBSD ELF linker needs a -R flag.
--XLFLAGS+=-Wl,-R$(X11)/lib/
-+#XLFLAGS+=-Wl,-R$(X11)/lib/
- 
- # End
+--- OS/os.h-Darwin.orig	Thu Apr  4 13:56:14 2002
++++ OS/os.h-Darwin
+@@ -1,6 +1,8 @@
+ /* Exim: OS-specific C header file for Darwin (Mac OS X) */
+ 
++/* Darwin 6.8 does not have crypt.h
+ #define CRYPT_H
++*/
+ #define HAVE_MMAP
+ #define HAVE_SYS_MOUNT_H
+ #define SIOCGIFCONF_GIVES_ADDR
diff --git a/mail/exim3/patches/patch-ad b/mail/exim3/patches/patch-ad
new file mode 100644
index 00000000000..2b2cefac90c
--- /dev/null
+++ b/mail/exim3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/05/07 17:47:32 abs Exp $
+
+--- src/accept.c.orig	Thu Apr  4 13:56:16 2002
++++ src/accept.c
+@@ -1895,7 +1895,7 @@ if (headers_check_syntax)
+           char *verb = "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
diff --git a/mail/exim3/patches/patch-ae b/mail/exim3/patches/patch-ae
index fa7ce978c81..dbda8faf6e7 100644
--- a/mail/exim3/patches/patch-ae
+++ b/mail/exim3/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/07 17:47:32 abs Exp $
 
---- src/configure.default.orig	Fri Sep 17 21:19:39 1999
-+++ src/configure.default	Fri Sep 17 21:19:55 1999
-@@ -252,8 +252,8 @@
+--- src/configure.default.orig	Thu Apr  4 13:56:16 2002
++++ src/configure.default
+@@ -298,8 +298,8 @@ end
  
  system_aliases:
    driver = aliasfile
diff --git a/mail/exim3/patches/patch-af b/mail/exim3/patches/patch-af
index 532ba92caf7..734a8d61140 100644
--- a/mail/exim3/patches/patch-af
+++ b/mail/exim3/patches/patch-af
@@ -1,10 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $
+$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $
 
-This patch is from:
-
-	http://www.exim.org/pipermail/exim-announce/2003q3/000094.html
-
---- src/smtp_in.c.orig	2002-04-04 22:56:20.000000000 +1000
+--- src/smtp_in.c.orig	Thu Apr  4 13:56:20 2002
 +++ src/smtp_in.c
 @@ -2021,13 +2021,12 @@ while (done <= 0)
  
diff --git a/mail/exim3/patches/patch-ag b/mail/exim3/patches/patch-ag
index 612bc23f157..b5a1db9670f 100644
--- a/mail/exim3/patches/patch-ag
+++ b/mail/exim3/patches/patch-ag
@@ -1,13 +1,22 @@
-$NetBSD: patch-ag,v 1.1 2004/01/15 02:05:10 grant Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/07 17:47:32 abs Exp $
 
---- OS/os.h-Darwin.orig	2002-04-04 22:56:14.000000000 +1000
-+++ OS/os.h-Darwin
-@@ -1,6 +1,8 @@
- /* Exim: OS-specific C header file for Darwin (Mac OS X) */
- 
-+/* Darwin 6.8 does not have crypt.h
- #define CRYPT_H
-+*/
- #define HAVE_MMAP
- #define HAVE_SYS_MOUNT_H
- #define SIOCGIFCONF_GIVES_ADDR
+--- src/verify.c.orig	Thu Apr  4 13:56:21 2002
++++ src/verify.c
+@@ -892,7 +892,7 @@ if (!sender_verify_reject || (rc == DEFE
+ /* Set up the key for the reject hints database, and attempt to open it.
+ If successful, read the record. */
+ 
+-sprintf(buffer, "%s:%.200s", sender_address,
++snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
+   (sender_host_name != NULL)? sender_host_name :
+   (sender_host_address != NULL)? sender_host_address : "");
+ 
+@@ -1182,7 +1182,7 @@ if (sender_verify_callback_error != NULL
+ O_WRONLY) is needed by Berkeley native DB even when reading only. If the
+ database won't open, we can do no more. */
+ 
+-sprintf(buffer, "%s:%.200s", sender_address,
++snprintf(buffer, sizeof(buffer), "%s:%.200s", sender_address,
+   (sender_host_name != NULL)? sender_host_name :
+   (sender_host_address != NULL)? sender_host_address : "");
+
author	abs <abs>	2004-05-07 17:47:32 +0000
committer	abs <abs>	2004-05-07 17:47:32 +0000
commit	50c73bfed4e6962f73653530c24d0eaf5dbaa436 (patch)
tree	e866d595608d988f154504f5c5c321aab3eeaa65
parent	ab722b78562f1c17ab06da7b41c17c5727d19b5b (diff)
download	pkgsrc-50c73bfed4e6962f73653530c24d0eaf5dbaa436.tar.gz