update to 8.11.1. make SASL-enabled build to use tolek stdio code, not

sfio code (no longer depends onto devel/sfio)

8.11.1/8.11.1	2000/09/27
	Fix SMTP EXPN command output if the address expands to a single
		name.  Fix from John Beck of Sun Microsystems.
	Don't try STARTTLS in the client if the PRNG has not been properly
		seeded.  This problem only occurs on systems without
		/dev/urandom.  Problem detected by Jan Krueger of
		digitalanswers communications consulting gmbh and
		Neil Rickert of Northern Illinois University.
	Don't use the . and .. directories when expanding QueueDirectory
		wildcards.
	Do not try to cache LDAP connections across processes as a parent
		process may close the connection before the child process
		has completed.  Problem noted by Lai Yiu Fai of the Hong
		Kong University of Science and Technology and Wolfgang
		Hottgenroth of UUNET.
	Use Timeout.fileopen to limit the amount of time spent trying to
		read the LDAP secret from a file.
	Prevent SIGTERM from removing a command line submitted item after
		the user submits the message and before the first delivery
		attempt completes.  Problem noted by Max France of AlphaNet.
		Fix from Neil Rickert of Northern Illinois University.
	Deal correctly with MaxMessageSize restriction if message size is
		greater than 2^31.
	Turn off queue checkpointing if CheckpointInterval is set to zero.
	Treat an empty home directory (from getpw*() or $HOME) as
		non-existent instead of treating it as /.  Problem noted by
		Todd C. Miller of Courtesan Consulting.
	Don't drop duplicate headers when reading a queued item.  Problem
		noted by Motonori Nakamura of Kyoto University.
	Avoid bogus error text when logging the savemail panic "cannot
		save rejected email anywhere".  Problem noted by Marc G.
		Fournier of Acadia University.
	If an LDAP search fails because the LDAP server went down, close
		the map so subsequent searches reopen the map.  If there are
		multiple LDAP servers, the down server will be skipped and
		one of the others may be able to take over.
	Set the ${load_avg} macro to the current load average, not the
		previous load average query result.
	If a non-optional map used in a check_* ruleset can't be opened,
		return a temporary failure to the remote SMTP client
		instead of ignoring the map.  Problem noted by Allan E
		Johannesen of Worcester Polytechnic Institute.
	Avoid a race condition when queuing up split envelopes by saving
		the split envelopes before the original envelope.
	Fix a bug in the PH_MAP code which caused mail to bounce instead of
		defer if the PH server could not be contacted.  From Mark
		Roth of the University of Illinois at Urbana-Champaign.
	Prevent QueueSortOrder=Filename from interfering with -qR, -qS, and
		ETRN.  Problem noted by Erik R. Leo of SoVerNet.
	Change error code for unrecognized parameters to the SMTP MAIL and
		RCPT commands from 501 to 555 per RFC 1869.  Problem
		reported to Postfix by Robert Norris of Monash University.
	Prevent overwriting the argument of -B on certain OS.  Problem
		noted by Matteo Gelosa of I.NET S.p.A.
	Use the proper routine for freeing memory with Netscape's LDAP
		client libraries.  Patch from Paul Hilchey of the
		University of British Columbia.
	Portability:
		Move the NETINET6 define to devtools/OS/SunOS.5.{8,9}
			instead of defining it in conf.h so users can
			override the setting.  Suggested by
			Henrik Nordstrom of Ericsson.
		On HP-UX 10.X and 11.X, use /usr/sbin/sendmail instead of
			/usr/lib/sendmail for rmail and vacation.  From
			Jeff A. Earickson of Colby College.
		On HP-UX 11.X, use /usr/sbin instead of /usr/libexec (which
			does not exist).  From Jeff A. Earickson of Colby
			College.
		Avoid using the UCB subsystem on NCR MP-RAS 3.x.  From
			Tom Moore of NCR.
		NeXT 3.X and 4.X installs man pages in /usr/man.  From
			Hisanori Gogota of NTT/InterCommunicationCenter.
		Solaris 8 and later include /var/run.  The default PID file
			location is now /var/run/sendmail.pid.  From John
			Beck of Sun Microsystems.
		SFIO includes snprintf() for those operating systems
			which do not.  From Todd C. Miller of Courtesan
			Consulting.
	CONFIG: Use the result of _CERT_REGEX_SUBJECT_ not {cert_subject}.
		Problem noted by Kaspar Brand of futureLab AG.
	CONFIG: Change 553 SMTP reply code to 501 to avoid problems with
		errors in the MAIL address.
	CONFIG: Fix FEATURE(nouucp) usage in example .mc files.  Problem
		noted by Ron Jarrell of Virginia Tech.
	CONFIG: Add support for Solaris 8 (and later) as OSTYPE(solaris8).
		Contributed by John Beck of Sun Microsystems.
	CONFIG: Set confFROM_HEADER such that the mail hub can possibly add
		GECOS information for an address.  This more closely
		matches pre-8.10 nullclient behavior.  From Per Hedeland of
		Ericsson.
	CONFIG: Fix MODIFY_MAILER_FLAGS(): apply the flag modifications for
		SMTP to all *smtp* mailers and those for RELAY to the relay
		mailer as described in cf/README.
	MAIL.LOCAL: Open the mailbox as the recipient not root so quotas
		are obeyed.  Problem noted by Damian Kuczynski of NIK.
	MAKEMAP: Do not change a map's owner to the TrustedUser if using
		makemap to 'unmake' the map.
	RMAIL: Avoid overflowing the list of recipients being passed to
		sendmail.
	RMAIL: Invoke sendmail with '-G' to indicate this is a gateway
		submission.  Problem noted by Kari Hurtta of the Finnish
		Meteorological Institute.
	VACATION: Read the complete message to avoid "broken pipe" signals.
	VACATION: Do not cut off vacation.msg files which have a single
		dot as the only character on the line.
	New Files:
		cf/ostype/solaris8.m4

