[Midnightbsd-cvs] src [7043] trunk/etc/sendmail: rename configuration files.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Jun 18 21:04:12 EDT 2015
Revision: 7043
http://svnweb.midnightbsd.org/src/?rev=7043
Author: laffer1
Date: 2015-06-18 21:04:12 -0400 (Thu, 18 Jun 2015)
Log Message:
-----------
rename configuration files. this should have been done years ago
Modified Paths:
--------------
trunk/etc/sendmail/Makefile
Added Paths:
-----------
trunk/etc/sendmail/midnightbsd.mc
trunk/etc/sendmail/midnightbsd.submit.mc
Removed Paths:
-------------
trunk/etc/sendmail/freebsd.mc
trunk/etc/sendmail/freebsd.submit.mc
Property Changed:
----------------
trunk/etc/sendmail/freefall.mc
Modified: trunk/etc/sendmail/Makefile
===================================================================
--- trunk/etc/sendmail/Makefile 2015-06-19 00:57:24 UTC (rev 7042)
+++ trunk/etc/sendmail/Makefile 2015-06-19 01:04:12 UTC (rev 7043)
@@ -25,8 +25,8 @@
DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf
DEST_SUBMIT_CF= ${DESTDIR}/etc/mail/submit.cf
-ALL= freebsd.cf freebsd.submit.cf
-CLEANFILES= freebsd.cf freebsd.submit.cf
+ALL= midnightbsd.cf midnightbsd.submit.cf
+CLEANFILES= midnightbsd.cf midnightbsd.submit.cf
# Local SENDMAIL_MC or SENDMAIL_CF may be set in /etc/make.conf.
# Warning! If set, this causes 'make install' to always copy it
@@ -65,17 +65,17 @@
distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail
+ ${.CURDIR}/midnightbsd.mc midnightbsd.cf ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail
+ ${.CURDIR}/midnightbsd.submit.mc midnightbsd.submit.cf ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${SMDIR}/helpfile ${DESTDIR}/etc/mail
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
/dev/null ${DESTDIR}/var/log/sendmail.st
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- freebsd.cf ${DEST_CF}
+ midnightbsd.cf ${DEST_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- freebsd.submit.cf ${DEST_SUBMIT_CF}
+ midnightbsd.submit.cf ${DEST_SUBMIT_CF}
install:
.if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF}
Deleted: trunk/etc/sendmail/freebsd.mc
===================================================================
--- trunk/etc/sendmail/freebsd.mc 2015-06-19 00:57:24 UTC (rev 7042)
+++ trunk/etc/sendmail/freebsd.mc 2015-06-19 01:04:12 UTC (rev 7043)
@@ -1,105 +0,0 @@
-divert(-1)
-#
-# 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 a generic configuration file for FreeBSD 6.X and later systems.
-# If you want to customize it, copy it to a name appropriate for your
-# environment and do the modifications there.
-#
-# The best documentation for this .mc file is:
-# /usr/share/sendmail/cf/README or
-# /usr/src/contrib/sendmail/cf/README
-#
-#
-# NOTE: If you enable RunAsUser, make sure that you adjust the permissions
-# and owner of the SSL certificates and keys in /etc/mail/certs to be usable
-# by that user.
-#
-
-divert(0)
-VERSIONID(`$MidnightBSD$')
-OSTYPE(freebsd6)
-DOMAIN(generic)
-
-FEATURE(access_db, `hash -o -T<TMPF> /etc/mail/access')
-FEATURE(blacklist_recipients)
-FEATURE(local_lmtp)
-FEATURE(mailertable, `hash -o /etc/mail/mailertable')
-FEATURE(virtusertable, `hash -o /etc/mail/virtusertable')
-
-dnl Enable STARTTLS for receiving email.
-define(`CERT_DIR', `/etc/mail/certs')dnl
-define(`confSERVER_CERT', `CERT_DIR/host.cert')dnl
-define(`confSERVER_KEY', `CERT_DIR/host.key')dnl
-define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl
-define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl
-define(`confCACERT', `CERT_DIR/cacert.pem')dnl
-define(`confCACERT_PATH', `CERT_DIR')dnl
-define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl
-
-dnl Uncomment to allow relaying based on your MX records.
-dnl NOTE: This can allow sites to use your server as a backup MX without
-dnl your permission.
-dnl FEATURE(relay_based_on_MX)
-
-dnl DNS based black hole lists
-dnl --------------------------------
-dnl DNS based black hole lists come and go on a regular basis
-dnl so this file will not serve as a database of the available servers.
-dnl For more information, visit
-dnl http://en.wikipedia.org/wiki/DNSBL
-
-dnl Uncomment to activate your chosen DNS based blacklist
-dnl FEATURE(dnsbl, `dnsbl.example.com')
-dnl Alternatively, you can provide your own server and rejection message:
-dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
-
-dnl Dialup users should uncomment and define this appropriately
-dnl define(`SMART_HOST', `your.isp.mail.server')
-
-dnl Uncomment the first line to change the location of the default
-dnl /etc/mail/local-host-names and comment out the second line.
-dnl define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confCW_FILE', `-o /etc/mail/local-host-names')
-
-dnl Enable for both IPv4 and IPv6 (optional)
-DAEMON_OPTIONS(`Name=IPv4, Family=inet')
-DAEMON_OPTIONS(`Name=IPv6, Family=inet6, Modifiers=O')
-
-define(`confBIND_OPTS', `WorkAroundBrokenAAAA')
-define(`confNO_RCPT_ACTION', `add-to-undisclosed')
-define(`confPRIVACY_FLAGS', `authwarnings,noexpn,novrfy')
-MAILER(local)
-MAILER(smtp)
Deleted: trunk/etc/sendmail/freebsd.submit.mc
===================================================================
--- trunk/etc/sendmail/freebsd.submit.mc 2015-06-19 00:57:24 UTC (rev 7042)
+++ trunk/etc/sendmail/freebsd.submit.mc 2015-06-19 01:04:12 UTC (rev 7043)
@@ -1,28 +0,0 @@
-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 MidnightBSD configuration for a set-group-ID sm-msp sendmail
-# that acts as a initial mail submission program.
-#
-#
-
-divert(0)dnl
-VERSIONID(`$MidnightBSD: src/etc/sendmail/freebsd.submit.mc,v 1.3 2007/11/23 22:11:51 laffer1 Exp $')
-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
Index: trunk/etc/sendmail/freefall.mc
===================================================================
--- trunk/etc/sendmail/freefall.mc 2015-06-19 00:57:24 UTC (rev 7042)
+++ trunk/etc/sendmail/freefall.mc 2015-06-19 01:04:12 UTC (rev 7043)
Property changes on: trunk/etc/sendmail/freefall.mc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Copied: trunk/etc/sendmail/midnightbsd.mc (from rev 7042, trunk/etc/sendmail/freebsd.mc)
===================================================================
--- trunk/etc/sendmail/midnightbsd.mc (rev 0)
+++ trunk/etc/sendmail/midnightbsd.mc 2015-06-19 01:04:12 UTC (rev 7043)
@@ -0,0 +1,105 @@
+divert(-1)
+#
+# 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 a generic configuration file for MidnightBSD 0.7 and later systems.
+# If you want to customize it, copy it to a name appropriate for your
+# environment and do the modifications there.
+#
+# The best documentation for this .mc file is:
+# /usr/share/sendmail/cf/README or
+# /usr/src/contrib/sendmail/cf/README
+#
+#
+# NOTE: If you enable RunAsUser, make sure that you adjust the permissions
+# and owner of the SSL certificates and keys in /etc/mail/certs to be usable
+# by that user.
+#
+
+divert(0)
+VERSIONID(`$MidnightBSD$')
+OSTYPE(freebsd6)
+DOMAIN(generic)
+
+FEATURE(access_db, `hash -o -T<TMPF> /etc/mail/access')
+FEATURE(blacklist_recipients)
+FEATURE(local_lmtp)
+FEATURE(mailertable, `hash -o /etc/mail/mailertable')
+FEATURE(virtusertable, `hash -o /etc/mail/virtusertable')
+
+dnl Enable STARTTLS for receiving email.
+define(`CERT_DIR', `/etc/mail/certs')dnl
+define(`confSERVER_CERT', `CERT_DIR/host.cert')dnl
+define(`confSERVER_KEY', `CERT_DIR/host.key')dnl
+define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl
+define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl
+define(`confCACERT', `CERT_DIR/cacert.pem')dnl
+define(`confCACERT_PATH', `CERT_DIR')dnl
+define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl
+
+dnl Uncomment to allow relaying based on your MX records.
+dnl NOTE: This can allow sites to use your server as a backup MX without
+dnl your permission.
+dnl FEATURE(relay_based_on_MX)
+
+dnl DNS based black hole lists
+dnl --------------------------------
+dnl DNS based black hole lists come and go on a regular basis
+dnl so this file will not serve as a database of the available servers.
+dnl For more information, visit
+dnl http://en.wikipedia.org/wiki/DNSBL
+
+dnl Uncomment to activate your chosen DNS based blacklist
+dnl FEATURE(dnsbl, `dnsbl.example.com')
+dnl Alternatively, you can provide your own server and rejection message:
+dnl FEATURE(dnsbl, `dnsbl.example.com', ``"550 Mail from " $&{client_addr} " rejected"'')
+
+dnl Dialup users should uncomment and define this appropriately
+dnl define(`SMART_HOST', `your.isp.mail.server')
+
+dnl Uncomment the first line to change the location of the default
+dnl /etc/mail/local-host-names and comment out the second line.
+dnl define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
+define(`confCW_FILE', `-o /etc/mail/local-host-names')
+
+dnl Enable for both IPv4 and IPv6 (optional)
+DAEMON_OPTIONS(`Name=IPv4, Family=inet')
+DAEMON_OPTIONS(`Name=IPv6, Family=inet6, Modifiers=O')
+
+define(`confBIND_OPTS', `WorkAroundBrokenAAAA')
+define(`confNO_RCPT_ACTION', `add-to-undisclosed')
+define(`confPRIVACY_FLAGS', `authwarnings,noexpn,novrfy')
+MAILER(local)
+MAILER(smtp)
Property changes on: trunk/etc/sendmail/midnightbsd.mc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Copied: trunk/etc/sendmail/midnightbsd.submit.mc (from rev 7002, trunk/etc/sendmail/freebsd.submit.mc)
===================================================================
--- trunk/etc/sendmail/midnightbsd.submit.mc (rev 0)
+++ trunk/etc/sendmail/midnightbsd.submit.mc 2015-06-19 01:04:12 UTC (rev 7043)
@@ -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 MidnightBSD configuration for a set-group-ID sm-msp sendmail
+# that acts as a initial mail submission program.
+#
+#
+
+divert(0)dnl
+VERSIONID(`$MidnightBSD$')
+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
Property changes on: trunk/etc/sendmail/midnightbsd.submit.mc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list