no longer need to ship IPv4-only sendmail.cf.
This commit is contained in:
itojun
parent
3141a5cc48
commit
b2ba60b861
@ -1,4 +1,4 @@
|
||||
# $NetBSD: mi,v 1.74 2001/01/14 15:40:15 minoura Exp $
|
||||
# $NetBSD: mi,v 1.75 2001/01/15 17:57:44 itojun Exp $
|
||||
./.cshrc
|
||||
./.profile
|
||||
./dev/MAKEDEV.local
|
||||
@ -33,7 +33,6 @@
|
||||
./etc/mail.rc
|
||||
./etc/mail/aliases
|
||||
./etc/mail/helpfile
|
||||
./etc/mail/sendmail-IPv4only.cf
|
||||
./etc/mail/sendmail.cf
|
||||
./etc/mailer.conf
|
||||
./etc/man.conf
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: mi,v 1.54 2001/01/14 01:44:22 jmc Exp $
|
||||
# $NetBSD: mi,v 1.55 2001/01/15 17:57:44 itojun Exp $
|
||||
./usr/share/dict/README misc-reference-share
|
||||
./usr/share/dict/eign misc-reference-share
|
||||
./usr/share/dict/propernames misc-reference-share
|
||||
@ -421,7 +421,6 @@
|
||||
./usr/share/sendmail/cf/chimera.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/ihack.net.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/minbar.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/netbsd-proto-IPv4only.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/netbsd-proto.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/sun-lamp.mc misc-sendmail-share
|
||||
./usr/share/sendmail/cf/zhadum.mc misc-sendmail-share
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: obsolete.mi,v 1.11 2001/01/04 11:12:24 itojun Exp $
|
||||
# $NetBSD: obsolete.mi,v 1.12 2001/01/15 17:57:44 itojun Exp $
|
||||
/usr/share/doc/smm/03.fsck
|
||||
/usr/share/doc/smm/03.fsck/0.t
|
||||
/usr/share/doc/smm/03.fsck/1.t
|
||||
@ -21,6 +21,7 @@
|
||||
/usr/share/misc/sendmail.hf
|
||||
/usr/share/postfix
|
||||
/usr/share/sendmail/cf/clientproto.mc
|
||||
/usr/share/sendmail/cf/netbsd-proto-IPv4only.mc
|
||||
/usr/share/sendmail/cf/netbsd-proto-IPv6.mc
|
||||
/usr/share/sendmail/cf/tcpproto.mc
|
||||
/usr/share/sendmail/cf/trinity.mc
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.13 2000/09/23 13:53:43 simonb Exp $
|
||||
# $NetBSD: Makefile,v 1.14 2001/01/15 17:57:44 itojun Exp $
|
||||
# install these sources in /usr/share/sendmail/cf
|
||||
|
||||
DIST= ${.CURDIR}/../../../../dist
|
||||
@ -6,8 +6,7 @@ DIST= ${.CURDIR}/../../../../dist
|
||||
|
||||
FILESDIR= /usr/share/sendmail/cf
|
||||
FILES= boat-anchor.mc chimera.mc ihack.net.mc minbar.mc \
|
||||
netbsd-proto.mc netbsd-proto-IPv4only.mc sun-lamp.mc zhadum.mc \
|
||||
Makefile
|
||||
netbsd-proto.mc sun-lamp.mc zhadum.mc Makefile
|
||||
|
||||
.if (${.CURDIR} == ${FILESDIR})
|
||||
CFDIR= ${.CURDIR}/..
|
||||
@ -19,7 +18,7 @@ M4= m4
|
||||
ROMODE= 444
|
||||
RM= rm -f
|
||||
|
||||
ALL= netbsd-proto.cf netbsd-proto-IPv4only.cf
|
||||
ALL= netbsd-proto.cf
|
||||
|
||||
OTHERS= ${FILES:S/Makefile//:C/netbsd-proto.*//:S/.mc/.cf/g}
|
||||
|
||||
@ -33,9 +32,6 @@ OTHERS= ${FILES:S/Makefile//:C/netbsd-proto.*//:S/.mc/.cf/g}
|
||||
|
||||
realall: ${ALL}
|
||||
|
||||
# netbsd-proto.mc pulls in netbsd-proto-IPv4only.mc
|
||||
netbsd-proto.cf: netbsd-proto-IPv4only.mc
|
||||
|
||||
afterinstall:
|
||||
sed 's,../../../../usr.sbin/sendmail/cf/cf/,,g' \
|
||||
<${DESTDIR}${FILESDIR}/netbsd-proto.mc \
|
||||
@ -54,8 +50,6 @@ realdepend:
|
||||
distribution: netbsd-proto.cf
|
||||
${INSTALL} ${INSTPRIV} ${COPY} -o root -g wheel -m 444 \
|
||||
netbsd-proto.cf ${DESTDIR}/etc/mail/sendmail.cf
|
||||
${INSTALL} ${INSTPRIV} ${COPY} -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 \
|
||||
|
||||
@ -1,53 +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 SMTP
|
||||
# connections via TCP and some commonly required features.
|
||||
#
|
||||
|
||||
include(`../m4/cf.m4')
|
||||
VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.2 $')
|
||||
OSTYPE(bsd4.4)dnl
|
||||
MAILER(local)dnl
|
||||
MAILER(smtp)dnl
|
||||
define(`confAUTO_REBUILD', True)dnl
|
||||
FEATURE(genericstable,DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`genericstable')
|
||||
FEATURE(mailertable, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`mailertable')
|
||||
FEATURE(virtusertable,DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`virtusertable')
|
||||
FEATURE(domaintable, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`domaintable')
|
||||
FEATURE(access_db, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`access')
|
||||
FEATURE(`redirect')
|
||||
@ -1,12 +1,58 @@
|
||||
# $NetBSD: netbsd-proto.mc,v 1.8 2001/01/15 17:49:26 itojun Exp $
|
||||
# $NetBSD: netbsd-proto.mc,v 1.9 2001/01/15 17:57:44 itojun Exp $
|
||||
|
||||
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 SMTP
|
||||
# connections via TCP and some commonly required features.
|
||||
#
|
||||
|
||||
# The path is relative to ${CFDIR}/cf, see Makefile:
|
||||
include(`../../../../usr.sbin/sendmail/cf/cf/netbsd-proto-IPv4only.mc')
|
||||
include(`../m4/cf.m4')
|
||||
VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.9 $')
|
||||
OSTYPE(bsd4.4)dnl
|
||||
MAILER(local)dnl
|
||||
MAILER(smtp)dnl
|
||||
define(`confAUTO_REBUILD', True)dnl
|
||||
FEATURE(genericstable,DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`genericstable')
|
||||
FEATURE(mailertable, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`mailertable')
|
||||
FEATURE(virtusertable,DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`virtusertable')
|
||||
FEATURE(domaintable, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`domaintable')
|
||||
FEATURE(access_db, DATABASE_MAP_TYPE` -o 'MAIL_SETTINGS_DIR`access')
|
||||
FEATURE(`redirect')
|
||||
|
||||
# Enable IPv6. IPv6 is marked as optional so the configuration file
|
||||
# can be used on IPV4-only kernel as well.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user