- Update to sendmail 8.13.4

- Remove old patch-ai
- From the ChangeLog:
> 	The bug fixes in 8.13.3 for connection handling uncovered a
> 		different error which could result in connections that
> 		stay in CLOSE_WAIT state due to a variable that was not
> 		properly initialized.  Problem noted by Michael Sims.
> 	Deal with empty hostnames in hostsignature().  This bug could lead
> 		to an endless loop when doing LMTP deliveries to another
> 		host.  Problem first reported by Martin Lathoud and
> 		tracked down by Gael Roualland.
> 	Make sure return parameters are initialized in getmxrr().  Problem
> 		found by Gael Roualland using valgrind.
> 	If shared memory is used and the RunAsUser option is set, then the
> 		owner and group of the shared memory segment is set to
> 		the ids specified RunAsUser and the access mode is set
> 		to 0660 to allow for updates by sendmail processes.
> 	The number of queue entries that is (optionally) kept in shared
> 		memory was wrong in some cases, e.g., envelope splitting
> 		and bounce generation.
> 	Undo a change made in 8.13.0 to silently truncate long strings
> 		in address rewriting because the message can be triggered
> 		for header checks where long strings are legitimate.
> 		Problem reported by Mary Verge DeSisto, and tracked
> 		down with the help of John Beck of Sun Microsystems.
> 	The internal stab map did not obey the -m flag.  Patch from
> 		Rob McMahon of Warwick University, England.
> 	The socket map did not obey the -f flag.  Problem noted by
> 		Dan Ringdahl, forwarded by Andrzej Filip.
> 	The addition of LDAP recursion in 8.13.0 broke enforcement of
> 		the LDAP map -1 argument which tells the MTA to only
> 		return success if and only if a single LDAP match is found.
> 	Add additional error checks in the MTA for milter communication
> 		to avoid a possible segmentation fault.  Based on patch
> 		by Joe Maimon.
> 	Do not trigger an assertion if X509_digest() returns success but
> 		does not assign a value to its output parameter.  Based
> 		on patch by Brian Kantor.
> 	Add more checks when resetting internal AUTH data (applies only
> 		to Cyrus SASL version 2).  Otherwise an SMTP session might
> 		be dropped after an AUTH failure.
> 	Portability:
> 		Add LA_LONGLONG as valid LA_TYPE type for systems that use
> 			"long long" to read load average data, e.g.,
> 			AIX 5.1 in 32 bit mode.  Note: this has to be set
> 			"by hand", it is not (yet) automatically detected.
> 			Problem noted by Burak Bilen.
> 		Use socklen_t for accept(), etc. on AIX 5.x.  This should
> 			fix problems when compiling in 64 bit mode.
> 			Problem first reported by Harry Meiert of
> 			University of Bremen.

3 files changed, 6 insertions, 69 deletions

diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index aa7b330210d..ea782bedf48 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/04/12 15:11:18 tv Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/04/27 18:57:54 adrianp Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -18,7 +18,7 @@ DISTINFO_FILE?=	${.CURDIR}/../../mail/sendmail/distinfo
 FILESDIR?=	${.CURDIR}/../../mail/sendmail/files
 PATCHDIR?=	${.CURDIR}/../../mail/sendmail/patches
 
-DIST_VERS=	8.13.3
+DIST_VERS=	8.13.4
 
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 53b7cac3584..c7925deac7b 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/02/24 09:59:29 agc Exp $
+$NetBSD: distinfo,v 1.22 2005/04/27 18:57:54 adrianp Exp $
 
-SHA1 (sendmail.8.13.3.tar.gz) = cd4a5d8726cd72e58220558b1191f7bfdcd7920c
-RMD160 (sendmail.8.13.3.tar.gz) = ead22a0d22501fffb9983b1be35b0911bcaa236f
-Size (sendmail.8.13.3.tar.gz) = 1969226 bytes
+SHA1 (sendmail.8.13.4.tar.gz) = 3cf14d7cafc859a2643a73dea353d7aacae35af1
+RMD160 (sendmail.8.13.4.tar.gz) = 54725031876f0980556f33a3ac088024396fb786
+Size (sendmail.8.13.4.tar.gz) = 1974606 bytes
 SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
 SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
 SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
@@ -11,4 +11,3 @@ SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
 SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
 SHA1 (patch-ag) = a87e1685f343703d21a42ec1df68cbba963fa178
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
-SHA1 (patch-ai) = eaf39ce0ab004ac976fff69d74b4c17afc0b4dae
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
deleted file mode 100644
index d21528ac7f4..00000000000
--- a/mail/sendmail/patches/patch-ai
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/02/10 22:17:24 adrianp Exp $
-
---- sendmail/mci.c.orig	2004-08-04 22:11:31.000000000 +0100
-+++ sendmail/mci.c
-@@ -398,6 +398,57 @@ mci_get(host, m)
- 
- 	return mci;
- }
-+
-+/*
-+**  MCI_CLOSE -- (forcefully) close files used for a connection.
-+**	Note: this is a last resort, usually smtpquit() or endmailer()
-+**		should be used to close a connection.
-+**
-+**	Parameters:
-+**		mci -- the connection to close.
-+**		where -- where has this been called?
-+**
-+**	Returns:
-+**		none.
-+*/
-+
-+void
-+mci_close(mci, where)
-+	MCI *mci;
-+	char *where;
-+{
-+	bool dumped;
-+
-+	if (mci == NULL)
-+		return;
-+	dumped = false;
-+	if (mci->mci_out != NULL)
-+	{
-+		if (tTd(56, 1))
-+		{
-+			sm_dprintf("mci_close: mci_out!=NULL, where=%s\n",
-+				where);
-+			mci_dump(sm_debug_file(), mci, false);
-+			dumped = true;
-+		}
-+		(void) sm_io_close(mci->mci_out, SM_TIME_DEFAULT);
-+		mci->mci_out = NULL;
-+	}
-+	if (mci->mci_in != NULL)
-+	{
-+		if (tTd(56, 1))
-+		{
-+			sm_dprintf("mci_close: mci_in!=NULL, where=%s\n",
-+				where);
-+			if (!dumped)
-+				mci_dump(sm_debug_file(), mci, false);
-+		}
-+		(void) sm_io_close(mci->mci_in, SM_TIME_DEFAULT);
-+		mci->mci_in = NULL;
-+	}
-+	mci->mci_state = MCIS_CLOSED;
-+}
-+
- /*
- **  MCI_NEW -- allocate new MCI structure
- **