Author: emaste
Date: Sun Mar 11 17:40:02 2018
New Revision: 330769
URL: https://svnweb.freebsd.org/changeset/base/330769
Log:
MFC r322277 by jlh:
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
Modified:
stable/11/tools/build/mk/OptionalObsoleteFiles.inc
stable/11/usr.bin/Makefile
stable/11/usr.bin/ruptime/ruptime.1
stable/11/usr.bin/rwho/rwho.1
stable/11/usr.sbin/Makefile
stable/11/usr.sbin/rwhod/rwhod.8
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 11 17:21:48
2018 (r330768)
+++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 11 17:40:02
2018 (r330769)
@@ -7147,24 +7147,16 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.gz
.if ${MK_RCMDS} == no
OLD_FILES+=bin/rcp
-OLD_FILES+=etc/rc.d/rwho
-OLD_FILES+=etc/periodic/daily/140.clean-rwho
OLD_FILES+=rescue/rcp
OLD_FILES+=usr/bin/rlogin
OLD_FILES+=usr/bin/rsh
-OLD_FILES+=usr/bin/ruptime
-OLD_FILES+=usr/bin/rwho
OLD_FILES+=usr/libexec/rlogind
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/rlogin.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/rshd.8.gz
-OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif
.if ${MK_RCS} == no
Modified: stable/11/usr.bin/Makefile
==============================================================================
--- stable/11/usr.bin/Makefile Sun Mar 11 17:21:48 2018 (r330768)
+++ stable/11/usr.bin/Makefile Sun Mar 11 17:40:02 2018 (r330769)
@@ -133,8 +133,10 @@ SUBDIR= alias \
rpcinfo \
rs \
rup \
+ ruptime \
rusers \
rwall \
+ rwho \
script \
sdiff \
sed \
@@ -255,8 +257,6 @@ SUBDIR.${MK_OPENSSL}+= newkey
SUBDIR.${MK_QUOTAS}+= quota
SUBDIR.${MK_RCMDS}+= rlogin
SUBDIR.${MK_RCMDS}+= rsh
-SUBDIR.${MK_RCMDS}+= ruptime
-SUBDIR.${MK_RCMDS}+= rwho
SUBDIR.${MK_SENDMAIL}+= vacation
SUBDIR.${MK_TALK}+= talk
SUBDIR.${MK_TELNET}+= telnet
Modified: stable/11/usr.bin/ruptime/ruptime.1
==============================================================================
--- stable/11/usr.bin/ruptime/ruptime.1 Sun Mar 11 17:21:48 2018
(r330768)
+++ stable/11/usr.bin/ruptime/ruptime.1 Sun Mar 11 17:40:02 2018
(r330769)
@@ -38,15 +38,6 @@
.Nm
.Op Fl alrtu
.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
The
.Nm
Modified: stable/11/usr.bin/rwho/rwho.1
==============================================================================
--- stable/11/usr.bin/rwho/rwho.1 Sun Mar 11 17:21:48 2018
(r330768)
+++ stable/11/usr.bin/rwho/rwho.1 Sun Mar 11 17:40:02 2018
(r330769)
@@ -37,15 +37,6 @@
.Sh SYNOPSIS
.Nm
.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
The
.Nm
Modified: stable/11/usr.sbin/Makefile
==============================================================================
--- stable/11/usr.sbin/Makefile Sun Mar 11 17:21:48 2018 (r330768)
+++ stable/11/usr.sbin/Makefile Sun Mar 11 17:40:02 2018 (r330769)
@@ -73,6 +73,7 @@ SUBDIR= adduser \
rpc.statd \
rpc.umntall \
rtprio \
+ rwhod \
service \
services_mkdb \
sesutil \
@@ -190,7 +191,6 @@ SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota
SUBDIR.${MK_QUOTAS}+= quotaon
SUBDIR.${MK_QUOTAS}+= repquota
-SUBDIR.${MK_RCMDS}+= rwhod
SUBDIR.${MK_SENDMAIL}+= editmap
SUBDIR.${MK_SENDMAIL}+= mailstats
SUBDIR.${MK_SENDMAIL}+= makemap
Modified: stable/11/usr.sbin/rwhod/rwhod.8
==============================================================================
--- stable/11/usr.sbin/rwhod/rwhod.8 Sun Mar 11 17:21:48 2018
(r330768)
+++ stable/11/usr.sbin/rwhod/rwhod.8 Sun Mar 11 17:40:02 2018
(r330769)
@@ -40,15 +40,6 @@
.Op Fl p
.Op Fl l
.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
The
.Nm
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
