Update to Sendmail 8.8.4, plus recent patches, plus OpenBSD support.

Also include entire example configuration subset.
Includes smrsh (using /usr/libexec/sm.bin).

Of the top of my head, the only things I removed from the distribution were
contrib/mail.local.linux, src/Makefiles, all the *.0 and *.ps files.
Our praliases man page replaces the distributed one, ours is better.

3 files changed, 89 insertions, 2 deletions

diff --git a/usr.sbin/sendmail/praliases/Makefile b/usr.sbin/sendmail/praliases/Makefile
index 18015f888be..d3b4478f1fa 100644
--- a/usr.sbin/sendmail/praliases/Makefile
+++ b/usr.sbin/sendmail/praliases/Makefile
@@ -1,7 +1,8 @@
+#	$OpenBSD: Makefile,v 1.3 1996/12/14 21:16:51 downsj Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
 
 PROG=	praliases
-CFLAGS+=-I${.CURDIR}/../src
+CFLAGS+=-I${.CURDIR}/../src -DNEWDB
 MAN=	praliases.1
 
 .include "../../Makefile.inc"
diff --git a/usr.sbin/sendmail/praliases/Makefile.dist b/usr.sbin/sendmail/praliases/Makefile.dist
new file mode 100644
index 00000000000..093f6abbe53
--- /dev/null
+++ b/usr.sbin/sendmail/praliases/Makefile.dist
@@ -0,0 +1,85 @@
+#
+#  This Makefile is designed to work on the old "make" program.  It does
+#  not use the obj subdirectory.  It also does not install documentation
+#  automatically -- think of it as a quick start for sites that have the
+#  old make program (I recommend that you get and port the new make if you
+#  are going to be doing any signficant work on sendmail).
+#
+#	@(#)Makefile.dist	8.2 (Berkeley) 9/21/96
+#
+
+# use O=-O (usual) or O=-g (debugging)
+O=	-O
+
+# location of sendmail source directory
+SRCDIR=	../src
+
+# define the database mechanisms available for map & alias lookups:
+#	-DNDBM -- use new DBM
+#	-DNEWDB -- use new Berkeley DB
+# The really old (V7) DBM library is no longer supported.
+#
+DBMDEF=	-DNDBM -DNEWDB
+
+# environment definitions (e.g., -D_AIX3)
+ENVDEF=
+
+# see also conf.h for additional compilation flags
+
+# include directories
+INCDIRS=-I${SRCDIR} -I/usr/sww/include/db
+
+# loader options
+LDOPTS=
+
+# library directories
+LIBDIRS=-L/usr/sww/lib
+
+# libraries required on your system
+LIBS=	-ldb -ldbm
+
+# location of praliases binary (usually /usr/sbin or /usr/etc)
+BINDIR=	${DESTDIR}/usr/sbin
+
+# additional .o files needed
+OBJADD=
+
+###################  end of user configuration flags  ######################
+
+CFLAGS=	-I. $O ${INCDIRS} ${DBMDEF} ${ENVDEF}
+
+OBJS=	praliases.o ${OBJADD}
+
+LINKS=	${DESTDIR}/usr/ucb/newaliases ${DESTDIR}/usr/ucb/mailq
+BINOWN=	bin
+BINGRP=	bin
+BINMODE=555
+
+ALL=	praliases praliases.0
+
+all: ${ALL}
+
+praliases: ${BEFORE} ${OBJS}
+	${CC} -o praliases ${LDOPTS} ${OBJS} ${LIBDIRS} ${LIBS}
+
+#NROFF=	nroff -h
+NROFF=	groff -Tascii
+MANDOC=	-mandoc
+
+praliases.0: praliases.8
+	${NROFF} ${MANDOC} praliases.8 > praliases.0
+
+install: install-praliases install-docs
+
+install-praliases: praliases
+	install -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} praliases ${BINDIR}
+
+# doesn't actually install them -- you may want to install pre-nroff versions
+install-docs: praliases.0
+
+clean:
+	rm -f ${OBJS} praliases praliases.0
+
+# dependencies
+#   gross overkill, and yet still not quite enough....
+${OBJS}: ${SRCDIR}/conf.h
diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
index 2c22279205e..2c1cc0a07de 100644
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -39,10 +39,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)praliases.c	8.3 (Berkeley) 3/6/94";
+static char sccsid[] = "@(#)praliases.c	8.4 (Berkeley) 9/25/96";
 #endif /* not lint */
 
 #include <ndbm.h>
+#define NOT_SENDMAIL
 #include <sendmail.h>
 #ifdef NEWDB
 #include <db.h>