Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src sync sendmail default configuration file with GENERIC kernel...
details: https://anonhg.NetBSD.org/src/rev/c9f5658e2886
branches: trunk
changeset: 494240:c9f5658e2886
user: itojun <itojun%NetBSD.org@localhost>
date: Tue Jul 04 12:21:02 2000 +0000
description:
sync sendmail default configuration file with GENERIC kernel setting.
was: sendmail-IPv6.cf(v4/v6) + sendmail.cf(v4)
now: sendmail-IPv4only.cf(v4) + sendmail.cf(v4/v6)
do we need etc/obsolete.mi?
diffstat:
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/etc/mi | 4 +-
distrib/sets/lists/misc/mi | 4 +-
distrib/sets/lists/misc/obsolete.mi | 3 +-
etc/changelist | 4 +-
gnu/usr.sbin/sendmail/cf/cf/Makefile | 12 ++--
gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc | 49 ------------------------
gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc | 4 +-
8 files changed, 20 insertions(+), 64 deletions(-)
diffs (205 lines):
diff -r 1f2a58234537 -r c9f5658e2886 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Tue Jul 04 10:02:45 2000 +0000
+++ b/distrib/sets/lists/comp/mi Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.241 2000/06/29 12:03:10 mrg Exp $
+# $NetBSD: mi,v 1.242 2000/07/04 12:21:03 itojun Exp $
./sys comp-sysutil-root
./usr/bin/addr2line comp-miscutil-bin
./usr/bin/ar comp-util-bin
@@ -2352,6 +2352,7 @@
./usr/share/man/cat3/scalbnf.0 comp-c-catman
./usr/share/man/cat3/scandir.0 comp-c-catman
./usr/share/man/cat3/scanf.0 comp-c-catman
+./usr/share/man/cat3/secure_path.0 comp-c-catman
./usr/share/man/cat3/securepath.0 comp-c-catman
./usr/share/man/cat3/seed48.0 comp-c-catman
./usr/share/man/cat3/seekdir.0 comp-c-catman
@@ -3967,6 +3968,7 @@
./usr/share/man/man3/scalbnf.3 comp-c-man
./usr/share/man/man3/scandir.3 comp-c-man
./usr/share/man/man3/scanf.3 comp-c-man
+./usr/share/man/man3/secure_path.3 comp-c-man
./usr/share/man/man3/securepath.3 comp-c-man
./usr/share/man/man3/seed48.3 comp-c-man
./usr/share/man/man3/seekdir.3 comp-c-man
diff -r 1f2a58234537 -r c9f5658e2886 distrib/sets/lists/etc/mi
--- a/distrib/sets/lists/etc/mi Tue Jul 04 10:02:45 2000 +0000
+++ b/distrib/sets/lists/etc/mi Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.60 2000/06/20 01:28:43 minoura Exp $
+# $NetBSD: mi,v 1.61 2000/07/04 12:21:04 itojun Exp $
./.cshrc
./.profile
./dev/MAKEDEV.local
@@ -29,7 +29,7 @@
./etc/mail/aliases
./etc/mail/aliases.db
./etc/mail/helpfile
-./etc/mail/sendmail-IPv6.cf
+./etc/mail/sendmail-IPv4only.cf
./etc/mail/sendmail.cf
./etc/mailer.conf
./etc/man.conf
diff -r 1f2a58234537 -r c9f5658e2886 distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi Tue Jul 04 10:02:45 2000 +0000
+++ b/distrib/sets/lists/misc/mi Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2000/06/21 06:28:17 thorpej Exp $
+# $NetBSD: mi,v 1.39 2000/07/04 12:21:04 itojun Exp $
./usr/share/dict/README
./usr/share/dict/eign
./usr/share/dict/propernames
@@ -416,7 +416,7 @@
./usr/share/sendmail/cf/chimera.mc
./usr/share/sendmail/cf/ihack.net.mc
./usr/share/sendmail/cf/minbar.mc
-./usr/share/sendmail/cf/netbsd-proto-IPv6.mc
+./usr/share/sendmail/cf/netbsd-proto-IPv4only.mc
./usr/share/sendmail/cf/netbsd-proto.mc
./usr/share/sendmail/cf/sun-lamp.mc
./usr/share/sendmail/cf/zhadum.mc
diff -r 1f2a58234537 -r c9f5658e2886 distrib/sets/lists/misc/obsolete.mi
--- a/distrib/sets/lists/misc/obsolete.mi Tue Jul 04 10:02:45 2000 +0000
+++ b/distrib/sets/lists/misc/obsolete.mi Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.7 2000/06/13 01:02:31 wiz Exp $
+# $NetBSD: obsolete.mi,v 1.8 2000/07/04 12:21:04 itojun Exp $
/usr/share/doc/xntp
/usr/share/doc/smm/03.fsck/0.t
/usr/share/doc/smm/03.fsck/1.t
@@ -19,6 +19,7 @@
/usr/share/misc/sendmail.hf
/usr/share/postfix
/usr/share/sendmail/cf/clientproto.mc
+/usr/share/sendmail/cf/netbsd-proto-IPv6.mc
/usr/share/sendmail/cf/tcpproto.mc
/usr/share/sendmail/cf/trinity.mc
/usr/share/sendmail/cf/uucpproto.mc
diff -r 1f2a58234537 -r c9f5658e2886 etc/changelist
--- a/etc/changelist Tue Jul 04 10:02:45 2000 +0000
+++ b/etc/changelist Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: changelist,v 1.15 2000/06/20 15:01:19 ad Exp $
+# $NetBSD: changelist,v 1.16 2000/07/04 12:21:02 itojun Exp $
# from: @(#)changelist 8.1 (Berkeley) 6/9/93
#
# List of files which the security script backs up and checks
@@ -56,7 +56,7 @@
/etc/mail/helpfile
/etc/mail/local-host-names
/etc/mail/sendmail.cf
-/etc/mail/sendmail-IPv6.cf
+/etc/mail/sendmail-IPv4only.cf
/etc/mailer.conf
/etc/man.conf
/etc/master.passwd
diff -r 1f2a58234537 -r c9f5658e2886 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile Tue Jul 04 10:02:45 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile Tue Jul 04 12:21:02 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/05/08 00:37:54 itojun Exp $
+# $NetBSD: Makefile,v 1.7 2000/07/04 12:21:04 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,9 +19,9 @@
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:C/Makefile//:C/\.mc/.cf/g:C/netbsd-proto\.cf//:C/netbsd-proto-IPv4only\.cf//}
.SUFFIXES: .mc .cf
@@ -43,8 +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
+ ${INSTALL} -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 1f2a58234537 -r c9f5658e2886 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc
--- a/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto-IPv6.mc Tue Jul 04 10:02:45 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 1f2a58234537 -r c9f5658e2886 gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc
--- a/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc Tue Jul 04 10:02:45 2000 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/netbsd-proto.mc Tue Jul 04 12:21:02 2000 +0000
@@ -40,8 +40,10 @@
#
include(`../m4/cf.m4')
-VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.4 $')
+VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.5 $')
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
Home |
Main Index |
Thread Index |
Old Index