Enable sendmail 8.10.0. Things like sendmail.* and aliases now live

in /etc/mail.

diff --git a/etc/Makefile b/etc/Makefile
index 1d73ba7..f504ac9 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.106 2000/01/11 13:50:03 peter Exp $
+#      $OpenBSD: Makefile,v 1.107 2000/04/06 18:26:04 millert Exp $
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME=     US/Pacific
@@ -12,7 +12,7 @@ NOOBJ=        oobj
 # -rw-r--r--
 BINOWN= root
 BINGRP= wheel
-BIN1=  aliases bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
+BIN1=  bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
        daily dhcpd.conf dhcpd.interfaces dm.conf exports ftpusers \
        ftpchroot gettytab group hosts hosts.lpd ifaliases inetd.conf \
        ipf.rules ksh.kshrc locate.rc man.conf monthly motd mrouted.conf \
@@ -206,7 +206,10 @@ distribution-etc-root-var: distrib-dirs
        (cd ../lib/libssl; ${MAKE} -f Makefile.bsd-wrapper distribution)
        (cd ../gnu/usr.bin/lynx; ${MAKE} -f Makefile.bsd-wrapper distribution)
        (cd ../usr.bin/mail; ${MAKE} distribution)
-       /usr/libexec/sendmail/sendmail -C${DESTDIR}/etc/sendmail.cf -bi -O AliasFile=${DESTDIR}/etc/aliases
+       ${INSTALL} -c -o root -g ${BINGRP} -m 644 aliases \
+           ${DESTDIR}/etc/mail/aliases
+       /usr/libexec/sendmail/sendmail -C${DESTDIR}/etc/mail/sendmail.cf \
+           -bi -O AliasFile=${DESTDIR}/etc/mail/aliases
        ${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
                ${DESTDIR}/var/mail/root
 

diff --git a/etc/mtree/special b/etc/mtree/special
index 25674ae..8f9011f 100644 (file)
--- a/etc/mtree/special
+++ b/etc/mtree/special
@@ -1,4 +1,4 @@
-#      $OpenBSD: special,v 1.23 2000/01/05 19:57:37 angelos Exp $
+#      $OpenBSD: special,v 1.24 2000/04/06 18:26:05 millert Exp $
 #      $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #      @(#)special     8.2 (Berkeley) 1/23/94
 #
@@ -16,8 +16,6 @@ mem           type=char mode=0640 uname=root gname=kmem
 ..     #dev
 
 etc            type=dir mode=0755 uname=root gname=wheel
-aliases                type=file mode=0644 uname=root gname=wheel optional
-aliases.db     type=file mode=0644 uname=root gname=wheel optional
 crontab                type=file mode=0644 uname=root gname=wheel optional
 csh.cshrc      type=file mode=0644 uname=root gname=wheel
 csh.login      type=file mode=0644 uname=root gname=wheel
@@ -44,6 +42,11 @@ mailer.conf  type=file mode=0644 uname=root gname=wheel
 master.passwd  type=file mode=0600 uname=root gname=wheel
 monthly                type=file mode=0644 uname=root gname=wheel
 monthly.local  type=file mode=0644 uname=root gname=wheel optional
+mail           type=dir mode=0755 uname=root gname=wheel
+aliases                type=file mode=0644 uname=root gname=wheel optional
+aliases.db     type=file mode=0644 uname=root gname=wheel optional
+sendmail.cf    type=file mode=0644 uname=root gname=wheel optional
+..     #mail
 mtree          type=dir mode=0755 uname=root gname=wheel
 special                type=file mode=0600 uname=root gname=wheel
 ..     #mtree
@@ -58,7 +61,6 @@ rc.securelevel        type=file mode=0644 uname=root gname=wheel
 rc.shutdown    type=file mode=0644 uname=root gname=wheel
 security       type=file mode=0644 uname=root gname=wheel
 resolv.conf    type=file mode=0644 uname=root gname=wheel optional
-sendmail.cf    type=file mode=0644 uname=root gname=wheel optional
 shells         type=file mode=0644 uname=root gname=wheel
 skeykeys       type=file mode=0600 uname=root gname=wheel optional
 spwd.db                type=file mode=0600 uname=root gname=wheel

diff --git a/etc/rc b/etc/rc
index 26792c6..13491d5 100644 (file)
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc,v 1.131 2000/03/05 16:55:22 millert Exp $
+#      $OpenBSD: rc,v 1.132 2000/04/06 18:26:04 millert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -445,10 +445,10 @@ if [ X${lpd} = X"YES" ]; then
 fi
 
 # $sendmail_flags is imported from /etc/rc.conf;
-# If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
+# If $sendmail_flags == NO or /etc/mail/sendmail.cf doesn't exist, then
 # sendmail isn't run.  We call sendmail with a full path so that
 # SIGHUP works.
-if [ "X${sendmail_flags}" != X"NO" -a -s /etc/sendmail.cf ]; then
+if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mail/sendmail.cf ]; then
        echo -n ' sendmail';            /usr/sbin/sendmail ${sendmail_flags}
 fi
 

diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile
index 1de0097..6191ea7 100644 (file)
--- a/gnu/usr.sbin/Makefile
+++ b/gnu/usr.sbin/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.4 1998/07/07 18:36:45 art Exp $
+#      $OpenBSD: Makefile,v 1.5 2000/04/06 18:26:03 millert Exp $
 
-SUBDIR+=       mkisofs
+SUBDIR+=       mkisofs sendmail
 
 .include <bsd.subdir.mk>

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index e85eab8..1847a28 100644 (file)
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.61 2000/03/25 01:34:16 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.62 2000/04/06 18:26:02 millert Exp $
 
 # not yet done: catman
 
@@ -12,7 +12,7 @@ SUBDIR=       ac accton adduser amd arp bootpd bootpgw bootpef bootptest \
        netgroup_mkdb openssl pkg_install portmap ppp pppd pstat pwd_mkdb \
        quot quotaon rarpd rbootd rdconfig rdate repquota rmt \
        rpc.bootparamd rpc.lockd rpc.pcnfsd rwhod \
-       sa sendmail sesd sliplogin slstats spray \
+       sa sesd sliplogin slstats spray \
        syslogd tcpdump timed traceroute trpt trsp \
        usbdevs vipw vnconfig zdump zic