svn commit: r322277 - in head: tools/build/mk usr.bin usr.bin/ruptime usr.bin/rwho usr.sbin usr.sbin/rwhod

[Jeremie Le Hen]

Author: jlh
Date: Tue Aug  8 20:17:07 2017
New Revision: 322277
URL: https://svnweb.freebsd.org/changeset/base/322277

Log:
  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 at .
  
  This also includes the necesary changes to OptionalObsoleteFiles.inc, as
  requested by jhb at .
  
  PR:		220953
  Reported by:	peter@, jhb@
  Differential Revision:	https://reviews.freebsd.org/D11743

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile
  head/usr.bin/ruptime/ruptime.1
  head/usr.bin/rwho/rwho.1
  head/usr.sbin/Makefile
  head/usr.sbin/rwhod/rwhod.8

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Aug  8 20:17:07 2017	(r322277)
@@ -6895,24 +6895,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_RESCUE} == no

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/usr.bin/Makefile	Tue Aug  8 20:17:07 2017	(r322277)
@@ -133,8 +133,10 @@ SUBDIR=	alias \
 	rpcinfo \
 	rs \
 	rup \
+	ruptime \
 	rusers \
 	rwall \
+	rwho \
 	script \
 	sdiff \
 	sed \
@@ -251,8 +253,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: head/usr.bin/ruptime/ruptime.1
==============================================================================
--- head/usr.bin/ruptime/ruptime.1	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/usr.bin/ruptime/ruptime.1	Tue Aug  8 20:17:07 2017	(r322277)
@@ -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: head/usr.bin/rwho/rwho.1
==============================================================================
--- head/usr.bin/rwho/rwho.1	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/usr.bin/rwho/rwho.1	Tue Aug  8 20:17:07 2017	(r322277)
@@ -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: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/usr.sbin/Makefile	Tue Aug  8 20:17:07 2017	(r322277)
@@ -74,6 +74,7 @@ SUBDIR=	adduser \
 	rpc.statd \
 	rpc.umntall \
 	rtprio \
+	rwhod \
 	service \
 	services_mkdb \
 	sesutil \
@@ -191,7 +192,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: head/usr.sbin/rwhod/rwhod.8
==============================================================================
--- head/usr.sbin/rwhod/rwhod.8	Tue Aug  8 20:07:08 2017	(r322276)
+++ head/usr.sbin/rwhod/rwhod.8	Tue Aug  8 20:17:07 2017	(r322277)
@@ -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