svn commit: r324351 - in head: . bin bin/rcp etc etc/mtree etc/pam.d libexec libexec/rlogind libexec/rshd rescue/rescue share/man/man5 share/mk tools/build/mk tools/build/options tools/tools/nanobs...

Jeremie Le Hen jlh at FreeBSD.org
Fri Oct 6 08:43:17 UTC 2017


Author: jlh
Date: Fri Oct  6 08:43:14 2017
New Revision: 324351
URL: https://svnweb.freebsd.org/changeset/base/324351

Log:
  Remove rcmds.
  
  If they are still needed, you can find them in the net/bsdrcmds port.
  
  This was proposed June, 20th and approved by various committers [1].
  They have been marked as deprecated on CURRENT in r320644 [2] on July, 4th.
  Both stable/11 and release/11.1 contain the deprecation notice (thanks to
  allanjude@).
  
  Note that ruptime(1)/rwho(1)/rwhod(8) were initially thought to be part of
  rcmds but this was a mistake and those are therefore NOT removed.
  
  [1] https://lists.freebsd.org/pipermail/freebsd-arch/2017-June/018239.html
  [2] https://svnweb.freebsd.org/base?view=revision&revision=320644
  
  Reviewed by:	bapt, brooks
  Differential Revision:	https://reviews.freebsd.org/D12573

Deleted:
  head/bin/rcp/
  head/etc/pam.d/rsh
  head/libexec/rlogind/
  head/libexec/rshd/
  head/tools/build/options/WITHOUT_RCMDS
  head/tools/build/options/WITH_RCMDS
  head/usr.bin/rlogin/
  head/usr.bin/rsh/
Modified:
  head/ObsoleteFiles.inc
  head/bin/Makefile
  head/etc/inetd.conf
  head/etc/mtree/BSD.tests.dist
  head/etc/pam.d/Makefile
  head/libexec/Makefile
  head/rescue/rescue/Makefile
  head/share/man/man5/src.conf.5
  head/share/mk/src.opts.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/tools/nanobsd/dhcpd/common
  head/tools/tools/nanobsd/embedded/common
  head/tools/tools/nanobsd/gateworks/common
  head/usr.bin/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/ObsoleteFiles.inc	Fri Oct  6 08:43:14 2017	(r324351)
@@ -38,6 +38,18 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20171003: remove RCMDS
+OLD_FILES+=bin/rcp
+OLD_FILES+=rescue/rcp
+OLD_FILES+=usr/bin/rlogin
+OLD_FILES+=usr/bin/rsh
+OLD_FILES+=usr/libexec/rlogind
+OLD_FILES+=usr/libexec/rshd
+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/man8/rlogind.8.gz
+OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl

Modified: head/bin/Makefile
==============================================================================
--- head/bin/Makefile	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/bin/Makefile	Fri Oct  6 08:43:14 2017	(r324351)
@@ -40,7 +40,6 @@ SUBDIR= cat \
 	test \
 	uuidgen
 
-SUBDIR.${MK_RCMDS}+=	rcp
 SUBDIR.${MK_SENDMAIL}+=	rmail
 SUBDIR.${MK_TCSH}+=	csh
 SUBDIR.${MK_TESTS}+=	tests

Modified: head/etc/inetd.conf
==============================================================================
--- head/etc/inetd.conf	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/etc/inetd.conf	Fri Oct  6 08:43:14 2017	(r324351)
@@ -12,10 +12,10 @@
 #ssh	stream	tcp6	nowait	root	/usr/sbin/sshd		sshd -i -6
 #telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd
 #telnet	stream	tcp6	nowait	root	/usr/libexec/telnetd	telnetd
-#shell	stream	tcp	nowait	root	/usr/libexec/rshd	rshd
-#shell	stream	tcp6	nowait	root	/usr/libexec/rshd	rshd
-#login	stream	tcp	nowait	root	/usr/libexec/rlogind	rlogind
-#login	stream	tcp6	nowait	root	/usr/libexec/rlogind	rlogind
+#shell	stream	tcp	nowait	root	/usr/local/sbin/rshd	rshd
+#shell	stream	tcp6	nowait	root	/usr/local/sbin/rshd	rshd
+#login	stream	tcp	nowait	root	/usr/local/sbin/rlogind	rlogind
+#login	stream	tcp6	nowait	root	/usr/local/sbin/rlogind	rlogind
 #finger	stream	tcp	nowait/3/10 nobody /usr/libexec/fingerd	fingerd -k -s
 #finger	stream	tcp6	nowait/3/10 nobody /usr/libexec/fingerd	fingerd -k -s
 #

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/etc/mtree/BSD.tests.dist	Fri Oct  6 08:43:14 2017	(r324351)
@@ -34,8 +34,6 @@
         ..
         pwait
         ..
-        rcp
-        ..
         rmdir
         ..
         sh

Modified: head/etc/pam.d/Makefile
==============================================================================
--- head/etc/pam.d/Makefile	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/etc/pam.d/Makefile	Fri Oct  6 08:43:14 2017	(r324351)
@@ -35,14 +35,6 @@ FTPMODE=	${FILESMODE}
 LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 .endif
 
-.if ${MK_RCMDS} != "no"
-FILESGROUPS+=	RCMDS
-RCMDS+=		rsh
-RCMDSPACKAGE+=	rcmds
-RCMDSDIR=	${FILESDIR}
-RCMDSMODE=	${FILESMODE}
-.endif
-
 .if ${MK_TELNET} != "no"
 FILESGROUPS+=	TELNET
 TELNET+=	telnetd

Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/libexec/Makefile	Fri Oct  6 08:43:14 2017	(r324351)
@@ -79,11 +79,6 @@ _rtld-elf=	rtld-elf
 SUBDIR+=	rbootd
 .endif
 
