From 00f46eae446dd6e6c57abc3aadf5594258ec0566 Mon Sep 17 00:00:00 2001
From: peter <peter@openbsd.org>
Date: Wed, 25 Jul 2001 08:18:48 +0000
Subject: [PATCH] update to exim 3.30

This does not yet include the IPv6 / IPv4 OpenBSD patch discussed on
various lists.
---
 mail/exim/Makefile                            | 11 +++++-----
 mail/exim/files/Makefile                      |  4 +++-
 mail/exim/files/md5                           | 12 +++++------
 .../patches/patch-src_transports_appendfile_c | 20 -------------------
 4 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 mail/exim/patches/patch-src_transports_appendfile_c

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index fc18225a37d..cc39f065653 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.24 2001/06/03 05:32:16 brad Exp $
+# $OpenBSD: Makefile,v 1.25 2001/07/25 08:18:48 peter Exp $
 
 COMMENT=	"MTA for systems connected to the Internet"
 
-DISTNAME=	exim-3.22
+VERSION=	3.30
+DISTNAME=	exim-${VERSION}
 CATEGORIES=	mail
 NEED_VERSION=	1.405
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
+MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/ \
 		ftp://ftp.exim.org/pub/exim/ \
 		ftp://ftp.fu-berlin.de/unix/mail/exim/
-DISTFILES=	exim-3.22.tar.gz exim-texinfo-3.20.tar.gz
+DISTFILES=	exim-${VERSION}.tar.gz exim-texinfo-${VERSION}.tar.gz
 
 HOMEPAGE=	http://www.exim.org/
 
@@ -75,7 +76,7 @@ do-configure:
 	@echo "LOOKUP_INCLUDE=${EXIM_LOOKUP_INCLUDE}">>${WRKSRC}/Local/Makefile
 	@echo "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}">>${WRKSRC}/Local/Makefile
 	@cd ${WRKSRC}/doc ; \
-	for i in ../../exim-texinfo-3.20/doc/* ; do \
+	for i in ../../exim-texinfo-${VERSION}/doc/* ; do \
 		ln -sf $$i ; \
 	done
 
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index e32ff79274b..3baa97dd301 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2001/04/22 09:03:40 peter Exp $
+# $OpenBSD: Makefile,v 1.9 2001/07/25 08:18:48 peter Exp $
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
@@ -222,6 +222,8 @@ EXICYCLOG_MAX=10
 # runs as the appropriate local user. Specifying 0 at run time has the effect
 # of unsetting the values build into the binary.
 
+# Setting EXIM_GID without setting EXIM_UID has no effect.
+
 # The settings here must be numeric; the run time file allows names to
 # be used. When this uid and gid are set, the Exim binary still has to be
 # setuid root if local deliveries are to be performed or a listener on port
diff --git a/mail/exim/files/md5 b/mail/exim/files/md5
index 4303026c456..4543228bdeb 100644
--- a/mail/exim/files/md5
+++ b/mail/exim/files/md5
@@ -1,6 +1,6 @@
-MD5 (exim-3.22.tar.gz) = c0514615d0be1d38c638c50afa2b9405
-MD5 (exim-texinfo-3.20.tar.gz) = f8ef4b785e34b0f4b8efed4679c1add0
-RMD160 (exim-3.22.tar.gz) = 1b23100cc201e6c5b084629928baafb9741e52ae
-RMD160 (exim-texinfo-3.20.tar.gz) = eae8a54174ab2ae24d0d27aa3ce72876b0765dcd
-SHA1 (exim-3.22.tar.gz) = 48d39cc6cbcdf77a24bd541f9b02a436e61d18c4
-SHA1 (exim-texinfo-3.20.tar.gz) = eed89c7026df99f7c7fcae732ff7311d70c0937d
+MD5 (exim-3.30.tar.gz) = 401b2f6e75a55114a26f875c0ecb55b2
+MD5 (exim-texinfo-3.30.tar.gz) = 155ae0ece6c4b50f7c0a8f7d9e2d0944
+RMD160 (exim-3.30.tar.gz) = 73af297b7391d629c608afaf75b0ce846f4b8b3d
+RMD160 (exim-texinfo-3.30.tar.gz) = 7e2d7e1fa2ef7ff82e0b8d97abde673d7d2df004
+SHA1 (exim-3.30.tar.gz) = feef0190cc5347adb34e0a54e2353f5e160c958f
+SHA1 (exim-texinfo-3.30.tar.gz) = d7b8ee14da0cf7ba5f8f425b3cd109117bedc0d3
diff --git a/mail/exim/patches/patch-src_transports_appendfile_c b/mail/exim/patches/patch-src_transports_appendfile_c
deleted file mode 100644
index c0bd6b1f16b..00000000000
--- a/mail/exim/patches/patch-src_transports_appendfile_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_transports_appendfile_c,v 1.2 2000/08/12 23:57:45 naddy Exp $
---- src/transports/appendfile.c.orig	Thu Jul 20 13:08:51 2000
-+++ src/transports/appendfile.c	Wed Aug  9 02:11:10 2000
-@@ -2343,9 +2343,16 @@ opened, so that it goes away on closure.
- #ifdef SUPPORT_MBX
- if (yield == OK && ob->mbx_format)
-   {
-+#if OpenBSD
-+  char tempbuf[] = "/tmp/exim.XXXXXXXXXX";
-+
-+  tempname = tempbuf;
-+  if ((temp_fd = mkstemp(tempname)) == -1 || unlink(tempname) < 0)
-+#else
-   tempname = tmpnam(NULL);
-   if ((temp_fd = open(tempname, (O_RDWR|O_CREAT|O_TRUNC), 0600)) < 0 ||
-       unlink(tempname) < 0)
-+#endif
-     {
-     addr->basic_errno = errno;
-     addr->message = string_sprintf("while setting up temporary file %s",