busybox: update to 1.26.0

8 files changed, 166 insertions, 58 deletions

diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 112f2dc88..8532767c2 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -91,6 +91,12 @@ config BUSYBOX_BUNZIP2
 	  Unless you have a specific application which requires bunzip2, you
 	  should probably say N here.
 
+config BUSYBOX_BZCAT
+	bool "bzcat"
+	default y
+	help
+	  Alias to "bunzip2 -c".
+
 config BUSYBOX_BZIP2
 	bool "bzip2"
 	depends on !BUSYBOX_DISABLE_BZIP2
@@ -176,6 +182,12 @@ config BUSYBOX_GUNZIP
 	  You can use the `-t' option to test the integrity of
 	  an archive, without decompressing it.
 
+config BUSYBOX_ZCAT
+	bool "zcat"
+	default y
+	help
+	  Alias to "gunzip -c".
+
 config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS
 	bool "Enable long options"
 	default y
@@ -215,6 +227,18 @@ config BUSYBOX_LZOP
 	help
 	  Lzop compression/decompresion.
 
+config BUSYBOX_UNLZOP
+	bool "unlzop"
+	default n
+	help
+	  Lzop decompresion.
+
+config BUSYBOX_LZOPCAT
+	bool "lzopcat"
+	default n
+	help
+	  Alias to "unlzop -c".
+
 config BUSYBOX_LZOP_COMPR_HIGH
 	bool "lzop compression levels 7,8,9 (not very useful)"
 	default n
@@ -377,15 +401,26 @@ config BUSYBOX_UNLZMA
 config BUSYBOX_FEATURE_LZMA_FAST
 	bool "Optimize unlzma for speed"
 	default n
-	depends on BUSYBOX_UNLZMA
+	depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA
 	help
 	  This option reduces decompression time by about 25% at the cost of
 	  a 1K bigger binary.
 
+config BUSYBOX_LZCAT
+	bool "lzcat"
+	default n
+	help
+	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
+	  compression algorithm, and range coding. Compression
+	  is generally considerably better than that achieved by the bzip2
+	  compressors.
+
+	  The BusyBox unlzma applet is limited to decompression only.
+	  On an x86 system, this applet adds about 4K.
+
 config BUSYBOX_LZMA
 	bool "Provide lzma alias which supports only unpacking"
 	default n
-	depends on BUSYBOX_UNLZMA
 	help
 	  Enable this option if you want commands like "lzma -d" to work.
 	  IOW: you'll get lzma applet, but it will always require -d option.
@@ -397,11 +432,16 @@ config BUSYBOX_UNXZ
 	help
 	  unxz is a unlzma successor.
 
+config BUSYBOX_XZCAT
+	bool "xzcat"
+	default n
+	help
+	  Alias to "unxz -c".
+
 config BUSYBOX_XZ
 	bool "Provide xz alias which supports only unpacking"
 	depends on !BUSYBOX_DISABLE_XZ
 	default n
-	depends on BUSYBOX_UNXZ
 	help
 	  Enable this option if you want commands like "xz -d" to work.
 	  IOW: you'll get xz applet, but it will always require -d option.
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 54e4a1b9b..bb0d2a121 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -94,6 +94,18 @@ config BUSYBOX_TEST
 	  returning an appropriate exit code. The bash shell
 	  has test built in, ash can build it in optionally.
 
+config BUSYBOX_TEST1
+	bool "test as ["
+	default y
+	help
+	  Provide test command in the "[ EXPR ]" form
+
+config BUSYBOX_TEST2
+	bool "test as [["
+	default y
+	help
+	  Provide test command in the "[[ EXPR ]]" form
+
 config BUSYBOX_FEATURE_TEST_64
 	bool "Extend test to 64 bit"
 	default y
@@ -333,16 +345,15 @@ config BUSYBOX_DIRNAME
 	  a file name.
 
 config BUSYBOX_DOS2UNIX
-	bool "dos2unix/unix2dos"
+	bool "dos2unix"
 	default n
 	help
 	  dos2unix is used to convert a text file from DOS format to
 	  UNIX format, and vice versa.
 
 config BUSYBOX_UNIX2DOS
-	bool
+	bool "unix2dos"
 	default n
-	depends on BUSYBOX_DOS2UNIX
 	help
 	  unix2dos is used to convert a text file from UNIX format to
 	  DOS format, and vice versa.
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 53af0387a..a9bb761b2 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -205,23 +205,19 @@ config BUSYBOX_GREP
 	help
 	  grep is used to search files for a specified pattern.
 
-config BUSYBOX_FEATURE_GREP_EGREP_ALIAS
-	bool "Enable extended regular expressions (egrep & grep -E)"
+config BUSYBOX_EGREP
+	bool "egrep"
+	depends on !BUSYBOX_DISABLE_GREP
 	default y
-	depends on BUSYBOX_GREP
 	help
-	  Enabled support for extended regular expressions. Extended
-	  regular expressions allow for alternation (foo|bar), grouping,
-	  and various repetition operators.
+	  Alias to "grep -E"
 
-config BUSYBOX_FEATURE_GREP_FGREP_ALIAS
-	bool "Alias fgrep to grep -F"
+config BUSYBOX_FGREP
+	bool "fgrep"
+	depends on !BUSYBOX_DISABLE_GREP
 	default y
-	depends on BUSYBOX_GREP
 	help
-	  fgrep sees the search pattern as a normal string rather than
-	  regular expressions.
-	  grep -F always works, this just creates the fgrep alias.
+	  Alias to "grep -F"
 
 config BUSYBOX_FEATURE_GREP_CONTEXT
 	bool "Enable before and after context flags (-A, -B and -C)"
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index 09fdf9f98..9e17c790c 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -46,11 +46,23 @@ config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE
 	  and /etc/bootchartd.conf files.
 
 config BUSYBOX_HALT
-	bool "poweroff, halt, and reboot"
+	bool "halt"
 	default y
 	help
 	  Stop all processes and either halt, reboot, or power off the system.
 
+config BUSYBOX_POWEROFF
+	bool "poweroff"
+	default y
+	help
+	  Stop all processes and power off the system.
+
+config BUSYBOX_REBOOT
+	bool "reboot"
+	default y
+	help
+	  Stop all processes and reboot the system.
+
 config BUSYBOX_FEATURE_CALL_TELINIT
 	bool "Call telinit on shutdown and reboot"
 	default n
@@ -154,17 +166,6 @@ config BUSYBOX_FEATURE_INIT_COREDUMPS
 	  core file sizes. If this option is disabled, processes
 	  will not generate any core files.
 
-config BUSYBOX_FEATURE_INITRD
-	bool "Support running init from within an initrd (not initramfs)"
-	default n
-	depends on BUSYBOX_INIT
-	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_INIT_TERMINAL_TYPE
 	string "Initial terminal type"
 	default "linux"
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index 9eb353dc0..6aff24699 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -39,15 +39,6 @@ config BUSYBOX_FEATURE_USE_BSS_TAIL
 	        appletlib.c:(.text.main+0xd): undefined reference to '_end'
 	  disable this option.
 
-config BUSYBOX_FEATURE_SYSTEMD
-	bool "Enable systemd support"
-	default n
-	help
-	  If you plan to use busybox daemons on a system where daemons
-	  are controlled by systemd, enable this option.
-	  If you don't use systemd, it is still safe to enable it,
-	  but the downside is increased code size.
-
 config BUSYBOX_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default y
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index fece6971b..cedbc4482 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -258,6 +258,12 @@ config BUSYBOX_HOSTNAME
 	help
 	  Show or set the system's host name.
 
+config BUSYBOX_DNSDOMAINNAME
+	bool "dnsdomainname"
+	default n
+	help
+	  Alias to "hostname -d".
+
 config BUSYBOX_HTTPD
 	bool "httpd"
 	default n
@@ -449,12 +455,12 @@ config BUSYBOX_IFPLUGD
 	help
 	  Network interface plug detection daemon.
 
-config BUSYBOX_IFUPDOWN
-	bool "ifupdown"
+config BUSYBOX_IFUP
+	bool "ifup"
 	default y if ADK_TARGET_WITH_NET
 	help
-	  Activate or deactivate the specified interfaces. This applet makes
-	  use of either "ifconfig" and "route" or the "ip" command to actually
+	  Activate the specified interfaces. This applet makes use
+	  of either "ifconfig" and "route" or the "ip" command to actually
 	  configure network interfaces. Therefore, you will probably also want
 	  to enable either IFCONFIG and ROUTE, or enable
 	  FEATURE_IFUPDOWN_IP and the various IP options. Of
@@ -465,10 +471,16 @@ config BUSYBOX_IFUPDOWN
 	  "ifconfig", "route" and "run-parts" or the "ip" command, either
 	  via busybox or via standalone utilities.
 
+config BUSYBOX_IFDOWN
+	bool "ifdown"
+	default y if ADK_TARGET_WITH_NET
+	help
+	  Deactivate the specified interfaces.
+
 config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 	string "Absolute path to ifstate file"
 	default "/var/run/ifstate"
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  ifupdown keeps state information in a file called ifstate.
 	  Typically it is located in /var/run/ifstate, however
@@ -479,7 +491,7 @@ config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 config BUSYBOX_FEATURE_IFUPDOWN_IP
 	bool "Use ip applet"
 	default y
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
 	  than the default of using the older 'ifconfig' and 'route' utilities.
@@ -502,7 +514,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
 config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 	bool "Use busybox ifconfig and route applets"
 	default n
-	depends on BUSYBOX_IFUPDOWN && !BUSYBOX_FEATURE_IFUPDOWN_IP
+	depends on BUSYBOX_IFUP && !BUSYBOX_FEATURE_IFUPDOWN_IP
 	select BUSYBOX_IFCONFIG
 	select BUSYBOX_ROUTE
 	help
@@ -516,14 +528,14 @@ config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 config BUSYBOX_FEATURE_IFUPDOWN_IPV4
 	bool "Support for IPv4"
 	default y
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV6
 	bool "Support for IPv6"
 	default y
-	depends on BUSYBOX_IFUPDOWN && BUSYBOX_FEATURE_IPV6
+	depends on BUSYBOX_IFUP && BUSYBOX_FEATURE_IPV6
 	help
 	  If you need support for IPv6, turn this option on.
 
@@ -539,7 +551,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV6
 config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 	bool "Enable mapping support"
 	default n
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  This enables support for the "mapping" stanza, unless you have
 	  a weird network setup you don't need it.
@@ -547,7 +559,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 	bool "Support for external dhcp clients"
 	default n
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  This enables support for the external dhcp clients. Clients are
 	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
@@ -1047,7 +1059,7 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string "ifup udhcpc command line options"
 	default "-R" if BUSYBOX_NOMMU
 	default "-R -b"
-	depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
+	depends on BUSYBOX_IFUP && BUSYBOX_UDHCPC
 	help
 	  Command line options to pass to udhcpc from ifup.
 	  Intended to alter options not available in /etc/network/interfaces.
diff --git a/package/busybox/config/runit/Config.in b/package/busybox/config/runit/Config.in
index fc767d280..87b9b6b1d 100644
--- a/package/busybox/config/runit/Config.in
+++ b/package/busybox/config/runit/Config.in
@@ -46,6 +46,13 @@ config BUSYBOX_SV_DEFAULT_SERVICE_DIR
 	  Default directory for services.
 	  Defaults to "/var/service"
 
+config BUSYBOX_SVC
+	bool "svc"
+	default n
+	help
+	  svc controls the state of services monitored by the runsv supervisor.
+	  It is comaptible with daemontools command with the same name.
+
 config BUSYBOX_SVLOGD
 	bool "svlogd"
 	default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index f2e84a71a..00f98a722 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -90,6 +90,27 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
 	  /lib/firmware/ and if it exists, send it to the kernel for
 	  loading into the hardware.
 
+config BUSYBOX_MKE2FS
+	bool "mke2fs"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Utility to create EXT2 filesystems.
+
+config BUSYBOX_MKFS_EXT2
+	bool "mkfs.ext2"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Alias to "mke2fs".
+
+config BUSYBOX_MKDOSFS
+	bool "mkdosfs"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Utility to create FAT32 filesystems.
+
 config BUSYBOX_NSENTER
 	bool "nsenter"
 	default n
@@ -445,7 +466,6 @@ config BUSYBOX_FEATURE_HEXDUMP_REVERSE
 config BUSYBOX_HD
 	bool "hd"
 	default n
-	depends on BUSYBOX_HEXDUMP
 	help
 	  hd is an alias to hexdump -C.
 
@@ -720,12 +740,26 @@ config BUSYBOX_SETARCH
 	  this util on a system that supports both 64bit and 32bit userland
 	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
-config BUSYBOX_SWAPONOFF
-	bool "swaponoff"
+config BUSYBOX_LINUX32
+	bool "linux32"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
+	select PLATFORM_LINUX
 	help
-	  This option enables both the 'swapon' and the 'swapoff' utilities.
+	  Alias to "setarch linux32".
+
+config BUSYBOX_LINUX64
+	bool "linux64"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Alias to "setarch linux64".
+
+config BUSYBOX_SWAPON
+	bool "swapon"
+	default y
+	select PLATFORM_LINUX
+	help
+	  This option enables the 'swapon' utility.
 	  Once you have created some swap space using 'mkswap', you also need
 	  to enable your swap space with the 'swapon' utility. The 'swapoff'
 	  utility is used, typically at system shutdown, to disable any swap
@@ -735,7 +769,7 @@ config BUSYBOX_SWAPONOFF
 config BUSYBOX_FEATURE_SWAPON_DISCARD
 	bool "Support discard option -d"
 	default n
-	depends on BUSYBOX_SWAPONOFF
+	depends on BUSYBOX_SWAPON
 	help
 	  Enable support for discarding swap area blocks at swapon and/or as
 	  the kernel frees them. This option enables both the -d option on
@@ -744,10 +778,17 @@ config BUSYBOX_FEATURE_SWAPON_DISCARD
 config BUSYBOX_FEATURE_SWAPON_PRI
 	bool "Support priority option -p"
 	default y
-	depends on BUSYBOX_SWAPONOFF
+	depends on BUSYBOX_SWAPON
 	help
 	  Enable support for setting swap device priority in swapon.
 
+config BUSYBOX_SWAPOFF
+	bool "swapoff"
+	default n
+	select PLATFORM_LINUX
+	help
+	  This option enables the 'swapoff' utility.
+
 config BUSYBOX_SWITCH_ROOT
 	bool "switch_root"
 	default n
@@ -1103,6 +1144,15 @@ config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_UBIFS
+	bool "UBIFS filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  UBIFS (Unsorted Block Image File System) is a file
+	  system for use with raw flash memory media.
+
+
 endmenu
 
 endmenu