From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 3 Mar 2021 10:28:17 +0000
Subject: gentoo resync : 03.03.2021

---
 sys-apps/busybox/Manifest                          |  1 -
 .../busybox/files/busybox-1.31.1-glibc-2.31.patch  | 65 ----------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch

(limited to 'sys-apps/busybox')

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c713e18b7dc3..2784f3ddab2f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,4 @@
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
-AUX busybox-1.31.1-glibc-2.31.patch 1883 BLAKE2B 127f3f8e90c97af175c28bc8033805083de0ec50281ad65a801fd2282913aa6b1ebe4735c124209df4ef8b4a76d3360a8ffd8fdc09d70a7b9c0fade29807f69d SHA512 9c593a67c4e635928d11f89b1ef75877ef0f5c5b25cf0dafd1fceb8dade57ec3590f16967e680422e66c00a2a70693e124c53ee5eec72d0697e33935b5280fd7
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
 AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
 AUX klogd.initd 245 BLAKE2B e8b8045cebfd39a8a088b70142e47442224ddf51d06b7ba7614721eb06bb8662184133d5464c79ece4826e5f338b54b6e2154b67f59c25dc9324fa526e82caf6 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835
diff --git a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
deleted file mode 100644
index 1cef320b2842..000000000000
--- a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.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 */
-- 
cgit v1.2.3