Update "sendmail" and "libmilter" package to version 8.14.3.

Changes since version 8.14.2:
* the MTA accessed storage after it free()d it. This was a regression
  introduced in 8.14.2, but the bug only showed up on a few operating
  systems.
* ruleset processing: the function cataddr() could cause the addition of
  the BlankSub character between some tokens when it should not happen
  and thus failures in rule matching. It seems that none of the default
  rules were affected by this bug and hence the problem did not show up
  for default configurations.
* the libmilter state engine did not deal correctly with milters that
  requested the omission of protocol steps during the negotiation callback.

Approved by John Nemeth.

4 files changed, 13 insertions, 43 deletions

diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
index 66d090f59ea..dbc1b595d1a 100644
--- a/mail/libmilter/Makefile
+++ b/mail/libmilter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2008/03/14 02:56:10 jnemeth Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/14 08:58:06 tron Exp $
 
 PKGNAME=	libmilter-${DIST_VERS}
-PKGREVISION=	1
 COMMENT=	Mail filter support library for sendmail
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index a3e941d88ea..57679de080c 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2008/01/04 02:25:36 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.46 2008/06/14 08:58:06 tron Exp $
 #
 # used by mail/libmilter/Makefile
 #
@@ -19,7 +19,7 @@ DISTINFO_FILE=	${.CURDIR}/../../mail/sendmail/distinfo
 FILESDIR=	${.CURDIR}/../../mail/sendmail/files
 PATCHDIR=	${.CURDIR}/../../mail/sendmail/patches
 
-DIST_VERS=	8.14.2
+DIST_VERS=	8.14.3
 
 MAKE_ENV+=	BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
 		BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 204e025aa2b..39f30957fe4 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2007/11/02 08:27:36 jnemeth Exp $
+$NetBSD: distinfo,v 1.37 2008/06/14 08:58:06 tron Exp $
 
-SHA1 (sendmail.8.14.2.tar.gz) = 2b92a1d439374249ef6bf024cfb8072902c5682a
-RMD160 (sendmail.8.14.2.tar.gz) = 9db665f955b5a2b5d83adad4c3dfd483c6e0b9be
-Size (sendmail.8.14.2.tar.gz) = 2064346 bytes
+SHA1 (sendmail.8.14.3.tar.gz) = 814c54c3917aa6b0981b5ea99fb34e0c02f31489
+RMD160 (sendmail.8.14.3.tar.gz) = 5423360ce908c985827cf6524a6de87e3451c27a
+Size (sendmail.8.14.3.tar.gz) = 2069209 bytes
 SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf
 SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
 SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
 SHA1 (patch-af) = f1fb00d9d27f512c550ad7dbcd014563122488b5
 SHA1 (patch-ag) = 1889e8d7938664af926a9a169bb53f6da924f0bb
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
-SHA1 (patch-ai) = 41ce105ff15cdc1233d4b63505de7ee1b2703379
+SHA1 (patch-ai) = aca71358618e8c1dc785a8b2dc049b97232b8795
 SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
 SHA1 (patch-al) = f5d8cef8c4abba5d5ae813b754c16037190a7ef1
 SHA1 (patch-am) = d84eedbff0f037c1db341255dc9e1877866f12c7
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
index 3643ac94ec8..cb8fb8d0722 100644
--- a/mail/sendmail/patches/patch-ai
+++ b/mail/sendmail/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.7 2007/04/26 06:26:27 jnemeth Exp $
+$NetBSD: patch-ai,v 1.8 2008/06/14 08:58:06 tron Exp $
 
---- sendmail/mci.c.orig	2006-08-15 16:24:57.000000000 -0700
-+++ sendmail/mci.c
-@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.218 2006/08
+--- sendmail/mci.c.orig	2007-11-13 23:44:25.000000000 +0000
++++ sendmail/mci.c	2008-06-08 15:28:50.000000000 +0100
+@@ -20,6 +20,7 @@
  #endif /* NETINET || NETINET6 */
  
  #include <dirent.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.7 2007/04/26 06:26:27 jnemeth Exp $
  
  static int	mci_generate_persistent_path __P((const char *, char *,
  						  int, bool));
-@@ -717,7 +718,11 @@ mci_lock_host_statfile(mci)
+@@ -717,7 +718,11 @@
  {
  	int save_errno = errno;
  	int retVal = EX_OK;
@@ -22,32 +22,3 @@ $NetBSD: patch-ai,v 1.7 2007/04/26 06:26:27 jnemeth Exp $
  
  	if (HostStatDir == NULL || mci->mci_host == NULL)
  		return EX_OK;
-@@ -1143,7 +1148,7 @@ mci_traverse_persistent(action, pathname
- 					pathname, sm_errstring(errno));
- 			return -1;
- 		}
--		len = sizeof(newpath) - MAXNAMLEN - 3;
-+		len = sizeof(newpath) - 2; /* enough space for '/' and NUL */
- 		if (sm_strlcpy(newpath, pathname, len) >= len)
- 		{
- 			if (tTd(56, 2))
-@@ -1153,6 +1158,7 @@ mci_traverse_persistent(action, pathname
- 		}
- 		newptr = newpath + strlen(newpath);
- 		*newptr++ = '/';
-+		len = sizeof(newpath) - (newptr - newpath);
- 
- 		/*
- 		**  repeat until no file has been removed
-@@ -1169,9 +1175,8 @@ mci_traverse_persistent(action, pathname
- 				if (e->d_name[0] == '.')
- 					continue;
- 
--				(void) sm_strlcpy(newptr, e->d_name,
--					       sizeof(newpath) -
--					       (newptr - newpath));
-+				if (sm_strlcpy(newptr, e->d_name, len) >= len)
-+					continue;
- 
- 				if (StopRequest)
- 					stop_sendmail();