busybox: update to 1.25.0

10 files changed, 155 insertions, 1 deletions

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 80d59adab..9cf99ae04 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -124,6 +124,17 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE
 	  and have very little memory, this might not be a win. Otherwise,
 	  you probably want this.
 
+config BUSYBOX_BUSYBOX
+	bool "Include busybox applet"
+	default y
+	help
+	  The busybox applet provides general help regarding busybox and
+	  allows the included applets to be listed.  It's also required
+	  if applet links are to be installed at runtime.
+
+	  If you can live without these features disabling this will save
+	  some space.
+
 config BUSYBOX_FEATURE_INSTALLER
 	bool "Support --install [-s] to install applet links at runtime"
 	default n
@@ -691,6 +702,16 @@ config BUSYBOX_DEBUG_PESSIMIZE
 	  in a much bigger executable that more closely matches the source
 	  code.
 
+config BUSYBOX_DEBUG_SANITIZE
+	bool "Enable runtime sanitizers (ASAN/LSAN/USAN/etc...)"
+	default n
+	help
+	  Say Y here if you want to enable runtime sanitizers. These help
+	  catch bad memory accesses (e.g. buffer overflows), but will make
+	  the executable larger and slow down runtime a bit.
+
+	  If you aren't developing/testing busybox, say N here.
+
 config BUSYBOX_UNIT_TEST
 	bool "Build unit tests"
 	default n
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index c223adafd..8cb90efd7 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -176,6 +176,13 @@ config BUSYBOX_GUNZIP
 	  You can use the `-t' option to test the integrity of
 	  an archive, without decompressing it.
 
+config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BUSYBOX_GUNZIP && BUSYBOX_LONG_OPTS
+	help
+	  Enable use of long options.
+
 config BUSYBOX_GZIP
 	bool "gzip"
 	default y
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index ffd6d0eb1..54e4a1b9b 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -779,6 +779,15 @@ config BUSYBOX_FEATURE_STAT_FORMAT
 	  users can pass a custom format string for output. This adds about
 	  7k to a nonstatic build on amd64.
 
+config BUSYBOX_FEATURE_STAT_FILESYSTEM
+	bool "Enable display of filesystem status (-f)"
+	default n
+	depends on BUSYBOX_STAT
+	select BUSYBOX_PLATFORM_LINUX # statfs()
+	help
+	  Without this, stat will not support the '-f' option to display
+	  information about filesystem status.
+
 config BUSYBOX_STTY
 	bool "stty"
 	default n
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index 7910b0f4d..09fdf9f98 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -79,6 +79,17 @@ config BUSYBOX_INIT
 	help
 	  init is the first program run when the system boots.
 
+config BUSYBOX_LINUXRC
+	bool "Support running init from within an initrd (not initramfs)"
+	default n
+	select BUSYBOX_FEATURE_SYSLOG
+	help
+	  Legacy support for running init under the old-style initrd. Allows
+	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
+
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
+
 config BUSYBOX_FEATURE_USE_INITTAB
 	bool "Support reading an inittab file"
 	default y
@@ -166,6 +177,21 @@ config BUSYBOX_INIT_TERMINAL_TYPE
 	  Note that on Linux, init attempts to detect serial terminal and
 	  sets TERM to "vt102" if one is found.
 
+config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE
+	bool "Modify the command-line to \"init\""
+	default n
+	depends on BUSYBOX_INIT || BUSYBOX_LINUXRC
+	help
+	  When launched as PID 1 and after parsing its arguments, init
+	  wipes all the arguments but argv[0] and rewrites argv[0] to
+	  contain only "init", so that its command-line appears solely as
+	  "init" in tools such as ps.
+	  If this option is set to Y, init will keep its original behavior,
+	  otherwise, all the arguments including argv[0] will be preserved,
+	  be they parsed or ignored by init.
+	  The original command-line used to launch init can then be
+	  retrieved in /proc/1/cmdline on Linux, for example.
+
 config BUSYBOX_MESG
 	bool "mesg"
 	default n
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index 9205677e2..9eb353dc0 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -6,6 +6,39 @@
 
 menu "Busybox Library Tuning"
 
+config BUSYBOX_FEATURE_USE_BSS_TAIL
+	bool "Use the end of BSS page"
+	default n
+	help
+	  Attempt to reclaim a small unused part of BSS.
+
+	  Executables have the following parts:
+	  = read-only executable code and constants, also known as "text"
+	  = read-write data
+	  = non-initialized (zeroed on demand) data, also known as "bss"
+
+	  At link time, "text" is padded to a full page. At runtime, all "text"
+	  pages are mapped RO and executable.
+	  "Data" starts on the next page boundary, but is not padded
+	  to a full page at the end. "Bss" starts wherever "data" ends.
+	  At runtime, "data" pages are mapped RW and they are file-backed
+	  (this includes a small portion of "bss" which may live in the last
+	  partial page of "data").
+	  Pages which are fully in "bss" are mapped to anonymous memory.
+
+	  "Bss" end is usually not page-aligned. There is an unused space
+	  in the last page. Linker marks its start with the "_end" symbol.
+
+	  This option will attempt to use that space for bb_common_bufsiz1[]
+	  array. If it fits after _end, it will be used, and COMMON_BUFSIZE
+	  will be enlarged from its guaranteed minimum size of 1 kbyte.
+	  This may require recompilation a second time, since value of _end
+	  is known only after final link.
+
+	  If you are getting a build error like this:
+	        appletlib.c:(.text.main+0xd): undefined reference to '_end'
+	  disable this option.
+
 config BUSYBOX_FEATURE_SYSTEMD
 	bool "Enable systemd support"
 	default n
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index a0b84fff5..e720acb3b 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -295,6 +295,14 @@ config BUSYBOX_CRYPTPW
 	  using the given salt. Debian has this utility under mkpasswd
 	  name. Busybox provides mkpasswd as an alias for cryptpw.
 
+config BUSYBOX_MKPASSWD
+	bool "mkpasswd"
+	default n
+	help
+	  Encrypts the given password with the crypt(3) libc function
+	  using the given salt. Debian has this utility under mkpasswd
+	  name. Busybox provides mkpasswd as an alias for cryptpw.
+
 config BUSYBOX_CHPASSWD
 	bool "chpasswd"
 	default n
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 5da46fecb..107a96664 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -192,6 +192,13 @@ config BUSYBOX_UBIUPDATEVOL
 	help
 	  Update a UBI volume.
 
+config BUSYBOX_UBIRENAME
+	bool "ubirename"
+	default n
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Utility to rename UBI volumes
+
 config BUSYBOX_ADJTIMEX
 	bool "adjtimex"
 	default n
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index f0e66148b..fece6971b 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -656,6 +656,13 @@ config BUSYBOX_FEATURE_IP_RULE
 	help
 	  Add support for rule commands to "ip".
 
+config BUSYBOX_FEATURE_IP_NEIGH
+	bool "ip neighbor"
+	default n
+	depends on BUSYBOX_IP
+	help
+	  Add support for neighbor commands to "ip".
+
 config BUSYBOX_FEATURE_IP_SHORT_FORMS
 	bool "Support short forms of ip commands"
 	default n
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 35e5ce538..aec0fd62f 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -110,7 +110,7 @@ config BUSYBOX_FEATURE_UDHCP_PORT
 
 config BUSYBOX_UDHCP_DEBUG
 	int "Maximum verbosity level for udhcp applets (0..9)"
-	default 9
+	default 0
 	range 0 9
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY
 	help
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index de0106440..f2e84a71a 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -6,6 +6,12 @@
 
 menu "Linux System Utilities"
 
+config BUSYBOX_BLKDISCARD
+	bool "blkdiscard"
+	default n
+	help
+	  blkdiscard discards sectors on a given device.
+
 config BUSYBOX_BLOCKDEV
 	bool "blockdev"
 	default n
@@ -84,6 +90,21 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
 	  /lib/firmware/ and if it exists, send it to the kernel for
 	  loading into the hardware.
 
+config BUSYBOX_NSENTER
+	bool "nsenter"
+	default n
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Run program with namespaces of other processes.
+
+config BUSYBOX_FEATURE_NSENTER_LONG_OPTS
+	bool "Enable long options"
+	default n
+	depends on BUSYBOX_NSENTER && BUSYBOX_LONG_OPTS
+	help
+	  Support long options for the nsenter applet. This makes
+	  the busybox implementation more compatible with upstream.
+
 config BUSYBOX_REV
 	bool "rev"
 	default n
@@ -98,6 +119,14 @@ config BUSYBOX_UEVENT
 	  uevent is a netlink listener for kernel uevent notifications
 	  sent via netlink. It is usually used for dynamic device creation.
 
+config BUSYBOX_UNSHARE
+	bool "unshare"
+	default n
+	depends on BUSYBOX_LONG_OPTS && !BUSYBOX_NOMMU
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Run program with some namespaces unshared from parent.
+
 config BUSYBOX_ACPID
 	bool "acpid"
 	default n
@@ -820,6 +849,13 @@ config BUSYBOX_VOLUMEID
 menu "Filesystem/Volume identification"
 	depends on BUSYBOX_VOLUMEID
 
+config BUSYBOX_FEATURE_VOLUMEID_BCACHE
+	bool "bcache filesystem"
+	default n
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
 config BUSYBOX_FEATURE_VOLUMEID_EXT
 	bool "Ext filesystem"
 	default y