[src/trunk]: src make default sendmail.cf IPv4-only again.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5fbe3ceab4f0
branches:  trunk
changeset: 485870:5fbe3ceab4f0
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon May 08 00:37:53 2000 +0000

description:
make default sendmail.cf IPv4-only again.
roll sendmail-IPv6.cf, which does IPv4/v6.

diffstat:

 distrib/sets/lists/etc/mi                        |   7 +-
 etc/changelist                                   |   3 +-
 etc/mtree/special                                |   3 +-
 gnu/usr.sbin/sendmail/cf/cf/Makefile             |  11 +++-
 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc |  49 ++++++++++++++++++++++++
 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc      |   4 +-
 6 files changed, 65 insertions(+), 12 deletions(-)

diffs (168 lines):

diff -r 730245a79b3b -r 5fbe3ceab4f0 distrib/sets/lists/etc/mi
--- a/distrib/sets/lists/etc/mi Sun May 07 22:58:58 2000 +0000
+++ b/distrib/sets/lists/etc/mi Mon May 08 00:37:53 2000 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: mi,v 1.54 2000/05/06 06:27:42 mycroft Exp $
+# $NetBSD: mi,v 1.55 2000/05/08 00:37:54 itojun Exp $
 ./.cshrc
 ./.profile
 ./dev/MAKEDEV.local
+./etc/aliases
+./etc/aliases.db
 ./etc/bootptab
 ./etc/changelist
 ./etc/csh.cshrc
@@ -25,10 +27,9 @@
 ./etc/inetd.conf
 ./etc/lkm.conf
 ./etc/localtime
-./etc/mail/aliases
-./etc/mail/aliases.db
 ./etc/mail/helpfile
 ./etc/mail/sendmail.cf
+./etc/mail/sendmail-IPv6.cf
 ./etc/mail.rc
 ./etc/mailer.conf
 ./etc/man.conf
diff -r 730245a79b3b -r 5fbe3ceab4f0 etc/changelist
--- a/etc/changelist    Sun May 07 22:58:58 2000 +0000
+++ b/etc/changelist    Mon May 08 00:37:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: changelist,v 1.10 2000/05/03 10:55:19 itojun Exp $
+#      $NetBSD: changelist,v 1.11 2000/05/08 00:37:53 itojun Exp $
 #      from: @(#)changelist    8.1 (Berkeley) 6/9/93
 #
 # List of files which the security script backs up and checks
@@ -55,6 +55,7 @@
 /etc/mail/aliases
 /etc/mail/helpfile
 /etc/mail/sendmail.cf
+/etc/mail/sendmail-IPv6.cf
 /etc/mailer.conf
 /etc/man.conf
 /etc/master.passwd
diff -r 730245a79b3b -r 5fbe3ceab4f0 etc/mtree/special
--- a/etc/mtree/special Sun May 07 22:58:58 2000 +0000
+++ b/etc/mtree/special Mon May 08 00:37:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: special,v 1.28 2000/05/04 01:07:40 itojun Exp $
+#      $NetBSD: special,v 1.29 2000/05/08 00:37:54 itojun Exp $
 #      @(#)special     8.2 (Berkeley) 1/23/94
 #
 # Hand-crafted mtree specification for the dangerous files.
@@ -58,6 +58,7 @@
 aliases.db     type=file mode=0644 uname=root gname=wheel
 helpfile       type=file mode=0444 uname=root gname=wheel
 sendmail.cf    type=file mode=0444 uname=root gname=wheel
+sendmail-IPv6.cf       type=file mode=0444 uname=root gname=wheel
 ..     #etc/mail
 mtree          type=dir mode=0755 uname=root gname=wheel
 special                type=file mode=0444 uname=root gname=wheel
diff -r 730245a79b3b -r 5fbe3ceab4f0 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Sun May 07 22:58:58 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Mon May 08 00:37:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2000/05/04 00:52:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2000/05/08 00:37:54 itojun Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -6,7 +6,8 @@
 
 FILESDIR=      /usr/share/sendmail/cf
 FILES=         boat-anchor.mc chimera.mc ihack.net.mc minbar.mc \
-               netbsd-proto.mc sun-lamp.mc zhadum.mc Makefile
+               netbsd-proto.mc netbsd-proto-IPv6.mc sun-lamp.mc zhadum.mc \
+               Makefile
 
 .if (${.CURDIR} == ${FILESDIR})
 CFDIR=         ${.CURDIR}/..
@@ -18,9 +19,9 @@
 ROMODE=                444
 RM=            rm -f
 
-ALL=           netbsd-proto.cf
+ALL=           netbsd-proto.cf netbsd-proto-IPv6.cf
 
-OTHERS=                ${FILES:C/Makefile//:C/\.mc/.cf/g:C/netbsd-proto.cf//}
+OTHERS=                ${FILES:C/Makefile//:C/\.mc/.cf/g:C/netbsd-proto\.cf//:C/netbsd-proto-IPv6\.cf//}
 
 .SUFFIXES: .mc .cf
 
@@ -42,6 +43,8 @@
 distribution: netbsd-proto.cf
        ${INSTALL} -c -o root -g wheel -m 444 netbsd-proto.cf \
            ${DESTDIR}/etc/mail/sendmail.cf
+       ${INSTALL} -c -o root -g wheel -m 444 netbsd-proto-IPv6.cf \
+           ${DESTDIR}/etc/mail/sendmail-IPv6.cf
 
 # this is overkill, but....
 M4FILES=       ${CFDIR}/domain/Berkeley.EDU.m4 \
diff -r 730245a79b3b -r 5fbe3ceab4f0 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc  Mon May 08 00:37:53 2000 +0000
@@ -0,0 +1,49 @@
+divert(-1)
+#
+# Copyright (c) 1994 Adam Glass
+# 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 the prototype file for a configuration that supports nothing
+#  but basic SMTP connections via TCP.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`confAUTO_REBUILD', True)dnl
+DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
+DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6')dnl
diff -r 730245a79b3b -r 5fbe3ceab4f0 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc
--- a/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc       Sun May 07 22:58:58 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc       Mon May 08 00:37:53 2000 +0000
@@ -40,10 +40,8 @@
 #
 
 include(`../m4/cf.m4')
-VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.3 $')
+VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.4 $')
 OSTYPE(bsd4.4)dnl
 MAILER(local)dnl
 MAILER(smtp)dnl
 define(`confAUTO_REBUILD', True)dnl
-DAEMON_OPTIONS(`Family=inet, address=0.0.0.0, Name=MTA')dnl
-DAEMON_OPTIONS(`Family=inet6, address=::, Name=MTA6')dnl