wok-current annotate busybox/stuff/busybox-1.31-remove-stime-function-calls.patch @ rev 25785

Mass rebuild after bump to glibc 2.31, add epson printer and scanner package
author Stanislas Leduc <shann@slitaz.org>
date Tue Jul 15 20:40:17 2025 +0000 (3 months ago)
parents
children
rev   line source
shann@25785 1 From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001
shann@25785 2 From: Alistair Francis <alistair.francis@wdc.com>
shann@25785 3 Date: Tue, 19 Nov 2019 13:06:40 +0100
shann@25785 4 Subject: Remove stime() function calls
shann@25785 5
shann@25785 6 stime() has been deprecated in glibc 2.31 and replaced with
shann@25785 7 clock_settime(). Let's replace the stime() function calls with
shann@25785 8 clock_settime() in preperation.
shann@25785 9
shann@25785 10 function old new delta
shann@25785 11 rdate_main 197 224 +27
shann@25785 12 clock_settime - 27 +27
shann@25785 13 date_main 926 941 +15
shann@25785 14 stime 37 - -37
shann@25785 15 ------------------------------------------------------------------------------
shann@25785 16 (add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes
shann@25785 17
shann@25785 18 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
shann@25785 19 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
shann@25785 20 ---
shann@25785 21
shann@25785 22 https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9
shann@25785 23
shann@25785 24 diff --git a/coreutils/date.c b/coreutils/date.c
shann@25785 25 index 3414d38ae..4ade6abb4 100644
shann@25785 26 --- a/coreutils/date.c
shann@25785 27 +++ b/coreutils/date.c
shann@25785 28 @@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
shann@25785 29 time(&ts.tv_sec);
shann@25785 30 #endif
shann@25785 31 }
shann@25785 32 +#if !ENABLE_FEATURE_DATE_NANO
shann@25785 33 + ts.tv_nsec = 0;
shann@25785 34 +#endif
shann@25785 35 localtime_r(&ts.tv_sec, &tm_time);
shann@25785 36
shann@25785 37 /* If date string is given, update tm_time, and maybe set date */
shann@25785 38 @@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
shann@25785 39 if (date_str[0] != '@')
shann@25785 40 tm_time.tm_isdst = -1;
shann@25785 41 ts.tv_sec = validate_tm_time(date_str, &tm_time);
shann@25785 42 + ts.tv_nsec = 0;
shann@25785 43
shann@25785 44 /* if setting time, set it */
shann@25785 45 - if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
shann@25785 46 + if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
shann@25785 47 bb_perror_msg("can't set date");
shann@25785 48 }
shann@25785 49 }
shann@25785 50 diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
shann@25785 51 index 87cf59b3d..dc40d9155 100644
shann@25785 52 --- a/libbb/missing_syscalls.c
shann@25785 53 +++ b/libbb/missing_syscalls.c
shann@25785 54 @@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
shann@25785 55 return syscall(__NR_getsid, pid);
shann@25785 56 }
shann@25785 57
shann@25785 58 -int stime(const time_t *t)
shann@25785 59 -{
shann@25785 60 - struct timeval tv;
shann@25785 61 - tv.tv_sec = *t;
shann@25785 62 - tv.tv_usec = 0;
shann@25785 63 - return settimeofday(&tv, NULL);
shann@25785 64 -}
shann@25785 65 -
shann@25785 66 int sethostname(const char *name, size_t len)
shann@25785 67 {
shann@25785 68 return syscall(__NR_sethostname, name, len);
shann@25785 69 diff --git a/util-linux/rdate.c b/util-linux/rdate.c
shann@25785 70 index 70f829e7f..878375d78 100644
shann@25785 71 --- a/util-linux/rdate.c
shann@25785 72 +++ b/util-linux/rdate.c
shann@25785 73 @@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
shann@25785 74 if (!(flags & 2)) { /* no -p (-s may be present) */
shann@25785 75 if (time(NULL) == remote_time)
shann@25785 76 bb_error_msg("current time matches remote time");
shann@25785 77 - else
shann@25785 78 - if (stime(&remote_time) < 0)
shann@25785 79 + else {
shann@25785 80 + struct timespec ts;
shann@25785 81 + ts.tv_sec = remote_time;
shann@25785 82 + ts.tv_nsec = 0;
shann@25785 83 + if (clock_settime(CLOCK_REALTIME, &ts) < 0)
shann@25785 84 bb_perror_msg_and_die("can't set time of day");
shann@25785 85 + }
shann@25785 86 }
shann@25785 87
shann@25785 88 if (flags != 1) /* not lone -s */