git: 0a4f7dbd9e94 - stable/13 - timeout: Move from /usr/bin to /bin

The branch stable/13 has been updated by 0mp (doc, ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=0a4f7dbd9e9450cea25af944d47dce578960a1b8

commit 0a4f7dbd9e9450cea25af944d47dce578960a1b8
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2023-02-01 15:24:59 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2023-02-07 17:37:53 +0000

    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)
---
 ObsoleteFiles.inc                              | 4 ++++
 bin/Makefile                                   | 1 +
 {usr.bin => bin}/timeout/Makefile              | 2 ++
 {usr.bin => bin}/timeout/Makefile.depend       | 0
 {usr.bin => bin}/timeout/tests/Makefile        | 0
 {usr.bin => bin}/timeout/tests/Makefile.depend | 0
 {usr.bin => bin}/timeout/tests/timeout_test.sh | 0
 {usr.bin => bin}/timeout/timeout.1             | 0
 {usr.bin => bin}/timeout/timeout.c             | 0
 etc/mtree/BSD.tests.dist                       | 4 ++--
 usr.bin/Makefile                               | 1 -
 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
similarity index 69%
rename from usr.bin/timeout/Makefile
rename to 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
similarity index 100%
rename from usr.bin/timeout/Makefile.depend
rename to bin/timeout/Makefile.depend
diff --git a/usr.bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile
similarity index 100%
rename from usr.bin/timeout/tests/Makefile
rename to bin/timeout/tests/Makefile
diff --git a/usr.bin/timeout/tests/Makefile.depend b/bin/timeout/tests/Makefile.depend
similarity index 100%
rename from usr.bin/timeout/tests/Makefile.depend
rename to bin/timeout/tests/Makefile.depend
diff --git a/usr.bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh
similarity index 100%
rename from usr.bin/timeout/tests/timeout_test.sh
rename to bin/timeout/tests/timeout_test.sh
diff --git a/usr.bin/timeout/timeout.1 b/bin/timeout/timeout.1
similarity index 100%
rename from usr.bin/timeout/timeout.1
rename to bin/timeout/timeout.1
diff --git a/usr.bin/timeout/timeout.c b/bin/timeout/timeout.c
similarity index 100%
rename from usr.bin/timeout/timeout.c
rename to 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 \