[src/netbsd-1-5]: src/gnu/usr.sbin/sendmail/cf/cf pullup, approved by: releng...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-1-5]: src/gnu/usr.sbin/sendmail/cf/cf pullup, approved by: releng...
From: itojun <itojun%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 07:16:32 +0000
details:   https://anonhg.NetBSD.org/src/rev/8a7031744c58
branches:  netbsd-1-5
changeset: 488457:8a7031744c58
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Jul 07 11:10:55 2000 +0000

description:
pullup, approved by: releng-1-5
sync sendmail default configuration file with GENERIC kernel setting.
(IPv4/v6 support in sendmail.cf)

Makefile 1.6 -> 1.7
netbsd-proto.mc 1.4 -> 1.5

diffstat:

 gnu/usr.sbin/sendmail/cf/cf/Makefile                 |  19 ++++---
 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv4only.mc |  47 +++++++++++++++++++
 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc     |  49 --------------------
 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc          |   4 +-
 4 files changed, 60 insertions(+), 59 deletions(-)

diffs (172 lines):

diff -r d0a864cc1fc0 -r 8a7031744c58 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Jul 07 09:53:42 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Fri Jul 07 11:10:55 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2000/05/08 00:37:54 itojun Exp $
+#      $NetBSD: Makefile,v 1.6.2.1 2000/07/07 11:10:55 itojun Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -6,7 +6,7 @@
 
 FILESDIR=      /usr/share/sendmail/cf
 FILES=         boat-anchor.mc chimera.mc ihack.net.mc minbar.mc \
-               netbsd-proto.mc netbsd-proto-IPv6.mc sun-lamp.mc zhadum.mc \
+               netbsd-proto.mc netbsd-proto-IPv4only.mc sun-lamp.mc zhadum.mc \
                Makefile
 
 .if (${.CURDIR} == ${FILESDIR})
@@ -19,15 +19,16 @@
 ROMODE=                444
 RM=            rm -f
 
-ALL=           netbsd-proto.cf netbsd-proto-IPv6.cf
+ALL=           netbsd-proto.cf netbsd-proto-IPv4only.cf
 
-OTHERS=                ${FILES:C/Makefile//:C/\.mc/.cf/g:C/netbsd-proto\.cf//:C/netbsd-proto-IPv6\.cf//}
+OTHERS=                ${FILES:S/Makefile//:C/netbsd-proto.*//:S/.mc/.cf/g}
 
 .SUFFIXES: .mc .cf
 
 .mc.cf:
        ${RM} $@
-       (cd ${CFDIR}/cf && ${M4} ${CFDIR}/m4/cf.m4 ${.CURDIR}/${@:R}.mc > ${.OBJDIR}/$@)
+       (cd ${CFDIR}/cf && \
+           ${M4} ${CFDIR}/m4/cf.m4 ${.CURDIR}/${@:R}.mc > ${.OBJDIR}/$@)
        ${CHMOD} ${ROMODE} $@
 
 realall: ${ALL}
@@ -41,10 +42,10 @@
 realdepend:
 
 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
+       ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 444 \
+           netbsd-proto.cf ${DESTDIR}/etc/mail/sendmail.cf
+       ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 444 \
+           netbsd-proto-IPv4only.cf ${DESTDIR}/etc/mail/sendmail-IPv4only.cf
 
 # this is overkill, but....
 M4FILES=       ${CFDIR}/domain/Berkeley.EDU.m4 \
diff -r d0a864cc1fc0 -r 8a7031744c58 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv4only.mc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv4only.mc      Fri Jul 07 11:10:55 2000 +0000
@@ -0,0 +1,47 @@
+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.2.2 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`confAUTO_REBUILD', True)dnl
diff -r d0a864cc1fc0 -r 8a7031744c58 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc
--- a/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc  Fri Jul 07 09:53:42 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-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 d0a864cc1fc0 -r 8a7031744c58 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc
--- a/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc       Fri Jul 07 09:53:42 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc       Fri Jul 07 11:10:55 2000 +0000
@@ -40,8 +40,10 @@
 #
 
 include(`../m4/cf.m4')
-VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.4 $')
+VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.4.2.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
Prev by Date: [src/netbsd-1-5]: src/sys/dev/wscons Pull up revision 1.9:
Next by Date: [src/netbsd-1-5]: src/sbin/wsconsctl Pull up revision 1.2:
Previous by Thread: [src/netbsd-1-5]: src/sys/dev/wscons Pull up revision 1.9:
Next by Thread: [src/netbsd-1-5]: src/sbin/wsconsctl Pull up revision 1.2:
Indexes:
Home | Main Index | Thread Index | Old Index