diff options
| author | Florian Franzmann | 2020-12-31 19:53:06 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-12-31 19:54:05 +0100 |
| commit | 872dfe5a75d4a34c69d9594207afcb6bf1115379 (patch) | |
| tree | 21a5099e8e8f42b40dbaa18cdbdeac134d6d2126 /shell-term-fm | |
| parent | 87aa67722e8475d2302ed25c3d106f5eafd541c8 (diff) | |
shell-term-fm/busybox: version 1.33.0
Diffstat (limited to 'shell-term-fm')
| -rwxr-xr-x | shell-term-fm/busybox/DETAILS | 2 | ||||
| -rw-r--r-- | shell-term-fm/busybox/HISTORY | 4 | ||||
| -rw-r--r-- | shell-term-fm/busybox/patches/busybox-stime.patch | 65 |
3 files changed, 5 insertions, 66 deletions
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS index 98a7d4f68b..378664c154 100755 --- a/shell-term-fm/busybox/DETAILS +++ b/shell-term-fm/busybox/DETAILS @@ -1,5 +1,5 @@ SPELL=busybox - VERSION=1.31.1 + VERSION=1.33.0 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE=$SPELL-$VERSION.tar.bz2 diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY index 5f3b39a375..423f8736b5 100644 --- a/shell-term-fm/busybox/HISTORY +++ b/shell-term-fm/busybox/HISTORY @@ -1,3 +1,7 @@ +2020-12-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 1.33.0 + * patches/busybox-stime.patch: removed + 2020-08-30 Thomas Orgis <sobukus@sourcemage.org> * PRE_BUILD: ensure non-interative oldconfig, build halting at that point for questions is unacceptable (and happens depending diff --git a/shell-term-fm/busybox/patches/busybox-stime.patch b/shell-term-fm/busybox/patches/busybox-stime.patch deleted file mode 100644 index 1cef320b28..0000000000 --- a/shell-term-fm/busybox/patches/busybox-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 */ |