upgrade to 8.11.3. WIDE patch is not supplied yet, so it is not included.

8.11.3/8.11.3	2001/02/27
	Prevent a segmentation fault when a bogus value was used in the
		LDAPDefaultSpec option's -r, -s, or -M flags and if a bogus
		option was used.  Problem noted by Allan E Johannesen of
		Worcester Polytechnic Institute.
	Prevent "token too long" message by shortening {currHeader} which
		could be too long if the last copied character was a quote.
		Problem detected by Jan Krueger of digitalanswers
		communications consulting gmbh.
	Additional IPv6 check for unspecified addresses.  Patch from
		Jun-ichiro itojun Hagino of the KAME Project.
	Do not ignore the ClientPortOptions setting if DaemonPortOptions
		Modifier=b (bind to same interface) is set and the
		connection came in from the command line.
	Do not bind to the loopback address if DaemonPortOptions
		Modifier=b (bind to same interface) is set.  Patch from
		John Beck of Sun Microsystems.
	Properly deal with open failures on non-optional maps used in
		check_* rulesets by returning a temporary failure.
	Buffered file I/O files were not being properly fsync'ed to disk
		when they were committed.
	Properly encode '=' for the AUTH= parameter of the MAIL command.
		Problem noted by Hadmut Danisch.
	Under certain circumstances the macro {server_name} could be set
		to the wrong hostname (of a previous connection), which may
		cause some rulesets to return wrong results.  This would
		usually cause mail to be queued up and delivered later on.
	Ignore F=z (LMTP) mailer flag if $u is given in the mailer A=
		equate.  Problem noted by Motonori Nakamura of Kyoto
		University.
	Work around broken accept() implementations which only partially
		fill in the peer address if the socket is closed before
		accept() completes.
	Return an SMTP "421" temporary failure if the data file can't be
		opened where the "354" reply would normally be given.
	Prevent a CPU loop in trying to expand a macro which doesn't exist
		in a queue run.  Problem noted by Gordon Lack of Glaxo
		Wellcome.
	If delivering via a program and that program exits with EX_TEMPFAIL,
		note that fact for the mailq display instead of just showing
		"Deferred".  Problem noted by Motonori Nakamura of Kyoto
		University.
	If doing canonification via /etc/hosts, try both the fully
		qualified hostname as well as the first portion of the
		hostname.  Problem noted by David Bremner of the
		University of New Brunswick.
	Portability:
		Fix a compilation problem for mail.local and rmail if SFIO
			is in use.  Problem noted by Auteria Wally
			Winzer Jr. of Champion Nutrition.
		IPv6 changes for platforms using KAME.  Patch from
			Jun-ichiro itojun Hagino of the KAME Project.
		OpenBSD 2.7 and higher has srandomdev(3).  OpenBSD 2.8 and
			higher has BSDI-style login classes.  Patch from
			Todd C.  Miller of Courtesan Consulting.
		Unixware 7.1.1 doesn't allow h_errno to be set directly if
			sendmail is being compiled with -kthread.  Problem
			noted by Orion Poplawski of CQG, Inc.
	CONTRIB: buildvirtuser: Substitute current domain for $DOMAIN and
		current left hand side for $LHS in virtuser files.
	DEVTOOLS: Do not pass make targets to recursive Build invocations.
		Problem noted by Jeff Bronson of J.D. Bronson, Inc.
	MAIL.LOCAL: In LMTP mode, do not return errors regarding problems
		storing the temporary message file until after the remote
		side has sent the final DATA termination dot.  Problem
		noted by Allan E Johannesen of Worcester Polytechnic
		Institute.
	MAIL.LOCAL: If LMTP mode is set, give a temporary error if users
		are also specified on the command line.  Patch from
		Motonori Nakamura of Kyoto University.
	PRALIASES: Skip over AliasFile specifications which aren't based on
		database files (i.e., only show dbm, hash, and btree).
	Renamed Files:
		devtools/OS/OSF1.V5.0 => devtools/OS/OSF1.V5.x

