summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/busybox/config/Config.in11
-rw-r--r--package/busybox/config/coreutils/Config.in4
-rw-r--r--package/busybox/config/findutils/Config.in7
-rw-r--r--package/busybox/config/miscutils/Config.in5
-rw-r--r--package/busybox/config/networking/Config.in6
-rw-r--r--package/busybox/config/networking/udhcp/Config.in7
-rw-r--r--package/busybox/config/shell/Config.in5
-rw-r--r--package/busybox/config/util-linux/Config.in2
-rw-r--r--package/busybox/patches/004-libbb-sha-add-missing-guard.patch17
-rw-r--r--package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch37
11 files changed, 95 insertions, 10 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 78b76ead5..c50e4af11 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= busybox
-PKG_VERSION:= 1.36.1
+PKG_VERSION:= 1.37.0
PKG_RELEASE:= 1
-PKG_HASH:= b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
+PKG_HASH:= 3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base/apps
PKG_URL:= http://www.busybox.net/
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index d5cbed6a5..573c55f8c 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -108,6 +108,17 @@ config BUSYBOX_LFS
programs that can benefit from large file support include dd, gzip,
cp, mount, tar.
+config BUSYBOX_TIME64
+ bool "Support 64bit wide time types"
+ default y
+ depends on BUSYBOX_LFS
+ help
+ Make times later than 2038 representable for several libc syscalls
+ (stat, clk_gettime etc.). Note this switch is specific to glibc
+ and has no effect on platforms that already use 64bit wide time types
+ (i.e. all 64bit archs and some selected 32bit archs (currently riscv
+ and x32)).
+
config BUSYBOX_PAM
bool "Support PAM (Pluggable Authentication Modules)"
default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 00d646599..ff7ab88ed 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -719,12 +719,12 @@ config BUSYBOX_SUM
checksum and count the blocks in a file
config BUSYBOX_SYNC
bool "sync (3.8 kb)"
- default y
+ default n
help
sync is used to flush filesystem buffers.
config BUSYBOX_FEATURE_SYNC_FANCY
bool "Enable -d and -f flags (requires syncfs(2) in libc)"
- default y
+ default n
depends on BUSYBOX_SYNC
help
sync -d FILE... executes fdatasync() on each FILE.
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index d4aa403a5..ff1f5ed0c 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -136,6 +136,13 @@ config BUSYBOX_FEATURE_FIND_EXEC_PLUS
Without this option, -exec + is a synonym for -exec ;
(IOW: it works correctly, but without expected speedup)
+config BUSYBOX_FEATURE_FIND_EXEC_OK
+ bool "Enable -ok: execute confirmed commands"
+ default y
+ depends on BUSYBOX_FEATURE_FIND_EXEC
+ help
+ Support the 'find -ok' option which prompts before executing.
+
config BUSYBOX_FEATURE_FIND_USER
bool "Enable -user: username/uid matching"
default y
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 82aeff339..612d270e1 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -380,6 +380,11 @@ config BUSYBOX_FLASHCP
help
The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
This utility is used to copy images into a MTD device.
+config BUSYBOX_GETFATTR
+ bool "getfattr (12.3 kb)"
+ default y
+ help
+ Get extended attributes on files
config BUSYBOX_HDPARM
bool "hdparm (25 kb)"
default y
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 5e0ea5819..9ed63b71f 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -582,6 +582,12 @@ config BUSYBOX_IPLINK
help
Short form of "ip link"
+config BUSYBOX_FEATURE_IP_LINK_CAN
+ bool "ip link set type can"
+ default n
+ help
+ Configure CAN devices with "ip".
+
config BUSYBOX_IPROUTE
bool "iproute (15 kb)"
default y
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 111e6b5f5..9018780aa 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -11,6 +11,13 @@ config BUSYBOX_UDHCPD
udhcpd is a DHCP server geared primarily toward embedded systems,
while striving to be fully functional and RFC compliant.
+config BUSYBOX_FEATURE_UDHCPD_BOOTP
+ bool "Answer to BOOTP requests as well"
+ default y
+ depends on BUSYBOX_UDHCPD
+ help
+ Support old BOOTP protocol too.
+
config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC
bool "Select IP address based on client MAC"
default n
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 6ffa3b2b0..b26195889 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -201,11 +201,6 @@ config BUSYBOX_ASH_TEST
default y
depends on BUSYBOX_SHELL_ASH
-config BUSYBOX_ASH_SLEEP
- bool "sleep builtin"
- default y
- depends on BUSYBOX_SHELL_ASH
-
config BUSYBOX_ASH_HELP
bool "help builtin"
default y
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 77b2b83f1..5bc9673d3 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -660,7 +660,7 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES
disable this option.
config BUSYBOX_NSENTER
bool "nsenter (6.5 kb)"
- default y
+ default n
help
Run program with namespaces of other processes.
config BUSYBOX_PIVOT_ROOT
diff --git a/package/busybox/patches/004-libbb-sha-add-missing-guard.patch b/package/busybox/patches/004-libbb-sha-add-missing-guard.patch
new file mode 100644
index 000000000..ec41ba73a
--- /dev/null
+++ b/package/busybox/patches/004-libbb-sha-add-missing-guard.patch
@@ -0,0 +1,17 @@
+diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
+index 57a801459..75a61c32c 100644
+--- a/libbb/hash_md5_sha.c
++++ b/libbb/hash_md5_sha.c
+@@ -1313,7 +1313,9 @@ unsigned FAST_FUNC sha1_end(sha1_ctx_t *ctx, void *resbuf)
+ hash_size = 8;
+ if (ctx->process_block == sha1_process_block64
+ #if ENABLE_SHA1_HWACCEL
++# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+ || ctx->process_block == sha1_process_block64_shaNI
++# endif
+ #endif
+ ) {
+ hash_size = 5;
+--
+2.48.1
+
diff --git a/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
new file mode 100644
index 000000000..1dfd6f379
--- /dev/null
+++ b/package/busybox/patches/005-syslogd-fix-wrong-OPT_localog-flag-detection.patch
@@ -0,0 +1,37 @@
+From 34d331d642c3312e1c04e4650f547f1a67abee24 Mon Sep 17 00:00:00 2001
+From: Andrej Valek <andrej.v@skyrain.eu>
+Date: Wed, 16 Oct 2024 10:15:08 +0200
+Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection
+
+The OPT_locallog was set on "option_mask32" but checked on local
+"opts" variable. While this flag it's used on multiple places can't be
+has to be used with "option_mask32". Without this change syslogd
+is more-less unusable while no messages are logged locally.
+
+Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
+Upstream: https://lists.busybox.net/pipermail/busybox/2024-October/090969.html
+[Thomas: this was reported as beeing needed by Bernd Kuhls at
+https://lore.kernel.org/buildroot/pan$de0bb$35c5a64$ca9b6f21$2408ff40@ID-313208.user.individual.net/,
+but also on the Busybox mailing list at
+https://lists.busybox.net/pipermail/busybox/2023-September/090499.html]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ sysklogd/syslogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
+index 7558051f0..fa03aa280 100644
+--- a/sysklogd/syslogd.c
++++ b/sysklogd/syslogd.c
+@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
+ }
+ }
+ #endif
+- if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) {
++ if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
+ recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
+ split_escape_and_log(recvbuf, sz);
+ }
+--
+2.48.1
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 07:59:30 +0000