Update the freefall.mc file to (almost) match what is actually being

run on freefall..
Create freebsd.mc which is intended to be installed by src/etc/Makefile
onto generic freebsd systems.

3 files changed, 83 insertions, 16 deletions

diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
index 90372b7..06cb3a9 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -21,17 +21,22 @@ RM=	rm -f
 
 .mc.cf:
 	$(RM) $@
-	(cd ${.CURDIR} && $(M4) ${CFDIR}/m4/cf.m4 ${@:R}.mc > $@)
+	(cd ${.CURDIR} && $(M4) ${CFDIR}/m4/cf.m4 ${@:R}.mc) > $@
 	$(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
+ALL=	freebsd.cf freefall.cf
+CLEANFILES+=$(ALL)
+
+#We dont build the generic stuff...
+#Use `make generic-bsd4.4.cf' if you want one..
+#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
 
 all: $(ALL)
 
@@ -39,6 +44,7 @@ depend install:
 
 # this is overkill, but....
 M4FILES=\
+	${CFDIR}/domain/generic.m4 \
 	${CFDIR}/domain/Berkeley.EDU.m4 \
 	${CFDIR}/domain/CS.Berkeley.EDU.m4 \
 	${CFDIR}/domain/EECS.Berkeley.EDU.m4 \
diff --git a/usr.sbin/sendmail/cf/cf/freebsd.mc b/usr.sbin/sendmail/cf/cf/freebsd.mc
new file mode 100644
index 0000000..d5a014a
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/freebsd.mc
@@ -0,0 +1,52 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+#  This is a generic configuration file for 4.4 BSD-based systems,
+#  including 4.4-Lite, BSDi, NetBSD, and FreeBSD.
+#  It has support for local and SMTP mail only.  If you want to
+#  customize it, copy it to a name appropriate for your environment
+#  and do the modifications there.
+#
+
+VERSIONID(`@(#)freebsd.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+DOMAIN(generic)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+FEATURE(mailertable, `hash -o /etc/mailertable')dnl
+define(`UUCP_RELAY', ucbvax.Berkeley.EDU)dnl
+define(`BITNET_RELAY', mailhost.Berkeley.EDU)dnl
+define(`CSNET_RELAY', mailhost.Berkeley.EDU)dnl
diff --git a/usr.sbin/sendmail/cf/cf/freefall.mc b/usr.sbin/sendmail/cf/cf/freefall.mc
index a27e9f8..12672cd 100644
--- a/usr.sbin/sendmail/cf/cf/freefall.mc
+++ b/usr.sbin/sendmail/cf/cf/freefall.mc
@@ -1,8 +1,8 @@
 divert(-1)
 #
 # Copyright (c) 1983 Eric P. Allman
-# Copyright (c) 1988 The Regents of the University of California.
-# All rights reserved.
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -33,15 +33,24 @@ divert(-1)
 # SUCH DAMAGE.
 #
 
-include(`../m4/cf.m4')
 VERSIONID(`@(#)freefall.mc	$Revision: 1.1 $')
 OSTYPE(bsd4.4)dnl
+DOMAIN(generic)dnl
 MAILER(local)dnl
 MAILER(smtp)dnl
+FEATURE(mailertable, `hash -o /etc/mailertable')dnl
 define(`UUCP_RELAY', ucbvax.Berkeley.EDU)dnl
 define(`BITNET_RELAY', mailhost.Berkeley.EDU)dnl
 define(`CSNET_RELAY', mailhost.Berkeley.EDU)dnl
-define(`confCHECKPOINT_INTERVAL', 4)dnl
-define(`confAUTO_REBUILD', True)dnl
-
-
+define(`confCHECKPOINT_INTERVAL', `4')dnl
+define(`confAUTO_REBUILD', `True')dnl
+define(`confMIN_FREE_BLOCKS', `1024')dnl
+define(`confME_TOO', `True')dnl
+define(`confMCI_CACHE_TIMEOUT', `10m')dnl
+define(`confTO_QUEUEWARN', `1d')dnl
+define(`confTO_RCPT', `10m')dnl
+define(`confTO_DATABLOCK', `10m')dnl
+define(`confTO_DATAFINAL', `10m')dnl
+define(`confTO_COMMAND', `10m')dnl
+define(`confMIN_QUEUE_AGE', `30m')dnl
+define(`confNO_RCPT_ACTION', `add-to-undisclosed')dnl