4 files changed, 26 insertions, 104 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index bdcffa8a4d6..7d924c5d398 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.31 2001/02/25 04:17:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.32 2001/02/28 03:52:18 itojun Exp $
 
-DISTNAME=	sendmail.8.11.2
-PKGNAME=	sendmail-8.11.2
+DISTNAME=	sendmail.8.11.3
+PKGNAME=	sendmail-8.11.3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/sendmail/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
 
-PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
-PATCHFILES=	sendmail8.11.2+3.4W.patch.gz
-PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP}
-.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE))
-PATCH_DIST_ARGS+=--forward --quiet
-.endif
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
+#PATCHFILES=	sendmail8.11.2+3.4W.patch.gz
+#PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP}
+#.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE))
+#PATCH_DIST_ARGS+=--forward --quiet
+#.endif
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
diff --git a/mail/sendmail/files/md5 b/mail/sendmail/files/md5
index 603440b896e..ce854be2fd0 100644
--- a/mail/sendmail/files/md5
+++ b/mail/sendmail/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.9 2001/01/21 05:58:51 itojun Exp $
+$NetBSD: md5,v 1.10 2001/02/28 03:52:19 itojun Exp $
 
-MD5 (sendmail.8.11.2.tar.gz) = eee46aa3a3215e02c1aa7f1c49c5e99c
-MD5 (sendmail8.11.2+3.4W.patch.gz) = 1000875cd46c685c0a83de7974259757
+MD5 (sendmail.8.11.3.tar.gz) = 77fa841497507b59f388bf59f0e14592
diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index 1499588a1bf..379a0b50714 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.16 2001/01/04 12:09:29 itojun Exp $
+$NetBSD: patch-sum,v 1.17 2001/02/28 03:52:19 itojun Exp $
 
 MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f
 MD5 (patch-ab) = df740f28896a0851159e3e7a7fcfdb5a
 MD5 (patch-ac) = 6afb53121cfd919c8cb8a37bea3b90f9
 MD5 (patch-ad) = f6b38b13c7e4ee03f78859d59fbd74fd
 MD5 (patch-ae) = 25f9ec8f39dbc92c42ddde565e3fa3a5
-MD5 (patch-af) = ead9fa73121af3fb09cb449429ffe091
+MD5 (patch-af) = 8e384b5055522378c814cb370d1553f4
diff --git a/mail/sendmail/patches/patch-af b/mail/sendmail/patches/patch-af
index c5353a03b31..255dd16b58b 100644
--- a/mail/sendmail/patches/patch-af
+++ b/mail/sendmail/patches/patch-af
@@ -1,91 +1,14 @@
-$NetBSD: patch-af,v 1.6 2001/01/04 12:09:29 itojun Exp $
+$NetBSD: patch-af,v 1.7 2001/02/28 03:52:19 itojun Exp $
 
---- sendmail/conf.c.orig	Fri Dec 29 08:51:54 2000
-+++ sendmail/conf.c	Thu Jan  4 20:58:00 2001
-@@ -4546,18 +4546,32 @@
- 	static struct hostent he;
- 	static char buf[1000];
- 	extern struct hostent *_switch_gethostbyaddr_r();
--
--	hp = _switch_gethostbyaddr_r(addr, len, type, &he, buf, sizeof(buf), &h_errno);
- # else /* SOLARIS == 20300 || SOLARIS == 203 */
- 	extern struct hostent *__switch_gethostbyaddr();
--
--	hp = __switch_gethostbyaddr(addr, len, type);
- # endif /* SOLARIS == 20300 || SOLARIS == 203 */
- #else /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) */
- # if NETINET6
- 	int err;
- # endif /* NETINET6 */
-+#endif /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) */
-+
-+#if NETINET6
-+	if (type == AF_INET6) {
-+		if (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *)addr) ||
-+		    IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr)) {
-+			h_errno = HOST_NOT_FOUND;
-+			return NULL;
-+		}
-+	}
-+#endif /* NETINET6 */
+--- sendmail/conf.c.orig	Wed Feb 28 05:48:21 2001
++++ sendmail/conf.c	Wed Feb 28 12:48:30 2001
+@@ -4546,7 +4546,8 @@
  
