From d0cd2bcd1ce496c4f271b96033bc67289ecc54eb Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 27 Jun 2020 23:49:53 +0300 Subject: busybox: bump to 1.32.0 --- core/busybox/checksums | 9 +-- core/busybox/files/.config | 11 ++- core/busybox/files/.config-suid | 11 ++- core/busybox/patches/1-date-64-prefix.patch | 53 ------------- core/busybox/patches/2-time-64-prefix.patch | 43 ---------- core/busybox/patches/3-syscall-gettime.patch | 113 --------------------------- core/busybox/sources | 5 +- core/busybox/version | 2 +- 8 files changed, 23 insertions(+), 224 deletions(-) delete mode 100644 core/busybox/patches/1-date-64-prefix.patch delete mode 100644 core/busybox/patches/2-time-64-prefix.patch delete mode 100644 core/busybox/patches/3-syscall-gettime.patch (limited to 'core') diff --git a/core/busybox/checksums b/core/busybox/checksums index f1625d02..44caba97 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -1,6 +1,6 @@ -d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 busybox-1.31.1.tar.bz2 -d72b6a0098c5db4235200c5acc4e327b387951224670b7812012200dce6a8349 .config -47473c15263d52cc741993ca0386d0042a719b23c89e406e173510e42e0f23a5 .config-suid +c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2 +bebffb7d56289cb006ba8c52b7351d1bdaf60845a8c092f184c9297cdf7ffd98 .config +b3dc5a78ec33af72e54e2689d9205c249a91115166a77db6989c176b5c112ed9 .config-suid ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run 814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7 inittab @@ -15,6 +15,3 @@ af4c302ed9ae6fa1cd8aa51c6f94de11550625e6f1dc0b138605e3429214d082 mdev.conf 09c2f601fec4e5c10664c22f787dafb9424efe219bf826727c356da90dfd60d5 adduser-no-setgid.patch f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396 install-fix-chown.patch 68e0c7d5e96902d3b890e89d9b018ae11d53ed3104bfedd624a1485df58b11cb print-unicode.patch -cfcb56b4b1f8c9b3aae15b06aea614ae39e069be678302dbe8976effb9ae101e 1-date-64-prefix.patch -033a9c70a92c7f08d8a70ac17f4a923390e114ec14af7e4b26efce798d872dff 2-time-64-prefix.patch -0f5588ff660de11efafc2cf53a1daf04a48b9736d12c1ddee599884ebf5bd1a0 3-syscall-gettime.patch diff --git a/core/busybox/files/.config b/core/busybox/files/.config index 6d7a181b..ae496d8e 100644 --- a/core/busybox/files/.config +++ b/core/busybox/files/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 -# Fri Jun 5 11:32:04 2020 +# Busybox version: 1.32.0 +# Sat Jun 27 23:39:25 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -462,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -692,6 +694,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_SWITCH_ROOT=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -809,6 +812,7 @@ CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +# CONFIG_MIM is not set # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -1099,6 +1103,7 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set CONFIG_ASH_INTERNAL_GLOB=y @@ -1119,6 +1124,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1185,6 +1191,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_SYSLOGD_CFG=y +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid index c75e957a..2489211d 100644 --- a/core/busybox/files/.config-suid +++ b/core/busybox/files/.config-suid @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 -# Tue May 19 03:13:58 2020 +# Busybox version: 1.32.0 +# Sat Jun 27 23:40:13 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -446,6 +447,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_PRUNE is not set # CONFIG_FEATURE_FIND_QUIT is not set # CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_EMPTY is not set # CONFIG_FEATURE_FIND_PATH is not set # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -676,6 +678,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set # CONFIG_UMOUNT is not set # CONFIG_FEATURE_UMOUNT_ALL is not set @@ -785,6 +788,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +# CONFIG_MIM is not set # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -1071,6 +1075,7 @@ CONFIG_SH_IS_NONE=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +# CONFIG_SHELL_ASH is not set # CONFIG_ASH is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_INTERNAL_GLOB is not set @@ -1091,6 +1096,7 @@ CONFIG_BASH_IS_NONE=y # CONFIG_ASH_CMDCMD is not set # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1153,6 +1159,7 @@ CONFIG_BASH_IS_NONE=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set # CONFIG_FEATURE_SYSLOGD_CFG is not set +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/core/busybox/patches/1-date-64-prefix.patch b/core/busybox/patches/1-date-64-prefix.patch deleted file mode 100644 index 944526b7..00000000 --- a/core/busybox/patches/1-date-64-prefix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b7b7452f292f03eefafa6fd1da9bcfc933dee15a Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Wed, 18 Sep 2019 09:28:49 -0700 -Subject: [PATCH] date: Use 64 prefix syscall if we have to - -Some 32-bit architectures no longer have the 32-bit time_t syscalls. -Instead they have suffixed syscalls that returns a 64-bit time_t. If -the architecture doesn't have the non-suffixed syscall and is using a -64-bit time_t let's use the suffixed syscall instead. - -This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel -headers. - -If an architecture only supports the suffixed syscalls, but is still -using a 32-bit time_t fall back to the libc call. - -Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=b7b7452f292f03eefafa6fd1da9bcfc933dee15a] -Signed-off-by: Alistair Francis -Signed-off-by: Denys Vlasenko ---- - coreutils/date.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/coreutils/date.c -+++ b/coreutils/date.c -@@ -36,7 +36,7 @@ - //config:# defaults to "no": stat's nanosecond field is a bit non-portable - //config:config FEATURE_DATE_NANO - //config: bool "Support %[num]N nanosecond format specifier" --//config: default n # syscall(__NR_clock_gettime) -+//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) - //config: depends on DATE - //config: select PLATFORM_LINUX - //config: help -@@ -271,10 +271,17 @@ int date_main(int argc UNUSED_PARAM, cha - */ - #endif - } else { --#if ENABLE_FEATURE_DATE_NANO -+#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) - /* libc has incredibly messy way of doing this, - * typically requiring -lrt. We just skip all this mess */ - syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); -+#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 -+ /* Let's only support the 64 suffix syscalls for 64-bit time_t. -+ * This simplifies the code for us as we don't need to convert -+ * between 64-bit and 32-bit. We also don't have a way to -+ * report overflow errors here. -+ */ -+ syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); - #else - time(&ts.tv_sec); - #endif diff --git a/core/busybox/patches/2-time-64-prefix.patch b/core/busybox/patches/2-time-64-prefix.patch deleted file mode 100644 index 58a6c0d8..00000000 --- a/core/busybox/patches/2-time-64-prefix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 902d3992922fc8db8495d5fb30a4581711b60c62 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Wed, 18 Sep 2019 09:28:50 -0700 -Subject: [PATCH] time: Use 64 prefix syscall if we have to - -Some 32-bit architectures no longer have the 32-bit time_t syscalls. -Instead they have suffixed syscalls that returns a 64-bit time_t. If -the architecture doesn't have the non-suffixed syscall and is using a -64-bit time_t let's use the suffixed syscall instead. - -This fixes build issues when building for RISC-V 32-bit with 5.1+ kernel -headers. - -If an architecture only supports the suffixed syscalls, but is still -using a 32-bit time_t report a compilation error. This avoids us have to -deal with converting between 64-bit and 32-bit values. There are -currently no architectures where this is the case. - -Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=902d3992922fc8db8495d5fb30a4581711b60c62] -Signed-off-by: Alistair Francis -Signed-off-by: Denys Vlasenko ---- - libbb/time.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/libbb/time.c -+++ b/libbb/time.c -@@ -257,7 +257,14 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( - * typically requiring -lrt. We just skip all this mess */ - static void get_mono(struct timespec *ts) - { -- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) -+#if defined(__NR_clock_gettime) -+ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) -+#elif __TIMESIZE == 64 -+ if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) -+#else -+# error "We currently don't support architectures without " \ -+ "the __NR_clock_gettime syscall and 32-bit time_t" -+#endif - bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); - } - unsigned long long FAST_FUNC monotonic_ns(void) diff --git a/core/busybox/patches/3-syscall-gettime.patch b/core/busybox/patches/3-syscall-gettime.patch deleted file mode 100644 index 9c598e15..00000000 --- a/core/busybox/patches/3-syscall-gettime.patch +++ /dev/null @@ -1,113 +0,0 @@ -From be5a505d771a77c640acc35ceaa470c80e62f954 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Thu, 24 Oct 2019 16:26:55 +0200 -Subject: [PATCH] Remove syscall wrappers around clock_gettime, closes 12091 - -12091 "Direct use of __NR_clock_gettime is not time64-safe". - -function old new delta -runsv_main 1698 1712 +14 -startservice 378 383 +5 -get_mono 31 25 -6 -date_main 932 926 -6 -gettimeofday_ns 17 - -17 ------------------------------------------------------------------------------- -(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes - -Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=be5a505d771a77c640acc35ceaa470c80e62f954] -Signed-off-by: Denys Vlasenko ---- - Makefile.flags | 6 ++++-- - coreutils/date.c | 16 +++------------- - libbb/time.c | 11 +---------- - runit/runsv.c | 11 +---------- - 4 files changed, 9 insertions(+), 35 deletions(-) - ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -129,10 +129,12 @@ endif - # fall back to using a temp file: - CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) - ifeq ($(CRYPT_AVAILABLE),y) --LDLIBS += m crypt -+LDLIBS += m rt crypt - else --LDLIBS += m -+LDLIBS += m rt - endif -+# libm may be needed for dc, awk, ntpd -+# librt may be needed for clock_gettime() - - # libpam may use libpthread, libdl and/or libaudit. - # On some platforms that requires an explicit -lpthread, -ldl, -laudit. ---- a/coreutils/date.c -+++ b/coreutils/date.c -@@ -33,10 +33,9 @@ - //config: Enable option (-I) to output an ISO-8601 compliant - //config: date/time string. - //config: --//config:# defaults to "no": stat's nanosecond field is a bit non-portable - //config:config FEATURE_DATE_NANO - //config: bool "Support %[num]N nanosecond format specifier" --//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) -+//config: default n # stat's nanosecond field is a bit non-portable - //config: depends on DATE - //config: select PLATFORM_LINUX - //config: help -@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, cha - */ - #endif - } else { --#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) -- /* libc has incredibly messy way of doing this, -- * typically requiring -lrt. We just skip all this mess */ -- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); --#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 -- /* Let's only support the 64 suffix syscalls for 64-bit time_t. -- * This simplifies the code for us as we don't need to convert -- * between 64-bit and 32-bit. We also don't have a way to -- * report overflow errors here. -- */ -- syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); -+#if ENABLE_FEATURE_DATE_NANO -+ clock_gettime(CLOCK_REALTIME, &ts); - #else - time(&ts.tv_sec); - #endif ---- a/libbb/time.c -+++ b/libbb/time.c -@@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS( - #define CLOCK_MONOTONIC 1 - #endif - --/* libc has incredibly messy way of doing this, -- * typically requiring -lrt. We just skip all this mess */ - static void get_mono(struct timespec *ts) - { --#if defined(__NR_clock_gettime) -- if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts)) --#elif __TIMESIZE == 64 -- if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts)) --#else --# error "We currently don't support architectures without " \ -- "the __NR_clock_gettime syscall and 32-bit time_t" --#endif -+ if (clock_gettime(CLOCK_MONOTONIC, ts)) - bb_error_msg_and_die("clock_gettime(MONOTONIC) failed"); - } - unsigned long long FAST_FUNC monotonic_ns(void) ---- a/runit/runsv.c -+++ b/runit/runsv.c -@@ -51,11 +51,9 @@ - #if ENABLE_MONOTONIC_SYSCALL - #include - --/* libc has incredibly messy way of doing this, -- * typically requiring -lrt. We just skip all this mess */ - static void gettimeofday_ns(struct timespec *ts) - { -- syscall(__NR_clock_gettime, CLOCK_REALTIME, ts); -+ clock_gettime(CLOCK_REALTIME, ts); - } - #else - static void gettimeofday_ns(struct timespec *ts) diff --git a/core/busybox/sources b/core/busybox/sources index f1190747..98daae7b 100644 --- a/core/busybox/sources +++ b/core/busybox/sources @@ -1,4 +1,4 @@ -https://busybox.net/downloads/busybox-1.31.1.tar.bz2 +https://busybox.net/downloads/busybox-1.32.0.tar.bz2 files/.config files/.config-suid files/acpid.run @@ -15,6 +15,3 @@ patches/modprobe-kernel-version.patch patches/adduser-no-setgid.patch patches/install-fix-chown.patch patches/print-unicode.patch -patches/1-date-64-prefix.patch -patches/2-time-64-prefix.patch -patches/3-syscall-gettime.patch diff --git a/core/busybox/version b/core/busybox/version index f2dfc4bd..b9c04f8c 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.31.1 17 +1.32.0 1 -- cgit v1.2.3