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:	33ff39796ffe Add zfskeys rc.d script for auto-loading encryption keys
Relnotes:	yes
Sponsored by:	Modirum MDPay
Sponsored by:	Klara Inc.
Differential Revision:	https://reviews.freebsd.org/D38344

(cherry picked from commit e7ab133648a168c4bf7c11da840663c5581771d8)

11 files changed, 9 insertions, 3 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1dac72154539..fd0c71b4814a 100644
--- a/ObsoleteFiles.inc
+++ b/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
+
 # 20221015: update the ithread(9) man page
 OLD_FILES+=usr/share/man/man9/ithread.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_add_handler.9.gz
diff --git a/bin/Makefile b/bin/Makefile
index 3ad97ac8d624..cdd96d0b84e8 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -38,6 +38,7 @@ SUBDIR= cat \
 	stty \
 	sync \
 	test \
+	timeout \
 	uuidgen
 
 SUBDIR.${MK_SENDMAIL}+=	rmail
diff --git a/usr.bin/timeout/Makefile b/bin/timeout/Makefile
index fc1c87edfb7a..2eb88d6827fa 100644
--- a/usr.bin/timeout/Makefile
+++ b/bin/timeout/Makefile
@@ -4,6 +4,8 @@
 
 PROG=	timeout
 
+SYMLINKS=	../..${BINDIR}/timeout /usr/bin/timeout
+
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
diff --git a/usr.bin/timeout/Makefile.depend b/bin/timeout/Makefile.depend
index 6cfaab1c3644..6cfaab1c3644 100644
--- a/usr.bin/timeout/Makefile.depend
+++ b/bin/timeout/Makefile.depend
diff --git a/usr.bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile
index 691a27df20b1..691a27df20b1 100644
--- a/usr.bin/timeout/tests/Makefile
+++ b/bin/timeout/tests/Makefile
diff --git a/usr.bin/timeout/tests/Makefile.depend b/bin/timeout/tests/Makefile.depend
index f80275d86ab1..f80275d86ab1 100644
--- a/usr.bin/timeout/tests/Makefile.depend
+++ b/bin/timeout/tests/Makefile.depend
diff --git a/usr.bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh
index ffddfcafb4bb..ffddfcafb4bb 100644
--- a/usr.bin/timeout/tests/timeout_test.sh
+++ b/bin/timeout/tests/timeout_test.sh
diff --git a/usr.bin/timeout/timeout.1 b/bin/timeout/timeout.1
index 843c6215cc80..843c6215cc80 100644
--- a/usr.bin/timeout/timeout.1
+++ b/bin/timeout/timeout.1
diff --git a/usr.bin/timeout/timeout.c b/bin/timeout/timeout.c
index d682541e9162..d682541e9162 100644
--- a/usr.bin/timeout/timeout.c
+++ b/bin/timeout/timeout.c
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 136877db00d6..1b2c94f42a6b 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -62,6 +62,8 @@
         ..
         test
         ..
+        timeout
+        ..
     ..
     cddl
         lib
@@ -1090,8 +1092,6 @@
         ..
         tar
         ..
-        timeout
-        ..
         tr
         ..
         truncate
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index cd0e6730d568..0b32b8a7f745 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -153,7 +153,6 @@ SUBDIR=	alias \
 	tcopy \
 	tee \
 	time \
-	timeout \
 	tip \
 	top \
 	touch \