busybox: version bump 1.29.3 -> 1.31.1

The old version fails to build with glibc >= 2.31.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 91 insertions, 1 deletions

diff --git a/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch b/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch
new file mode 100644
index 000000000..5e4c62ee1
--- /dev/null
+++ b/patches/busybox-1.31.1/0100-Remove-stime-function-calls.patch
@@ -0,0 +1,89 @@
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Tue, 19 Nov 2019 13:06:40 +0100
+Subject: [PATCH] Remove stime() function calls
+
+stime() has been deprecated in glibc 2.31 and replaced with
+clock_settime(). Let's replace the stime() function calls with
+clock_settime() in preperation.
+
+function                                             old     new   delta
+rdate_main                                           197     224     +27
+clock_settime                                          -      27     +27
+date_main                                            926     941     +15
+stime                                                 37       -     -37
+------------------------------------------------------------------------------
+(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37)             Total: 32 bytes
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ coreutils/date.c         | 6 +++++-
+ libbb/missing_syscalls.c | 8 --------
+ util-linux/rdate.c       | 8 ++++++--
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38aedd9..4ade6abb4249 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 87cf59b3d4cc..dc40d91552f1 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 70f829e7fec7..878375d7868d 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/patches/busybox-1.29.3/0200-reactivate-check-for-tty.patch b/patches/busybox-1.31.1/0200-reactivate-check-for-tty.patch
index 077b84efa..077b84efa 100644
--- a/patches/busybox-1.29.3/0200-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.31.1/0200-reactivate-check-for-tty.patch
diff --git a/patches/busybox-1.29.3/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
index 5a21793d8..5a21793d8 100644
--- a/patches/busybox-1.29.3/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ b/patches/busybox-1.31.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
diff --git a/patches/busybox-1.29.3/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.31.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
index 4e9dca9dc..4e9dca9dc 100644
--- a/patches/busybox-1.29.3/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+++ b/patches/busybox-1.31.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
diff --git a/patches/busybox-1.29.3/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.31.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
index 6f2106090..6f2106090 100644
--- a/patches/busybox-1.29.3/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ b/patches/busybox-1.31.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
diff --git a/patches/busybox-1.29.3/series b/patches/busybox-1.31.1/series
index 84c80aa6e..2e75917fa 100644
--- a/patches/busybox-1.29.3/series
+++ b/patches/busybox-1.31.1/series
@@ -2,9 +2,10 @@
 #tag:base --start-number 1
 #tag:upstream-stable --start-number 1
 #tag:upstream-master --start-number 100
+0100-Remove-stime-function-calls.patch
 #tag:ptx --start-number 200
 0200-reactivate-check-for-tty.patch
 0201-Fix-the-format-warning-when-building-applets-usage_p.patch
 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 0036b420b1a49106a872780e90251289  - git-ptx-patches magic
+# df58d733972ae3ce861e84850c98ce86  - git-ptx-patches magic