[src/trunk]: src/etc sync with sendmail upgrade.

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

details:   https://anonhg.NetBSD.org/src/rev/3a7f9c0797b4
branches:  trunk
changeset: 485683:3a7f9c0797b4
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed May 03 10:55:19 2000 +0000

description:
sync with sendmail upgrade.
- sendmail configuration files are in /etc/mail, not /etc.
- src/etc/aliases will be installed into /etc/mail/aliases (confusing)
- rc.d/sendmail warns if /etc/sendmail.cf exists.

diffstat:

 etc/Makefile      |   6 +++---
 etc/changelist    |   5 ++++-
 etc/rc.d/sendmail |  11 +++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 5ccf0519cdbd -r 3a7f9c0797b4 etc/Makefile
--- a/etc/Makefile      Wed May 03 10:50:04 2000 +0000
+++ b/etc/Makefile      Wed May 03 10:55:19 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.146 2000/05/03 00:10:33 sjg Exp $
+#      $NetBSD: Makefile,v 1.147 2000/05/03 10:55:19 itojun Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -131,7 +131,7 @@
        ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 600 ${BIN3} \
            ${DESTDIR}/etc
        ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 aliases \
-           ${DESTDIR}/etc
+           ${DESTDIR}/etc/mail
        ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 crontab \
            ${DESTDIR}/var/cron/tabs/root
        ${INSTALL} ${INSTPRIV} -c -o root -g wheel -m 600 master.passwd \
@@ -231,7 +231,7 @@
        (cd ../gnu/usr.sbin/postfix/; ${MAKE} distribution)
 .ifndef NO_SENDMAIL
        (cd ../gnu/usr.sbin/sendmail/cf/cf; ${MAKE} distribution)
-       ${DESTDIR}/usr/libexec/sendmail/sendmail -C ${DESTDIR}/etc/sendmail.cf -O AliasFile=${DESTDIR}/etc/aliases -O DontBlameSendmail=groupwritabledirpathsafe -bi
+       ${DESTDIR}/usr/libexec/sendmail/sendmail -C ${DESTDIR}/mail/etc/sendmail.cf -O AliasFile=${DESTDIR}/etc/mail/aliases -O DontBlameSendmail=groupwritabledirpathsafe -bi
 .endif
 
 distrib-dirs:
diff -r 5ccf0519cdbd -r 3a7f9c0797b4 etc/changelist
--- a/etc/changelist    Wed May 03 10:50:04 2000 +0000
+++ b/etc/changelist    Wed May 03 10:55:19 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: changelist,v 1.9 2000/04/20 02:01:52 enami Exp $
+#      $NetBSD: changelist,v 1.10 2000/05/03 10:55:19 itojun Exp $
 #      from: @(#)changelist    8.1 (Berkeley) 6/9/93
 #
 # List of files which the security script backs up and checks
@@ -52,6 +52,9 @@
 /etc/lkm.conf
 /etc/login.conf
 /etc/mail.rc
+/etc/mail/aliases
+/etc/mail/helpfile
+/etc/mail/sendmail.cf
 /etc/mailer.conf
 /etc/man.conf
 /etc/master.passwd
diff -r 5ccf0519cdbd -r 3a7f9c0797b4 etc/rc.d/sendmail
--- a/etc/rc.d/sendmail Wed May 03 10:50:04 2000 +0000
+++ b/etc/rc.d/sendmail Wed May 03 10:55:19 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sendmail,v 1.2 2000/03/13 04:04:05 lukem Exp $
+# $NetBSD: sendmail,v 1.3 2000/05/03 10:55:20 itojun Exp $
 #
 
 # PROVIDE: mail
@@ -16,6 +16,13 @@
 name="sendmail"
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.cf"
+if [ -f "/etc/${name}.cf" ]; then
+       required_files="/etc/${name}.cf"
+       command_args="-C${required_files}"
+       warn "using ${required_files}."
+       warn "default location was changed, move ${required_files} to /etc/mail."
+else
+       required_files="/etc/mail/${name}.cf"
+fi
 
 run_rc_command "$1"