timeout: Move from /usr/bin to /bin

timeout(1) is used by /etc/rc.d/zfskeys. Unfortunately, having
timeout(1) installed in /usr/bin causes problems when /usr is an
encrypted ZFS partition.

Implementing timeout(1) in sh(1) is not trivial. A more elegant solution
is to move timeout(1) to /bin so that it is available to early services
in the boot process.

PR:		265221
Reviewed by:	allanjude, des, imp
Approved by:	allanjude, des, imp
Reported by:	Ivan <r4@sovserv.ru>
Fixes:	33ff39796f Add zfskeys rc.d script for auto-loading encryption keys
MFC after:	1 week
Relnotes:	yes
Sponsored by:	Modirum MDPay
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D38344

ObsoleteFiles.inc

@@ -52,6 +52,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20230201: timeout moved from /usr/bin to /bin
+OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test
+
 # 20230124: rtalloc.9 removed
 OLD_FILES+=usr/share/man/man9/rtalloc.9.gz
 

bin/Makefile

@@ -38,6 +38,7 @@ SUBDIR= cat \
 	stty \
 	sync \
 	test \
+	timeout \
 	uuidgen
 
 SUBDIR.${MK_SENDMAIL}+=	rmail

bin/timeout/Makefile

@@ -4,6 +4,8 @@
 
 PROG=	timeout
 
+SYMLINKS=	../..${BINDIR}/timeout /usr/bin/timeout
+
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 

etc/mtree/BSD.tests.dist

@@ -62,6 +62,8 @@
         ..
         test
         ..
+        timeout
+        ..
     ..
     cddl
         lib
@@ -1106,8 +1108,6 @@
         ..
         tar
         ..
-        timeout
-        ..
         tr
         ..
         truncate

usr.bin/Makefile

@@ -152,7 +152,6 @@ SUBDIR=	alias \
 	tcopy \
 	tee \
 	time \
-	timeout \
 	tip \
 	top \
 	touch \