From 671b51969c502366cb79e55034ef57f7eedeabe0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 11 Jun 2024 11:58:26 +0200
Subject: [busybox] Remove obsolete patches

---
 core/modules/busybox/1_31_1-stime.patch   | 65 -------------------------------
 core/modules/busybox/module.build         |  8 ----
 core/modules/busybox/timeout-compat.patch | 13 -------
 3 files changed, 86 deletions(-)
 delete mode 100644 core/modules/busybox/1_31_1-stime.patch
 delete mode 100644 core/modules/busybox/timeout-compat.patch

diff --git a/core/modules/busybox/1_31_1-stime.patch b/core/modules/busybox/1_31_1-stime.patch
deleted file mode 100644
index 1cef320b..00000000
--- a/core/modules/busybox/1_31_1-stime.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/coreutils/date.c b/coreutils/date.c
-index 3414d38ae..4ade6abb4 100644
---- a/coreutils/date.c
-+++ b/coreutils/date.c
-@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- 		time(&ts.tv_sec);
- #endif
- 	}
-+#if !ENABLE_FEATURE_DATE_NANO
-+	ts.tv_nsec = 0;
-+#endif
- 	localtime_r(&ts.tv_sec, &tm_time);
- 
- 	/* If date string is given, update tm_time, and maybe set date */
-@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
- 		if (date_str[0] != '@')
- 			tm_time.tm_isdst = -1;
- 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
-+		ts.tv_nsec = 0;
- 
- 		/* if setting time, set it */
--		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
-+		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
- 			bb_perror_msg("can't set date");
- 		}
- 	}
-diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
-index 87cf59b3d..dc40d9155 100644
---- a/libbb/missing_syscalls.c
-+++ b/libbb/missing_syscalls.c
-@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
- 	return syscall(__NR_getsid, pid);
- }
- 
--int stime(const time_t *t)
--{
--	struct timeval tv;
--	tv.tv_sec = *t;
--	tv.tv_usec = 0;
--	return settimeofday(&tv, NULL);
--}
--
- int sethostname(const char *name, size_t len)
- {
- 	return syscall(__NR_sethostname, name, len);
-diff --git a/util-linux/rdate.c b/util-linux/rdate.c
-index 70f829e7f..878375d78 100644
---- a/util-linux/rdate.c
-+++ b/util-linux/rdate.c
-@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
- 	if (!(flags & 2)) { /* no -p (-s may be present) */
- 		if (time(NULL) == remote_time)
- 			bb_error_msg("current time matches remote time");
--		else
--			if (stime(&remote_time) < 0)
-+		else {
-+			struct timespec ts;
-+			ts.tv_sec = remote_time;
-+			ts.tv_nsec = 0;
-+			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
- 				bb_perror_msg_and_die("can't set time of day");
-+		}
- 	}
- 
- 	if (flags != 1) /* not lone -s */
diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build
index 608f9ecb..f5a8ff08 100644
--- a/core/modules/busybox/module.build
+++ b/core/modules/busybox/module.build
@@ -3,14 +3,6 @@
 fetch_source() {
 	autoclone
 	cde src/busybox
-	# Needed for newer glibc
-	if ! grep -q 'OPT_SET.*clock_settime.*CLOCK_REALTIME' "coreutils/date.c"; then
-		git apply "${MODULE_DIR}/1_31_1-stime.patch" || perror "Could not apply stime patch for 1.31.1"
-	fi
-	# Hack for backwards compat to old busybox which required -t (timeout -t [SECS] [PROG...])
-	if ! grep -q 'getopt32.*"t"' "coreutils/timeout.c"; then
-		git apply "${MODULE_DIR}/timeout-compat.patch" || perror "Could not apply timeout backwards compat patch"
-	fi
 	# Patch background filling if not patched yet
 	if ! grep -q "bfill_background" "miscutils/fbsplash.c"; then
 		git apply "${MODULE_DIR}/fbsplash-fillbg.patch" || perror "Could not apply busybox patch for fbsplash background filling"
diff --git a/core/modules/busybox/timeout-compat.patch b/core/modules/busybox/timeout-compat.patch
deleted file mode 100644
index bd176250..00000000
--- a/core/modules/busybox/timeout-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/coreutils/timeout.c b/coreutils/timeout.c
-index 8b7bc2e..974854d 100644
---- a/coreutils/timeout.c
-+++ b/coreutils/timeout.c
-@@ -63,7 +63,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
- 
- 	/* -t SECONDS; -p PARENT_PID */
- 	/* '+': stop at first non-option */
--	getopt32(argv, "+s:" USE_FOR_NOMMU("p:+"), &opt_s, &parent);
-+	getopt32(argv, "+s:" USE_FOR_NOMMU("p:+") "t", &opt_s, &parent);
- 	/*argv += optind; - no, wait for bb_daemonize_or_rexec! */
- 
- 	signo = get_signum(opt_s);
-- 
cgit v1.2.3-55-g7522