-.if ${MK_RCMDS} != "no"
-_rlogind=	rlogind
-_rshd=		rshd
-.endif
-
 .if ${MK_SENDMAIL} != "no"
 _mail.local=	mail.local
 _smrsh=		smrsh

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/rescue/rescue/Makefile	Fri Oct  6 08:43:14 2017	(r324351)
@@ -67,10 +67,6 @@ CRUNCH_ALIAS_rm= unlink
 CRUNCH_ALIAS_ed= red
 CRUNCH_ALIAS_pkill= pgrep
 
-.if ${MK_RCMDS} != "no"
-CRUNCH_PROGS_bin+= rcp
-.endif
-
 .if ${MK_TCSH} != "no"
 CRUNCH_PROGS_bin+= csh
 CRUNCH_ALIAS_csh= -csh tcsh -tcsh

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/share/man/man5/src.conf.5	Fri Oct  6 08:43:14 2017	(r324351)
@@ -1294,14 +1294,6 @@ by proxy.
 .It Va WITHOUT_RBOOTD
 Set to not build or install
 .Xr rbootd 8 .
-.It Va WITH_RCMDS
-Enable building of the
-.Bx
-r-commands.
-This includes
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-etc.
 .It Va WITH_REPRODUCIBLE_BUILD
 Set to exclude build metadata (such as the build time, user, or host)
 from the kernel, boot loaders, and uname output, so that builds produce

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/share/mk/src.opts.mk	Fri Oct  6 08:43:14 2017	(r324351)
@@ -184,7 +184,6 @@ __DEFAULT_NO_OPTIONS = \
     NAND \
     OFED \
     OPENLDAP \
-    RCMDS \
     REPRODUCIBLE_BUILD \
     RPCBIND_WARMSTART_SUPPORT \
     SHARED_TOOLCHAIN \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Oct  6 08:43:14 2017	(r324351)
@@ -7107,20 +7107,6 @@ OLD_FILES+=usr/libexec/rbootd
 OLD_FILES+=usr/share/man/man8/rbootd.8.gz
 .endif
 
-.if ${MK_RCMDS} == no
-OLD_FILES+=bin/rcp
-OLD_FILES+=rescue/rcp
-OLD_FILES+=usr/bin/rlogin
-OLD_FILES+=usr/bin/rsh
-OLD_FILES+=usr/libexec/rlogind
-OLD_FILES+=usr/libexec/rshd
-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/man8/rlogind.8.gz
-OLD_FILES+=usr/share/man/man8/rshd.8.gz
-.endif
-
 .if ${MK_RESCUE} == no
 . if exists(${DESTDIR}${TESTSBASE})
 RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo

Modified: head/tools/tools/nanobsd/dhcpd/common
==============================================================================
--- head/tools/tools/nanobsd/dhcpd/common	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/tools/tools/nanobsd/dhcpd/common	Fri Oct  6 08:43:14 2017	(r324351)
@@ -129,7 +129,6 @@ WITHOUT_NLS=true
 WITHOUT_NS_CACHING=true
 WITHOUT_OBJC=true
 WITHOUT_PROFILE=true
-WITHOUT_RCMDS=true
 WITHOUT_SENDMAIL=true
 WITHOUT_SHAREDOCS=true
 WITHOUT_SYSCONS=true

Modified: head/tools/tools/nanobsd/embedded/common
==============================================================================
--- head/tools/tools/nanobsd/embedded/common	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/tools/tools/nanobsd/embedded/common	Fri Oct  6 08:43:14 2017	(r324351)
@@ -160,7 +160,6 @@ WITHOUT_NLS=true
 WITHOUT_NS_CACHING=true
 WITHOUT_OBJC=true
 WITHOUT_PROFILE=true
-WITHOUT_RCMDS=true
 WITHOUT_SENDMAIL=true
 WITHOUT_SHAREDOCS=true
 WITHOUT_SYSCONS=true

Modified: head/tools/tools/nanobsd/gateworks/common
==============================================================================
--- head/tools/tools/nanobsd/gateworks/common	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/tools/tools/nanobsd/gateworks/common	Fri Oct  6 08:43:14 2017	(r324351)
@@ -140,7 +140,6 @@ WITHOUT_PMC=true
 WITHOUT_PORTSNAP=true
 WITHOUT_PROFILE=true
 WITHOUT_QUOTAS=true
-WITHOUT_RCMDS=true
 WITHOUT_RCS=true
 WITHOUT_RESCUE=true
 WITHOUT_SENDMAIL=true

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Fri Oct  6 08:28:35 2017	(r324350)
+++ head/usr.bin/Makefile	Fri Oct  6 08:43:14 2017	(r324351)
@@ -250,8 +250,6 @@ SUBDIR.${MK_OPENSSL}+=	chkey
 SUBDIR.${MK_OPENSSL}+=	dc
 SUBDIR.${MK_OPENSSL}+=	newkey
 SUBDIR.${MK_QUOTAS}+=	quota
-SUBDIR.${MK_RCMDS}+=	rlogin
-SUBDIR.${MK_RCMDS}+=	rsh
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_TALK}+=	talk
 SUBDIR.${MK_TELNET}+=	telnet


More information about the svn-src-all mailing list