rwho/ruptime/rwhod shouldn't be gated by RCMDS.

As peter@ points out in pr/220953:
"rwho, rwhod and ruptime are not part of the remote login suite (rsh, rlogin
etc).

They should *not* be in the rcmds package which is disabled by default.  We
rely on rwho/rwhod/ruptime in the freebsd.org cluster."

This commit is a re-commit of r322029 and r322031 with a better commit log, as
pointed out by ngie@.

This also includes the necesary changes to OptionalObsoleteFiles.inc, as
requested by jhb@.

PR:		220953
Reported by:	peter@, jhb@
Differential Revision:	https://reviews.freebsd.org/D11743
This commit is contained in:
Jeremie Le Hen 2017-08-08 20:17:07 +00:00
parent eba789dcca
commit ac0ced90e0
6 changed files with 3 additions and 38 deletions

View File

@ -6895,24 +6895,16 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz
.if ${MK_RCMDS} == no .if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp OLD_FILES+=bin/rcp
OLD_FILES+=etc/rc.d/rwho
OLD_FILES+=etc/periodic/daily/140.clean-rwho
OLD_FILES+=rescue/rcp OLD_FILES+=rescue/rcp
OLD_FILES+=usr/bin/rlogin OLD_FILES+=usr/bin/rlogin
OLD_FILES+=usr/bin/rsh OLD_FILES+=usr/bin/rsh
OLD_FILES+=usr/bin/ruptime
OLD_FILES+=usr/bin/rwho
OLD_FILES+=usr/libexec/rlogind OLD_FILES+=usr/libexec/rlogind
OLD_FILES+=usr/libexec/rshd OLD_FILES+=usr/libexec/rshd
OLD_FILES+=usr/sbin/rwhod
OLD_FILES+=usr/share/man/man1/rcp.1.gz OLD_FILES+=usr/share/man/man1/rcp.1.gz
OLD_FILES+=usr/share/man/man1/rlogin.1.gz OLD_FILES+=usr/share/man/man1/rlogin.1.gz
OLD_FILES+=usr/share/man/man1/rsh.1.gz OLD_FILES+=usr/share/man/man1/rsh.1.gz
OLD_FILES+=usr/share/man/man1/ruptime.1.gz
OLD_FILES+=usr/share/man/man1/rwho.1.gz
OLD_FILES+=usr/share/man/man8/rlogind.8.gz OLD_FILES+=usr/share/man/man8/rlogind.8.gz
OLD_FILES+=usr/share/man/man8/rshd.8.gz OLD_FILES+=usr/share/man/man8/rshd.8.gz
OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif .endif
.if ${MK_RESCUE} == no .if ${MK_RESCUE} == no

View File

@ -133,8 +133,10 @@ SUBDIR= alias \
rpcinfo \ rpcinfo \
rs \ rs \
rup \ rup \
ruptime \
rusers \ rusers \
rwall \ rwall \
rwho \
script \ script \
sdiff \ sdiff \
sed \ sed \
@ -251,8 +253,6 @@ SUBDIR.${MK_OPENSSL}+= newkey
SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_QUOTAS}+= quota
SUBDIR.${MK_RCMDS}+= rlogin SUBDIR.${MK_RCMDS}+= rlogin
SUBDIR.${MK_RCMDS}+= rsh SUBDIR.${MK_RCMDS}+= rsh
SUBDIR.${MK_RCMDS}+= ruptime
SUBDIR.${MK_RCMDS}+= rwho
SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_SENDMAIL}+= vacation
SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TALK}+= talk
SUBDIR.${MK_TELNET}+= telnet SUBDIR.${MK_TELNET}+= telnet

View File

@ -38,15 +38,6 @@
.Nm .Nm
.Op Fl alrtu .Op Fl alrtu
.Op Ar host ... .Op Ar host ...
.Sh DEPRECATION NOTICE
.Nm
is deprecated and will be removed from future versions of the
.Fx
base system.
If
.Nm
is still required, it can be installed from ports or packages
(net/bsdrcmds).
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Nm .Nm

View File

@ -37,15 +37,6 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl a .Op Fl a
.Sh DEPRECATION NOTICE
.Nm
is deprecated and will be removed from future versions of the
.Fx
base system.
If
.Nm
is still required, it can be installed from ports or packages
(net/bsdrcmds).
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Nm .Nm

View File

@ -74,6 +74,7 @@ SUBDIR= adduser \
rpc.statd \ rpc.statd \
rpc.umntall \ rpc.umntall \
rtprio \ rtprio \
rwhod \
service \ service \
services_mkdb \ services_mkdb \
sesutil \ sesutil \
@ -191,7 +192,6 @@ SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota SUBDIR.${MK_QUOTAS}+= edquota
SUBDIR.${MK_QUOTAS}+= quotaon SUBDIR.${MK_QUOTAS}+= quotaon
SUBDIR.${MK_QUOTAS}+= repquota SUBDIR.${MK_QUOTAS}+= repquota
SUBDIR.${MK_RCMDS}+= rwhod
SUBDIR.${MK_SENDMAIL}+= editmap SUBDIR.${MK_SENDMAIL}+= editmap
SUBDIR.${MK_SENDMAIL}+= mailstats SUBDIR.${MK_SENDMAIL}+= mailstats
SUBDIR.${MK_SENDMAIL}+= makemap SUBDIR.${MK_SENDMAIL}+= makemap

View File

@ -40,15 +40,6 @@
.Op Fl p .Op Fl p
.Op Fl l .Op Fl l
.Op Fl m Op Ar ttl .Op Fl m Op Ar ttl
.Sh DEPRECATION NOTICE
.Nm
is deprecated and will be removed from future versions of the
.Fx
base system.
If
.Nm
is still required, it can be installed from ports or packages
(net/bsdrcmds).
.Sh DESCRIPTION .Sh DESCRIPTION
The The
.Nm .Nm