-+#if (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204)
-+# if SOLARIS == 20300 || SOLARIS == 203
-+	hp = _switch_gethostbyaddr_r(addr, len, type, &he, buf, sizeof(buf), &h_errno);
-+# else /* SOLARIS == 20300 || SOLARIS == 203 */
-+	hp = __switch_gethostbyaddr(addr, len, type);
-+# endif /* SOLARIS == 20300 || SOLARIS == 203 */
-+#else /* (SOLARIS > 10000 && SOLARIS < 20400) || (defined(SOLARIS) && SOLARIS < 204) */
- # if NETINET6
- 	hp = getipnodebyaddr(addr, len, type, &err);
- 	h_errno = err;
-@@ -4935,18 +4949,19 @@
- 		switch (af)
- 		{
- 		  case AF_INET6:
--			ia6 = sa->sin6.sin6_addr;
--#   ifdef __KAME__
--			/* convert into proper scoped address - */
--			if ((IN6_IS_ADDR_LINKLOCAL(&ia6) ||
--			     IN6_IS_ADDR_SITELOCAL(&ia6)) &&
--			    sa->sin6.sin6_scope_id == 0)
--			{
--				sa->sin6.sin6_scope_id = ntohs(ia6.s6_addr[3] |
--					((unsigned int) ia6.s6_addr[2] << 8));
--				ia6.s6_addr[2] = ia6.s6_addr[3] = 0;
-+#    ifdef __KAME__
-+			/* convert into proper scoped address */
-+			if ((IN6_IS_ADDR_LINKLOCAL(&sa->sin6.sin6_addr) ||
-+			     IN6_IS_ADDR_SITELOCAL(&sa->sin6.sin6_addr)) &&
-+			    sa->sin6.sin6_scope_id == 0) {
-+				struct in6_addr *ia6p;
-+				ia6p = &sa->sin6.sin6_addr;
-+				sa->sin6.sin6_scope_id = ntohs(ia6p->s6_addr[3] |
-+				     ((unsigned int)ia6p->s6_addr[2] << 8));
-+				ia6p->s6_addr[2] = ia6p->s6_addr[3] = 0;
- 			}
--#   endif /* __KAME__ */
-+#    endif
-+			ia6 = sa->sin6.sin6_addr;
- 			if (IN6_IS_ADDR_UNSPECIFIED(&ia6))
- 			{
- 				addr = anynet_ntop(&ia6, buf6, sizeof buf6);
-@@ -5129,6 +5144,18 @@
- 
- #   if NETINET6
- 		  case AF_INET6:
-+#    ifdef __KAME__
-+			/* convert into proper scoped address */
-+			if ((IN6_IS_ADDR_LINKLOCAL(&sa->sin6.sin6_addr) ||
-+			     IN6_IS_ADDR_SITELOCAL(&sa->sin6.sin6_addr)) &&
-+			    sa->sin6.sin6_scope_id == 0) {
-+				struct in6_addr *ia6p;
-+				ia6p = &sa->sin6.sin6_addr;
-+				sa->sin6.sin6_scope_id = ntohs(ia6p->s6_addr[3] |
-+				     ((unsigned int)ia6p->s6_addr[2] << 8));
-+				ia6p->s6_addr[2] = ia6p->s6_addr[3] = 0;
-+			}
-+#    endif
- 			ia6 = sa->sin6.sin6_addr;
- 			if (IN6_IS_ADDR_UNSPECIFIED(&ia6))
- 			{
+ #if NETINET6
+ 	if (type == AF_INET6 &&
+-	    IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr))
++	    (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *) addr) ||
++	    IN6_IS_ADDR_LINKLOCAL((struct in6_addr *) addr)))
+ 	{
+ 		/* Avoid reverse lookup for IPv6 unspecified address */
+ 		SM_SET_H_ERRNO(HOST_NOT_FOUND);