7 files changed, 29 insertions, 113 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index be64e009a46..1f3d67fe41f 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.23 2000/09/03 10:31:27 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2000/10/15 14:30:21 itojun Exp $
 
-DISTNAME=	sendmail.8.11.0
-PKGNAME=	sendmail-8.11.0
+DISTNAME=	sendmail.8.11.1
+PKGNAME=	sendmail-8.11.1
 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.0+3.3W.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_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
+#PATCHFILES=	sendmail8.11.0+3.3W.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
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
@@ -47,10 +47,7 @@ DEPENDS+=	openldap-1.2.*:../../databases/openldap
 DEPENDS+=	db-2.7.7:../../databases/db
 .endif
 .if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-DEPENDS+=	sfio-1999:../../devel/sfio
-.if !defined(PATENTEDOPENSSLSRC) && !exists(/usr/include/openssl/rsa.h)
-DEPENDS+=	openssl-0.9.5a:../../security/openssl
-.endif
+USE_SSL=	yes
 .endif
 
 post-patch:
diff --git a/mail/sendmail/files/md5 b/mail/sendmail/files/md5
index dcfeac604f6..f9eed6302e1 100644
--- a/mail/sendmail/files/md5
+++ b/mail/sendmail/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 2000/08/18 12:43:54 itojun Exp $
+$NetBSD: md5,v 1.6 2000/10/15 14:30:23 itojun Exp $
 
-MD5 (sendmail.8.11.0.tar.gz) = 95a21f6838dc0489924ca71d98e40edf
+MD5 (sendmail.8.11.1.tar.gz) = 9118a555141493fb574a588d50f57215
 MD5 (sendmail8.11.0+3.3W.patch.gz) = fcdf9204dd72c895ecf0e80fd9738cc3
diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index b75b93bce82..4aa9faea762 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,8 +1,7 @@
-$NetBSD: patch-sum,v 1.13 2000/08/18 16:29:23 onoe Exp $
+$NetBSD: patch-sum,v 1.14 2000/10/15 14:30:23 itojun Exp $
 
 MD5 (patch-aa) = 8b9fcec3b4f82a30c7a167c32a00841f
 MD5 (patch-ab) = df740f28896a0851159e3e7a7fcfdb5a
 MD5 (patch-ac) = 6afb53121cfd919c8cb8a37bea3b90f9
-MD5 (patch-ad) = 309d090ecd1b4588f87153e9f240d9bd
-MD5 (patch-ae) = 9cb440411904551b9ceff30cc53b96d8
-MD5 (patch-af) = 2c589fc063d8cbf75c54d85e35da9fe7
+MD5 (patch-ad) = f6b38b13c7e4ee03f78859d59fbd74fd
+MD5 (patch-ae) = 25f9ec8f39dbc92c42ddde565e3fa3a5
diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls
index 27beb14a230..9fe83f9fa9f 100644
--- a/mail/sendmail/files/site.config.m4-starttls
+++ b/mail/sendmail/files/site.config.m4-starttls
@@ -1,6 +1,5 @@
 # enable STARTTLS
