8 files changed, 39 insertions, 8 deletions
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