Initial import of "sendmail88" package:

The well known Mail Transport Agent

This package replaces the "sendmail" 8.8.8 distribution in the main
source tree.

29 files changed, 741 insertions, 0 deletions

diff --git a/mail/sendmail88/patches/patch-aa b/mail/sendmail88/patches/patch-aa
new file mode 100644
index 00000000000..040c7a0ae53
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aa
@@ -0,0 +1,95 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/cf/Makefile.orig	Mon Apr  7 23:39:36 1997
++++ cf/cf/Makefile	Sat Feb 12 23:29:03 2000
+@@ -1,3 +1,5 @@
++#	$NetBSD: patch-aa,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
++#
+ #	@(#)Makefile	8.19 (Berkeley) 1/14/97
+ 
+ #
+@@ -11,7 +13,6 @@
+ #
+ 
+ M4=	m4
+-#M4=	/usr/src/usr.bin/m4/obj/m4
+ CFDIR=	..
+ CHMOD=	chmod
+ ROMODE=	444
+@@ -21,24 +22,29 @@
+ 
+ .mc.cf:
+ 	$(RM) $@
+-	(cd ${.CURDIR} && $(M4) ${CFDIR}/m4/cf.m4 ${@:R}.mc > obj/$@)
++	(cd ${.CURDIR} && $(M4) ${@:R}.mc > ${.OBJDIR}/$@)
+ 	$(CHMOD) $(ROMODE) $@
+ 
+-ALL=	generic-bsd4.4.cf generic-hpux9.cf generic-hpux10.cf \
+-		generic-osf1.cf generic-solaris2.cf \
+-		generic-sunos4.1.cf generic-ultrix4.cf \
+-	cs-hpux9.cf cs-osf1.cf cs-solaris2.cf \
+-		cs-sunos4.1.cf cs-ultrix4.cf \
+-	s2k-osf1.cf s2k-ultrix4.cf \
+-	chez.cs.cf huginn.cs.cf mail.cs.cf mail.eecs.cf mailspool.cs.cf \
+-		python.cs.cf ucbarpa.cf ucbvax.cf vangogh.cs.cf knecht.cf
++ALL= netbsd-proto.cf
++
++OTHERS= clientproto.cf tcpproto.cf uucpproto.cf
++
++FILES=	clientproto.mc netbsd-proto.mc tcpproto.mc uucpproto.mc Makefile
+ 
+-all: $(ALL)
++FILESDIR= ${PREFIX}/share/sendmail/cf
+ 
+-clean cleandir:
++realall: $(ALL)
++
++others: $(OTHERS)
++
++clean cleandir distclean:
+ 	$(RM) $(ALL) core
+ 
+-depend install: 
++realdepend:
++
++distribution:
++	${INSTALL} -c -o root -g wheel -m 444 netbsd-proto.cf \
++	    ${DESTDIR}/etc/sendmail.cf
+ 
+ # this is overkill, but....
+ M4FILES=\
+@@ -78,29 +84,7 @@
+ 	${CFDIR}/mailer/smtp.m4 \
+ 	${CFDIR}/mailer/usenet.m4 \
+ 	${CFDIR}/mailer/uucp.m4 \
+-	${CFDIR}/ostype/aix3.m4 \
+-	${CFDIR}/ostype/amdahl-uts.m4 \
+-	${CFDIR}/ostype/aux.m4 \
+-	${CFDIR}/ostype/bsd4.3.m4 \
+ 	${CFDIR}/ostype/bsd4.4.m4 \
+-	${CFDIR}/ostype/bsdi1.0.m4 \
+-	${CFDIR}/ostype/dgux.m4 \
+-	${CFDIR}/ostype/domainos.m4 \
+-	${CFDIR}/ostype/dynix3.2.m4 \
+-	${CFDIR}/ostype/hpux9.m4 \
+-	${CFDIR}/ostype/irix4.m4 \
+-	${CFDIR}/ostype/irix5.m4 \
+-	${CFDIR}/ostype/linux.m4 \
+-	${CFDIR}/ostype/nextstep.m4 \
+-	${CFDIR}/ostype/osf1.m4 \
+-	${CFDIR}/ostype/ptx2.m4 \
+-	${CFDIR}/ostype/riscos4.5.m4 \
+-	${CFDIR}/ostype/sco3.2.m4 \
+-	${CFDIR}/ostype/solaris2.m4 \
+-	${CFDIR}/ostype/sunos3.5.m4 \
+-	${CFDIR}/ostype/sunos4.1.m4 \
+-	${CFDIR}/ostype/svr4.m4 \
+-	${CFDIR}/ostype/ultrix4.m4 \
+ 	${CFDIR}/siteconfig/uucp.cogsci.m4 \
+ 	${CFDIR}/siteconfig/uucp.old.arpa.m4 \
+ 	${CFDIR}/siteconfig/uucp.ucbarpa.m4 \
+@@ -109,3 +93,4 @@
+ $(ALL):  $(M4FILES)
+ 
+ .include <bsd.prog.mk>
++.include <bsd.files.mk>
diff --git a/mail/sendmail88/patches/patch-ab b/mail/sendmail88/patches/patch-ab
new file mode 100644
index 00000000000..04d7fd3e163
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/feature/smrsh.m4.orig	Mon Apr  7 23:39:39 1997
++++ cf/feature/smrsh.m4	Sat Feb 12 23:28:26 2000
+@@ -39,4 +39,4 @@
+ 
+ ifdef(`_MAILER_local_',
+ 	`errprint(`*** FEATURE(smrsh) must occur before MAILER(local)')')dnl
+-define(`LOCAL_SHELL_PATH', ifelse(_ARG_, `', `/usr/local/etc/smrsh', _ARG_))
++define(`LOCAL_SHELL_PATH', ifelse(_ARG_, `', `/usr/pkg/libexec/sendmail/smrsh', _ARG_))
diff --git a/mail/sendmail88/patches/patch-ac b/mail/sendmail88/patches/patch-ac
new file mode 100644
index 00000000000..ae8af9d9c43
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/m4/proto.m4.orig	Fri Aug  1 02:26:36 1997
++++ cf/m4/proto.m4	Sat Feb 12 23:28:26 2000
+@@ -148,22 +148,22 @@
+ # Mailer table (overriding domains)
+ ifdef(`MAILER_TABLE',
+ 	`Kmailertable MAILER_TABLE',
+-	`#Kmailertable dbm /etc/mailertable')
++	`#Kmailertable hash /etc/mailertable')
+ 
+ # Domain table (adding domains)
+ ifdef(`DOMAIN_TABLE',
+ 	`Kdomaintable DOMAIN_TABLE',
+-	`#Kdomaintable dbm /etc/domaintable')
++	`#Kdomaintable hash /etc/domaintable')
+ 
+ # Generics table (mapping outgoing addresses)
+ ifdef(`GENERICS_TABLE',
+ 	`Kgenerics GENERICS_TABLE',
+-	`#Kgenerics dbm /etc/genericstable')
++	`#Kgenerics hash /etc/genericstable')
+ 
+ # Virtual user table (maps incoming users)
+ ifdef(`VIRTUSER_TABLE',
+ 	`Kvirtuser VIRTUSER_TABLE',
+-	`#Kvirtuser dbm /etc/virtusertable')
++	`#Kvirtuser hash /etc/virtusertable')
+ 
+ # who I send unqualified names to (null means deliver locally)
+ DR`'ifdef(`LOCAL_RELAY', LOCAL_RELAY)
diff --git a/mail/sendmail88/patches/patch-ad b/mail/sendmail88/patches/patch-ad
new file mode 100644
index 00000000000..8cd9029c073
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/README.orig	Tue Sep 23 17:42:00 1997
++++ cf/README	Sat Feb 12 23:28:26 2000
+@@ -730,9 +730,9 @@
+ smrsh		Use the SendMail Restricted SHell (smrsh) provided
+ 		with the distribution instead of /bin/sh for mailing
+ 		to programs.  This improves the ability of the local
+-		system administrator to control what gets run via
+-		e-mail.  If an argument is provided it is used as the
+-		pathname to smrsh; otherwise, /usr/local/etc/smrsh is
++		system administrator to control what gets run via e-mail.
++		If an argument is provided it is used as the pathname to
++		smrsh; otherwise, /usr/pkg/libexec/sendmail/smrsh is
+ 		assumed.
+ 
+ 
diff --git a/mail/sendmail88/patches/patch-ae b/mail/sendmail88/patches/patch-ae
new file mode 100644
index 00000000000..536f471f312
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- contrib/bitdomain.c.orig	Fri Oct 27 16:22:19 1995
++++ contrib/bitdomain.c	Sat Feb 12 23:28:26 2000
+@@ -51,7 +51,7 @@
+ {
+     int opt;
+ 
+-    while ((opt = getopt(argc, argv, "o:")) != EOF) {
++    while ((opt = getopt(argc, argv, "o:")) != -1) {
+ 	switch (opt) {
+ 	case 'o':
+ 	    if (!freopen(optarg, "w", stdout)) {
diff --git a/mail/sendmail88/patches/patch-af b/mail/sendmail88/patches/patch-af
new file mode 100644
index 00000000000..3f7a42e8b66
--- /dev/null
+++ b/mail/sendmail88/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mail.local/mail.local.c.orig	Sat Aug  2 16:20:08 1997
++++ mail.local/mail.local.c	Sat Feb 12 23:28:26 2000
+@@ -220,7 +220,7 @@
+ #endif
+ 
+ 	from = NULL;
+-	while ((ch = getopt(argc, argv, "df:r:")) != EOF)
++	while ((ch = getopt(argc, argv, "df:r:")) != -1)
+ 		switch(ch) {
+ 		case 'd':		/* Backward compatible. */
+ 			break;
diff --git a/mail/sendmail88/patches/patch-ag b/mail/sendmail88/patches/patch-ag
new file mode 100644
index 00000000000..9b079786ae0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/Makefile.orig	Sat Sep 21 20:38:18 1996
++++ mailstats/Makefile	Sat Feb 12 23:28:26 2000
+@@ -1,8 +1,7 @@
+ #	@(#)Makefile	8.2 (Berkeley) 9/21/96
+ 
+ PROG=	mailstats
+-MAN8=	mailstats.0
+-CFLAGS+=-I${.CURDIR}/../src
++MAN=	mailstats.8
++CPPFLAGS+=-I${.CURDIR}/../src
+ 
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-ah b/mail/sendmail88/patches/patch-ah
new file mode 100644
index 00000000000..ff7a034e0aa
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/mailstats.8.orig	Sat Sep 21 20:31:16 1996
++++ mailstats/mailstats.8	Sat Feb 12 23:28:26 2000
+@@ -1,7 +1,7 @@
+ .\"	@(#)mailstats.8	8.1 (Berkeley) 9/21/96
+ .Dd April 25, 1996
+ .Dt MAILSTATS 1
+-.Os BSD 3
++.Os
+ .Sh NAME
+ .Nm mailstats
+ .Nd display mail statistics
diff --git a/mail/sendmail88/patches/patch-ai b/mail/sendmail88/patches/patch-ai
new file mode 100644
index 00000000000..4c4b04c9870
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/mailstats.c.orig	Fri May 30 21:05:20 1997
++++ mailstats/mailstats.c	Sat Feb 12 23:28:26 2000
+@@ -73,7 +73,7 @@
+ 	cfile = _PATH_SENDMAILCF;
+ 	sfile = NULL;
+ 	mnames = TRUE;
+-	while ((ch = getopt(argc, argv, "C:f:o")) != EOF)
++	while ((ch = getopt(argc, argv, "C:f:o")) != -1)
+ 	{
+ 		switch (ch)
+ 		{
diff --git a/mail/sendmail88/patches/patch-aj b/mail/sendmail88/patches/patch-aj
new file mode 100644
index 00000000000..f4635614517
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/Makefile.orig	Wed Jun 11 01:03:15 1997
++++ makemap/Makefile	Sat Feb 12 23:28:26 2000
+@@ -1,13 +1,10 @@
+ #	@(#)Makefile	8.4 (Berkeley) 6/10/97
+ 
+ PROG=	makemap
+-MAN8=	makemap.0
+-CFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL
++MAN=	makemap.8
++CPPFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL
+ 
+ SRCS=	makemap.c safefile.c
+ 
+-safefile.c: ${.CURDIR}/../src/safefile.c
+-	ln -s ${.CURDIR}/../src/safefile.c
+-
+-.include "../../Makefile.inc"
++.PATH: ${.CURDIR}/../src
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-ak b/mail/sendmail88/patches/patch-ak
new file mode 100644
index 00000000000..bcba8676465
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/makemap.8.orig	Wed Jul 23 17:03:35 1997
++++ makemap/makemap.8	Sat Feb 12 23:28:26 2000
+@@ -33,7 +33,7 @@
+ .\"
+ .Dd November 16, 1992
+ .Dt MAKEMAP 8
+-.Os BSD 4.4
++.Os
+ .Sh NAME
+ .Nm makemap
+ .Nd create database maps for sendmail
diff --git a/mail/sendmail88/patches/patch-al b/mail/sendmail88/patches/patch-al
new file mode 100644
index 00000000000..bab2dac2caf
--- /dev/null
+++ b/mail/sendmail88/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/makemap.c.orig	Tue Sep 23 18:11:10 1997
++++ makemap/makemap.c	Sat Feb 12 23:28:26 2000
+@@ -37,7 +37,7 @@
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #ifndef ISC_UNIX
+ # include <sys/file.h>
+ #endif
+@@ -152,7 +152,7 @@
+ #else
+ #define OPTIONS		"Ndforv"
+ #endif
+-	while ((opt = getopt(argc, argv, OPTIONS)) != EOF)
++	while ((opt = getopt(argc, argv, OPTIONS)) != -1)
+ 	{
+ 		switch (opt)
+ 		{
diff --git a/mail/sendmail88/patches/patch-am b/mail/sendmail88/patches/patch-am
new file mode 100644
index 00000000000..8c9a138f766
--- /dev/null
+++ b/mail/sendmail88/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/Makefile.orig	Sat Sep 21 20:30:41 1996
++++ praliases/Makefile	Sat Feb 12 23:28:26 2000
+@@ -1,9 +1,7 @@
+ #	@(#)Makefile	8.2 (Berkeley) 9/21/96
+ 
+ PROG=	praliases
+-MAN8=	praliases.0
+-CFLAGS+=-I${.CURDIR}/../src
+-DPADD=	${LIBDBM}
++MAN=	praliases.8
++CPPFLAGS+=-I${.CURDIR}/../src
+ 
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-an b/mail/sendmail88/patches/patch-an
new file mode 100644
index 00000000000..8e1986e06e0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/praliases.8.orig	Sat Sep 21 20:29:04 1996
++++ praliases/praliases.8	Sat Feb 12 23:28:27 2000
+@@ -1,7 +1,7 @@
+ .\"	@(#)praliases.8	8.1 (Berkeley) 9/21/96
+ .Dd April 25, 1996
+ .Dt PRALIASES 1
+-.Os BSD 3
++.Os
+ .Sh NAME
+ .Nm praliases
+ .Nd display system mail aliases
diff --git a/mail/sendmail88/patches/patch-ao b/mail/sendmail88/patches/patch-ao
new file mode 100644
index 00000000000..a6d1f92f228
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/praliases.c.orig	Thu May 29 01:52:17 1997
++++ praliases/praliases.c	Sat Feb 12 23:28:27 2000
+@@ -67,7 +67,7 @@
+ #endif
+ 
+ 	filename = "/etc/aliases";
+-	while ((ch = getopt(argc, argv, "f:")) != EOF)
++	while ((ch = getopt(argc, argv, "f:")) != -1)
+ 		switch((char)ch) {
+ 		case 'f':
+ 			filename = optarg;
diff --git a/mail/sendmail88/patches/patch-ap b/mail/sendmail88/patches/patch-ap
new file mode 100644
index 00000000000..a0b946efab4
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- smrsh/Makefile.orig	Sun Jul  2 17:34:31 1995
++++ smrsh/Makefile	Sat Feb 12 23:28:27 2000
+@@ -1,8 +1,9 @@
+ #	@(#)Makefile	8.1 (Berkeley) 7/2/95
+ 
++BINDIR=	${PREFIX}/libexec/sendmail
+ PROG=	smrsh
+-MAN8=	smrsh.0
+-CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
++MAN=	smrsh.8
++CPPFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
++CPPFLAGS+=-DCMDDIR=\"${PREFIX}/libexec/sendmail/sm.bin\"
+ 
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-aq b/mail/sendmail88/patches/patch-aq
new file mode 100644
index 00000000000..52bd08b1521
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aq
@@ -0,0 +1,37 @@
+$NetBSD: patch-aq,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- smrsh/smrsh.8.orig	Wed Jan 10 01:53:51 1996
++++ smrsh/smrsh.8	Sat Feb 12 23:28:27 2000
+@@ -59,7 +59,7 @@
+ Briefly,
+ .I smrsh
+ limits programs to be in the directory
+-/usr/adm/sm.bin,
++/usr/libexec/sm.bin,
+ allowing the system administrator to choose the set of acceptable commands.
+ It also rejects any commands with the characters
+ `\`', `<', `>', `|', `;', `&', `$', `(', `)', `\er' (carriage return),
+@@ -73,10 +73,10 @@
+ and
+ ``vacation''
+ all actually forward to
+-``/usr/adm/sm.bin/vacation''.
++``/usr/libexec/sm.bin/vacation''.
+ .PP
+ System administrators should be conservative about populating
+-/usr/adm/sm.bin.
++/usr/libexec/sm.bin.
+ Reasonable additions are
+ .IR vacation (1),
+ .IR procmail (1),
+@@ -98,8 +98,8 @@
+ (defaults to ``/bin:/usr/bin:/usr/ucb'')
+ and/or \-DCMDBIN=\e"\fIdir\fP\e"
+ to change the default program directory
+-(defaults to ``/usr/adm/sm.bin'').
++(defaults to ``/usr/libexec/sm.bin'').
+ .SH FILES
+-/usr/adm/sm.bin \- directory for restricted programs
++/usr/libexec/sm.bin \- directory for restricted programs
+ .SH SEE ALSO
+ sendmail(8)
diff --git a/mail/sendmail88/patches/patch-ar b/mail/sendmail88/patches/patch-ar
new file mode 100644
index 00000000000..5952e6e85f4
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- smrsh/smrsh.c.orig	Mon Oct 20 01:04:08 1997
++++ smrsh/smrsh.c	Sat Feb 12 23:28:27 2000
+@@ -80,7 +80,7 @@
+ 
+ /* directory in which all commands must reside */
+ #ifndef CMDDIR
+-# define CMDDIR		"/usr/adm/sm.bin"
++# define CMDDIR		"/usr/libexec/sm.bin"
+ #endif
+ 
+ /* characters disallowed in the shell "-c" argument */
diff --git a/mail/sendmail88/patches/patch-as b/mail/sendmail88/patches/patch-as
new file mode 100644
index 00000000000..6c85cb0900f
--- /dev/null
+++ b/mail/sendmail88/patches/patch-as
@@ -0,0 +1,62 @@
+$NetBSD: patch-as,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/Makefile.orig	Fri Mar 28 18:06:01 1997
++++ src/Makefile	Sat Feb 12 23:28:27 2000
+@@ -5,6 +5,8 @@
+ #  the "makesendmail" script.						#
+ #########################################################################
+ 
++.include <bsd.own.mk>
++
+ PROG=	sendmail
+ 
+ # define the database format to use for aliases et al.  Can be -DNEWDB (for
+@@ -15,33 +17,32 @@
+ # databases are read, but the new format will be used on any rebuilds.  On
+ # really gnarly systems, you can set this to null; it will crawl like a high
+ # spiral snail, but it will work.
+-DBMDEF=	-DNEWDB
++DBMDEF=	-DNEWDB -DNIS
+ 
+-CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
++CPPFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -DTCPWRAPPERS
++LDADD+=-lwrap
++DPADD+=${LIBWRAP}
+ 
+ SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
+ 	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
+ 	mci.c mime.c parseaddr.c queue.c readcf.c recipient.c safefile.c \
+ 	savemail.c srvrsmtp.c stab.c stats.c sysexits.c trace.c udb.c \
+ 	usersmtp.c util.c version.c
+-DPADD=	
+-LDADD=	
+-MAN1=	mailq.0 newaliases.0
+-MAN5=	aliases.0
+-MAN8=	sendmail.0 
+-LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
+-	/usr/sbin/sendmail /usr/bin/mailq
+-BINDIR=	/usr/sbin
++MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
++# symlinks are now made by the mailwrapper make file
++#SYMLINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
++#		/usr/sbin/sendmail /usr/bin/mailq
++BINDIR=	${PREFIX}/libexec/sendmail
+ BINOWN=	root
+ BINGRP=	kmem
+ BINMODE=6555
++.if ${MKSHARE} != "no"
++FILES=sendmail.hf
++FILESDIR=${PREFIX}/share/misc
++.endif
+ 
+-beforeinstall:
+-#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+-#	    ${DESTDIR}/etc/sendmail.fc
+-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
++afterinstall:
++	${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ 	    ${DESTDIR}/var/log/sendmail.st
+-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+-	    ${DESTDIR}/usr/share/misc
+ 
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-at b/mail/sendmail88/patches/patch-at
new file mode 100644
index 00000000000..f7b1ef9f921
--- /dev/null
+++ b/mail/sendmail88/patches/patch-at
@@ -0,0 +1,37 @@
+$NetBSD: patch-at,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/aliases.5.orig	Sun Feb  2 01:24:50 1997
++++ src/aliases.5	Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt ALIASES 5
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm aliases
+ .Nd aliases file for sendmail
+@@ -83,7 +83,6 @@
+ .Sh SEE  ALSO
+ .Xr newaliases 1 ,
+ .Xr dbopen 3 ,
+-.Xr dbm 3 ,
+ .Xr sendmail 8
+ .Rs
+ .%T "SENDMAIL Installation and Operation Guide"
+@@ -91,15 +90,6 @@
+ .Rs
+ .%T "SENDMAIL An Internetwork Mail Router"
+ .Re
+-.Sh BUGS
+-If you have compiled
+-.Xr sendmail
+-with DBM support instead of NEWDB,
+-you may have encountered problems in
+-.Xr dbm 3
+-restricting a single alias to about 1000 bytes of information.
+-You can get longer aliases by ``chaining''; that is, make the last name in
+-the alias be a dummy name which is a continuation alias.
+ .Sh HISTORY
+ The
+ .Nm
diff --git a/mail/sendmail88/patches/patch-au b/mail/sendmail88/patches/patch-au
new file mode 100644
index 00000000000..fa90200b215
--- /dev/null
+++ b/mail/sendmail88/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/arpadate.c.orig	Sun Feb  2 01:24:49 1997
++++ src/arpadate.c	Sat Feb 12 23:28:27 2000
+@@ -86,7 +86,7 @@
+ 	register struct tm *lt;
+ 	time_t t;
+ 	struct tm gmt;
+-	char *tz;
++	const char *tz;
+ 	static char b[43 + TZNAME_MAX];
+ 
+ 	/*
diff --git a/mail/sendmail88/patches/patch-av b/mail/sendmail88/patches/patch-av
new file mode 100644
index 00000000000..b56fedd46ae
--- /dev/null
+++ b/mail/sendmail88/patches/patch-av
@@ -0,0 +1,50 @@
+$NetBSD: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/conf.c.orig	Mon Oct 20 17:41:38 1997
++++ src/conf.c	Sat Feb 12 23:28:27 2000
+@@ -1973,7 +1973,7 @@
+ 
+ /* Non Apollo stuff removed by Don Lewis 11/15/93 */
+ #ifndef lint
+-static char  rcsid[] = "@(#)$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";
++static char  rcsid[] = "@(#)$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";
+ #endif /* !lint */
+ 
+ #ifdef apollo
+@@ -2939,7 +2939,7 @@
+  * causing nast effects.
+  **************************************************************/
+ 
+-/*static char _id[] = "$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";*/
++/*static char _id[] = "$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";*/
+ static void	sm_dopr();
+ static char	*DoprEnd;
+ static int	SnprfOverflow;
+@@ -2997,7 +2997,7 @@
+ 
+ static void fmtstr __P((char *value, int ljust, int len, int zpad, int maxwidth));
+ static void fmtnum __P((long value, int base, int dosign, int ljust, int len, int zpad));
+-static void dostr __P(( char * , int ));
++static void dostr __P(( const char * , int ));
+ static char *output;
+ static void dopr_outch __P(( int c ));
+ static int	SyslogErrno;
+@@ -3218,7 +3218,7 @@
+ 
+ static void
+ dostr( str , cut)
+-     char *str;
++     const char *str;
+      int cut;
+ {
+   if (cut) {
+@@ -3315,8 +3315,7 @@
+ 	char *shell;
+ {
+ #if HASGETUSERSHELL
+-	register char *p;
+-	extern char *getusershell();
++	register const char *p;
+ 
+ 	if (shell == NULL || shell[0] == '\0' || wordinclass(user, 't') ||
+ 	    ConfigLevel <= 1)
diff --git a/mail/sendmail88/patches/patch-aw b/mail/sendmail88/patches/patch-aw
new file mode 100644
index 00000000000..1fcfcc906b0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aw
@@ -0,0 +1,46 @@
+$NetBSD: patch-aw,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/daemon.c.orig	Thu Oct 23 19:26:05 1997
++++ src/daemon.c	Sat Feb 12 23:28:27 2000
+@@ -814,15 +814,13 @@
+ 
+ 	if (host[0] == '[')
+ 	{
+-		long hid;
+ 		register char *p = strchr(host, ']');
+ 
+ 		if (p != NULL)
+ 		{
+ 			*p = '\0';
+ #if NETINET
+-			hid = inet_addr(&host[1]);
+-			if (hid == INADDR_NONE)
++			if (inet_aton(&host[1], &addr.sin.sin_addr) == 0)
+ #endif
+ 			{
+ 				/* try it as a host name (avoid MX lookup) */
+@@ -856,7 +854,6 @@
+ 		}
+ #if NETINET
+ 		addr.sin.sin_family = AF_INET;		/*XXX*/
+-		addr.sin.sin_addr.s_addr = hid;
+ #endif
+ 	}
+ 	else
+@@ -1131,6 +1128,7 @@
+ 	{
+ 		(void) strcpy(hostbuf, "localhost");
+ 	}
++	hostbuf[size - 1] = '\0';
+ 	hp = sm_gethostbyname(hostbuf);
+ 	if (hp == NULL)
+ 		return NULL;
+@@ -1721,7 +1719,7 @@
+ 	if ((cp = strchr(name, ']')) == NULL)
+ 		return (NULL);
+ 	*cp = '\0';
+-	in_addr.s_addr = inet_addr(&name[1]);
++	(void) inet_aton(&name[1], &in_addr);
+ 	*cp = ']';
+ 
+ 	/* nope -- ask the name server */
diff --git a/mail/sendmail88/patches/patch-ax b/mail/sendmail88/patches/patch-ax
new file mode 100644
index 00000000000..7ebca8306c9
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ax
@@ -0,0 +1,20 @@
+$NetBSD: patch-ax,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/domain.c.orig	Sat Aug  2 20:06:53 1997
++++ src/domain.c	Sat Feb 12 23:28:27 2000
+@@ -362,13 +362,14 @@
+ 		if (host[0] == '[')
+ 		{
+ 			register char *p;
++			struct in_addr junk;
+ 
+ 			/* this may be an MX suppression-style address */
+ 			p = strchr(MXHostBuf, ']');
+ 			if (p != NULL)
+ 			{
+ 				*p = '\0';
+-				if (inet_addr(&MXHostBuf[1]) != INADDR_NONE)
++				if (inet_aton(&MXHostBuf[1], &junk) != 0)
+ 				{
+ 					nmx++;
+ 					*p = ']';
diff --git a/mail/sendmail88/patches/patch-ay b/mail/sendmail88/patches/patch-ay
new file mode 100644
index 00000000000..44c5f57cfa9
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ay
@@ -0,0 +1,21 @@
+$NetBSD: patch-ay,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/mailq.1.orig	Sun Feb  2 01:24:53 1997
++++ src/mailq.1	Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt MAILQ 1
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm mailq
+ .Nd print the mail queue
+@@ -81,6 +81,7 @@
+ .Nm mailq
+ utility exits 0 on success, and >0 if an error occurs.
+ .Sh SEE ALSO
++.Xr mailer.conf 5 ,
+ .Xr sendmail 8
+ .Sh HISTORY
+ The
diff --git a/mail/sendmail88/patches/patch-az b/mail/sendmail88/patches/patch-az
new file mode 100644
index 00000000000..cdc12dc877e
--- /dev/null
+++ b/mail/sendmail88/patches/patch-az
@@ -0,0 +1,12 @@
+$NetBSD: patch-az,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/map.c.orig	Tue Oct 21 14:28:06 1997
++++ src/map.c	Sat Feb 12 23:28:27 2000
+@@ -1139,6 +1139,7 @@
+ 			ndbm_map_store(map, "YP_LAST_MODIFIED", buf);
+ 
+ 			(void) gethostname(buf, sizeof buf);
++			buf[sizeof(buf) - 1] = '\0';
+ 			ndbm_map_store(map, "YP_MASTER_NAME", buf);
+ 
+ 			map->map_mflags = save_mflags;
diff --git a/mail/sendmail88/patches/patch-ba b/mail/sendmail88/patches/patch-ba
new file mode 100644
index 00000000000..4f7f3296102
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ba
@@ -0,0 +1,21 @@
+$NetBSD: patch-ba,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/newaliases.1.orig	Sun Feb  2 01:24:51 1997
++++ src/newaliases.1	Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt NEWALIASES 1
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm newaliases
+ .Nd rebuild the data base for the mail aliases file
+@@ -61,6 +61,7 @@
+ .El
+ .Sh SEE ALSO
+ .Xr aliases 5 ,
++.Xr mailer.conf 5 ,
+ .Xr sendmail 8
+ .Sh HISTORY
+ The
diff --git a/mail/sendmail88/patches/patch-bb b/mail/sendmail88/patches/patch-bb
new file mode 100644
index 00000000000..6d0d9e7622a
--- /dev/null
+++ b/mail/sendmail88/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/queue.c.orig	Sat Oct  4 18:46:18 1997
++++ src/queue.c	Sat Feb 12 23:28:27 2000
+@@ -1070,6 +1070,8 @@
+ 	(void) closedir(f);
+ 	wn++;
+ 
++	if (WorkList == NULL)
++		return (0);
+ 	wc = min(wn, WorkListSize);
+ 	if (wc > MaxQueueRun && MaxQueueRun > 0)
+ 		wc = MaxQueueRun;
diff --git a/mail/sendmail88/patches/patch-bc b/mail/sendmail88/patches/patch-bc
new file mode 100644
index 00000000000..21704981739
--- /dev/null
+++ b/mail/sendmail88/patches/patch-bc
@@ -0,0 +1,61 @@
+$NetBSD: patch-bc,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/sendmail.8.orig	Sun Feb  2 01:24:50 1997
++++ src/sendmail.8	Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt SENDMAIL 8
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm sendmail
+ .Nd an electronic mail transport agent
+@@ -142,9 +142,9 @@
+ Verify mode is normally used for validating
+ users or mailing lists.
+ .It Fl C Ns Ar file
+-Use alternate configuration file.
++Use alternative configuration file.
+ .Nm Sendmail
+-refuses to run as root if an alternate configuration file is specified.
++refuses to run as root if an alternative configuration file is specified.
+ .It Fl d Ns Ar X
+ Set debugging value to
+ .Ar X .
+@@ -268,7 +268,7 @@
+ .Ql hdrs
+ to return only the headers.
+ .It Fl r Ns Ar name
+-An alternate and obsolete form of the
++An alternative and obsolete form of the
+ .Fl f
+ flag.
+ .It Fl t
+@@ -324,7 +324,7 @@
+ The options are:
+ .Bl -tag -width Fl
+ .It Li AliasFile= Ns Ar file
+-Use alternate alias file.
++Use alternative alias file.
+ .It Li HoldExpensive
+ On mailers that are considered ``expensive'' to connect to,
+ don't initiate immediate connection.
+@@ -576,13 +576,14 @@
+ The process id of the daemon
+ .El
+ .Sh SEE ALSO
+-.Xr binmail 1 ,
+ .Xr mail 1 ,
+-.Xr rmail 1 ,
+ .Xr syslog 3 ,
+ .Xr aliases 5 ,
++.Xr mailer.conf 5 ,
+ .Xr mailaddr 7 ,
+-.Xr rc 8 ;
++.Xr mail.local 8 ,
++.Xr rc 8 ,
++.Xr rmail 8 ;
+ .Pp
+ DARPA
+ Internet Request For Comments