From 7d4f685f3e78681b75df269cc3a586acd73757f8 Mon Sep 17 00:00:00 2001
From: gshapiro <gshapiro@FreeBSD.org>
Date: Sun, 19 Oct 2003 00:03:13 +0000
Subject: Adding WorkAroundBrokenAAAA seems a necessity even in the submit.mc
 given the number of broken DNS servers out there in the world.  Since we are
 diverging from the sendmail.org submit.mc, it's time to make our own
 freebsd.submit.mc.

PR:		conf/57733
Reviewed by:	nork
MFC after:	2 weeks
---
 contrib/sendmail/FREEBSD-upgrade |  1 +
 etc/sendmail/Makefile            | 12 +-----------
 etc/sendmail/freebsd.submit.mc   | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 etc/sendmail/freebsd.submit.mc

diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade
index c675562..c332917 100644
--- a/contrib/sendmail/FREEBSD-upgrade
+++ b/contrib/sendmail/FREEBSD-upgrade
@@ -59,6 +59,7 @@ infrastructure in FreeBSD:
 	etc/rc
 	etc/sendmail/Makefile
 	etc/sendmail/freebsd.mc
+	etc/sendmail/freebsd.submit.mc
 	etc/sendmail/freefall.mc
 	etc/sendmail/rc.sendmail
 	lib/Makefile
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 66f5a5a..79cd394 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -60,13 +60,6 @@ ${mc:T:R}.cf: ${mc}
 
 all: ${ALL}
 
-# Build the installed submit.cf from the sendmail distributed submit.mc.
-freebsd.submit.cf:	${SENDMAIL_CF_DIR}/cf/submit.mc
-	${RM} ${.TARGET}
-	${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
-	    ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.ALLSRC} > ${.TARGET}
-	${CHMOD} ${ROMODE} ${.TARGET}
-
 install distribution:
 .if defined(SENDMAIL_MC) && defined(SENDMAIL_CF)
 	@echo ">>> ERROR: Both SENDMAIL_MC and SENDMAIL_CF cannot be set"
@@ -76,10 +69,7 @@ install distribution:
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${SENDMAIL_CF_DIR}/cf/submit.mc \
-	    ${DESTDIR}/etc/mail/freebsd.submit.mc
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    freebsd.submit.cf ${DESTDIR}/etc/mail
+	    ${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${SMDIR}/helpfile ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc
new file mode 100644
index 0000000..bfc98a2
--- /dev/null
+++ b/etc/sendmail/freebsd.submit.mc
@@ -0,0 +1,28 @@
+divert(-1)
+#
+# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+
+#
+#  This is the FreeBSD configuration for a set-group-ID sm-msp sendmail
+#  that acts as a initial mail submission program.
+#
+#
+
+divert(0)dnl
+VERSIONID(`$FreeBSD$')
+define(`confCF_VERSION', `Submit')dnl
+define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
+define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
+define(`confTIME_ZONE', `USE_TZ')dnl
+define(`confDONT_INIT_GROUPS', `True')dnl
+define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
+dnl
+dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
+FEATURE(`msp', `[127.0.0.1]')dnl
-- 
cgit v1.1