-define(`confSTDIO_TYPE', `portable')
-APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include/sfio -I${LOCALBASE}/include -DSFIO')
-APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib -lsfio')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
+APPENDDEF(`confENVDEF', `-I${LOCALBASE}/include')
+APPENDDEF(`confLIBS', `-L${LOCALBASE}/lib')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK')
 APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
index 0405e3d9809..ef7106928ce 100644
--- a/mail/sendmail/patches/patch-ad
+++ b/mail/sendmail/patches/patch-ad
@@ -1,16 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2000/07/31 18:11:09 tron Exp $
+$NetBSD: patch-ad,v 1.4 2000/10/15 14:30:23 itojun Exp $
 
---- devtools/OS/SunOS.5.8	Wed Oct 27 05:02:03 1999
-+++ devtools/OS/SunOS.5.8	Wed Jul 26 13:06:34 2000
-@@ -2,8 +2,9 @@
- define(`confCC', `gcc')
- define(`confBEFORE', `sysexits.h')
--define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
+--- devtools/OS/SunOS.5.8.orig	Tue Oct 10 19:21:59 2000
++++ devtools/OS/SunOS.5.8	Tue Oct 10 19:23:59 2000
+@@ -4,4 +4,6 @@
+ define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
 +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
- define(`confENVDEF', `-DSOLARIS=20800')
+ define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
 -define(`confLIBS', `-lsocket -lnsl -lldap')
 +define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
  define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ae b/mail/sendmail/patches/patch-ae
index 1ae928ab4ef..5451cfed6bc 100644
--- a/mail/sendmail/patches/patch-ae
+++ b/mail/sendmail/patches/patch-ae
@@ -1,16 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/07/31 18:11:09 tron Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/15 14:30:23 itojun Exp $
 
---- devtools/OS/SunOS.5.9	Fri Jul 14 06:27:07 2000
-+++ devtools/OS/SunOS.5.9	Wed Jul 26 13:06:46 2000
-@@ -2,8 +2,9 @@
- define(`confCC', `gcc')
+--- devtools/OS/SunOS.5.9.orig	Tue Oct 10 19:25:30 2000
++++ devtools/OS/SunOS.5.9	Tue Oct 10 19:26:27 2000
+@@ -3,5 +3,6 @@
  define(`confBEFORE', `sysexits.h')
 -define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
 +define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
- define(`confENVDEF', `-DSOLARIS=20900')
+ define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
 -define(`confLIBS', `-lsocket -lnsl -lldap')
 +define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
  define(`confMTLDOPTS', `-lpthread')
- define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-af b/mail/sendmail/patches/patch-af
deleted file mode 100644
index 3d3cdfaef4b..00000000000
--- a/mail/sendmail/patches/patch-af
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/09/03 10:31:14 wiz Exp $
---- sendmail/recipient.c-	Sat Aug 19 00:40:04 2000
-+++ sendmail/recipient.c	Sat Aug 19 00:42:11 2000
-@@ -29,8 +29,9 @@
- static ADDRESS **chainlast;
- 
- void
--make_rcpt_hash(sendq)
-+make_rcpt_hash(sendq, e)
- 	register ADDRESS **sendq;
-+	register ENVELOPE *e;
- {
- 	ADDRESS **pq, *q;
- 	int hfunc;
-@@ -40,8 +41,14 @@
- 
- 	for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next)
- 	{
--		char *p = q->q_paddr;
-+		char *p;
-+		ADDRESS *a;
- 
-+		a = parseaddr(q->q_paddr, NULLADDR, RF_COPYALL, '\0', NULL, e);
-+		if (a == NULL)
-+			p = "";
-+		else
-+			p = a->q_user;
- 		hfunc = 0;
- 		while (*p != '\0')
- 		{
-@@ -561,9 +568,15 @@
- 	if (use_hash)
- 	{
- 		/* get hash entry */
--		char *p = a->q_paddr;
--		hfunc = 0;
-+		char *p;
-+		register ADDRESS *b;
- 
-+		b = parseaddr(a->q_paddr, NULLADDR, RF_COPYALL, '\0', NULL, e);
-+		if (b == NULL)
-+			p = "";
-+		else
-+			p = b->q_user;
-+		hfunc = 0;
- 		while (*p != '\0')
- 		{
- 			int c = *p++;
-@@ -1588,7 +1601,7 @@
- 	ctladdr->q_flags &= ~QSELFREF;
- 	nincludes = 0;
- #if RCPT_HASH
--	make_rcpt_hash(sendq);
-+	make_rcpt_hash(sendq, e);
- #endif
- 	while (fgets(buf, sizeof buf, fp) != NULL && !maxreached)
- 	{
-@@ -1605,7 +1618,14 @@
- 			    isascii(p[-1]) && isspace(p[-1]) &&
- 			    (p[3] == '\0' || (isascii(p[3]) && isspace(p[3]))))
- 			{
-+#if 1
-+				p--;
-+				while (p > buf && isspace(p[-1]))
-+					p--;
-+				p[0] = '\0';
-+#else
- 				p[-1] = '\0';
-+#endif
- 				break;
- 			}
- 		}