1 |
commit: 95558f15ee3121244f0b49184bcb43e2b280f72c |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Feb 22 16:30:48 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 15:34:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95558f15 |
7 |
|
8 |
sys-apps/busybox: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/19599 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../busybox/files/busybox-1.31.1-glibc-2.31.patch | 65 ---------------------- |
16 |
1 file changed, 65 deletions(-) |
17 |
|
18 |
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 |
19 |
deleted file mode 100644 |
20 |
index 1cef320b284..00000000000 |
21 |
--- a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch |
22 |
+++ /dev/null |
23 |
@@ -1,65 +0,0 @@ |
24 |
-diff --git a/coreutils/date.c b/coreutils/date.c |
25 |
-index 3414d38ae..4ade6abb4 100644 |
26 |
---- a/coreutils/date.c |
27 |
-+++ b/coreutils/date.c |
28 |
-@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) |
29 |
- time(&ts.tv_sec); |
30 |
- #endif |
31 |
- } |
32 |
-+#if !ENABLE_FEATURE_DATE_NANO |
33 |
-+ ts.tv_nsec = 0; |
34 |
-+#endif |
35 |
- localtime_r(&ts.tv_sec, &tm_time); |
36 |
- |
37 |
- /* If date string is given, update tm_time, and maybe set date */ |
38 |
-@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv) |
39 |
- if (date_str[0] != '@') |
40 |
- tm_time.tm_isdst = -1; |
41 |
- ts.tv_sec = validate_tm_time(date_str, &tm_time); |
42 |
-+ ts.tv_nsec = 0; |
43 |
- |
44 |
- /* if setting time, set it */ |
45 |
-- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { |
46 |
-+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { |
47 |
- bb_perror_msg("can't set date"); |
48 |
- } |
49 |
- } |
50 |
-diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c |
51 |
-index 87cf59b3d..dc40d9155 100644 |
52 |
---- a/libbb/missing_syscalls.c |
53 |
-+++ b/libbb/missing_syscalls.c |
54 |
-@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) |
55 |
- return syscall(__NR_getsid, pid); |
56 |
- } |
57 |
- |
58 |
--int stime(const time_t *t) |
59 |
--{ |
60 |
-- struct timeval tv; |
61 |
-- tv.tv_sec = *t; |
62 |
-- tv.tv_usec = 0; |
63 |
-- return settimeofday(&tv, NULL); |
64 |
--} |
65 |
-- |
66 |
- int sethostname(const char *name, size_t len) |
67 |
- { |
68 |
- return syscall(__NR_sethostname, name, len); |
69 |
-diff --git a/util-linux/rdate.c b/util-linux/rdate.c |
70 |
-index 70f829e7f..878375d78 100644 |
71 |
---- a/util-linux/rdate.c |
72 |
-+++ b/util-linux/rdate.c |
73 |
-@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) |
74 |
- if (!(flags & 2)) { /* no -p (-s may be present) */ |
75 |
- if (time(NULL) == remote_time) |
76 |
- bb_error_msg("current time matches remote time"); |
77 |
-- else |
78 |
-- if (stime(&remote_time) < 0) |
79 |
-+ else { |
80 |
-+ struct timespec ts; |
81 |
-+ ts.tv_sec = remote_time; |
82 |
-+ ts.tv_nsec = 0; |
83 |
-+ if (clock_settime(CLOCK_REALTIME, &ts) < 0) |
84 |
- bb_perror_msg_and_die("can't set time of day"); |
85 |
-+ } |
86 |
- } |
87 |
- |
88 |
- if (flags != 1) /* not lone -s */ |