busybox: update to v1.14.4 (closes: #5619)

SVN-Revision: 17782

11 files changed, 234 insertions, 106 deletions

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index e8c77bfa69..cf656998cf 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -410,6 +410,12 @@ config BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
+config BUSYBOX_CONFIG_EXTRA_CFLAGS
+	string "Additional CFLAGS"
+	default ""
+	help
+	  Additional CFLAGS to pass to the compiler verbatim.
+
 endmenu
 
 menu 'Debugging Options'
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index f1e4d77018..81534e8402 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -110,6 +110,13 @@ config BUSYBOX_CONFIG_FEATURE_CPIO_O
 	  This implementation of cpio can create cpio archives in the "newc"
 	  format only.
 
+config BUSYBOX_CONFIG_FEATURE_CPIO_P
+	bool "Support for passthrough mode"
+	default n
+	depends on BUSYBOX_CONFIG_FEATURE_CPIO_O
+	help
+	  Passthrough mode. Rarely used.
+
 config BUSYBOX_CONFIG_DPKG
 	bool "dpkg"
 	default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 0775b4cbc7..f7b8f320f7 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -189,7 +189,7 @@ config BUSYBOX_CONFIG_ECHO
 config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
 	bool "Enable echo options (-n and -e)"
 	default y
-	depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
+	depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO || BUSYBOX_CONFIG_HUSH
 	help
 	  This adds options (-n and -e) to echo.
 
@@ -509,6 +509,18 @@ config BUSYBOX_CONFIG_SHA1SUM
 	help
 	  Compute and check SHA1 message digest
 
+config BUSYBOX_CONFIG_SHA256SUM
+	bool "sha256sum"
+	default n
+	help
+	  Compute and check SHA256 message digest
+
+config BUSYBOX_CONFIG_SHA512SUM
+	bool "sha512sum"
+	default n
+	help
+	  Compute and check SHA512 message digest
+
 config BUSYBOX_CONFIG_SLEEP
 	bool "sleep"
 	default y
@@ -754,7 +766,7 @@ config BUSYBOX_CONFIG_FEATURE_WC_LARGE
 	default n
 	depends on BUSYBOX_CONFIG_WC
 	help
-	  Use "unsigned long long" in wc for count variables.
+	  Use "unsigned long long" in wc for counter variables.
 
 config BUSYBOX_CONFIG_WHO
 	bool "who"
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index a84169d46e..75f3298170 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -32,11 +32,12 @@ config BUSYBOX_CONFIG_FEATURE_KILL_DELAY
 	int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
 	range 0 1024
 	default 0
+	depends on BUSYBOX_CONFIG_FEATURE_KILL_REMOVED
 	help
 	  With nonzero setting, init sends TERM, forks, child waits N
 	  seconds, sends KILL and exits. Setting it too high is unwise
-	  (child will hang around for too long and can actually kill
-	  wrong process!)
+	  (child will hang around for too long and could actually kill
+	  the wrong process!)
 
 config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
 	bool "Run commands with leading dash with controlling tty"
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index d100b3bb2e..d88876cf93 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -58,7 +58,7 @@ config BUSYBOX_CONFIG_USE_BB_SHADOW
 	  password servers and whatnot.
 
 config BUSYBOX_CONFIG_USE_BB_CRYPT
-	bool "Use internal DES and MD5 crypt functions"
+	bool "Use internal crypt functions"
 	default n
 	help
 	  Busybox has internal DES and MD5 crypt functions.
@@ -79,6 +79,18 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT
 	  In static build, it makes code _smaller_ by about 1.2k,
 	  and likely many kilobytes less of bss.
 
+config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA
+	bool "Enable SHA256/512 crypt functions"
+	default n
+	depends on BUSYBOX_CONFIG_USE_BB_CRYPT
+	help
+	  Enable this if you have passwords starting with "$5$" or "$6$"
+	  in your /etc/passwd or /etc/shadow files. These passwords
+	  are hashed using SHA256 and SHA512 algorithms. Support for them
+	  was added to glibc in 2008.
+	  With this option off, login will fail password check for any
+	  user which has password encrypted with these algorithms.
+
 config BUSYBOX_CONFIG_ADDGROUP
 	bool "addgroup"
 	default n
@@ -230,15 +242,16 @@ config BUSYBOX_CONFIG_CRYPTPW
 	bool "cryptpw"
 	default n
 	help
-	  Applet for crypting a string.
+	  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_CONFIG_CHPASSWD
 	bool "chpasswd"
 	default n
 	help
-	  chpasswd reads a file of user name and password pairs from
-	  standard input and uses this information to update a group of
-	  existing users.
+	  Reads a file of user name and password pairs from standard input
+	  and uses this information to update a group of existing users.
 
 config BUSYBOX_CONFIG_SU
 	bool "su"
diff --git a/package/busybox/config/mailutils/Config.in b/package/busybox/config/mailutils/Config.in
index 9fb5a13ec7..c879583c8e 100644
--- a/package/busybox/config/mailutils/Config.in
+++ b/package/busybox/config/mailutils/Config.in
@@ -50,20 +50,4 @@ config BUSYBOX_CONFIG_SENDMAIL
 	help
 	  Barebones sendmail.
 
-config BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILX
-	bool "Allow to specify subject, attachments, their charset etc"
-	default n
-	depends on BUSYBOX_CONFIG_SENDMAIL
-	help
-	  Allow to specify subject, attachments and their charset.
-	  Allow to use custom connection helper.
-
-config BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILXX
-	bool "Allow to specify Cc: addresses and some additional headers"
-	default n
-	depends on BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILX
-	help
-	  Allow to specify Cc: addresses and some additional headers:
-	  Errors-To:
-
 endmenu
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index e1541c97da..1ddfb940a8 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -121,6 +121,13 @@ config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
 	help
 	  Support calling /usr/sbin/sendmail for send cmd outputs.
 
+config BUSYBOX_CONFIG_FEATURE_CROND_DIR
+	string "crond spool directory"
+	default "/var/spool/cron"
+	depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
+	help
+	  Location of crond spool.
+
 config BUSYBOX_CONFIG_CRONTAB
 	bool "crontab"
 	default y
@@ -151,7 +158,10 @@ config BUSYBOX_CONFIG_DEVFSD
 	default n
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
-	  This is deprecated, and will be removed at the end of 2008.
+	  This is deprecated and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	  See docs/mdev.txt for detailed instructions on how to use mdev
+	  instead.
 
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
@@ -160,7 +170,7 @@ config BUSYBOX_CONFIG_DEVFSD
 	  "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
 	  "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
 
-	   But only if they are written UPPERCASE!!!!!!!!
+	  But only if they are written UPPERCASE!!!!!!!!
 
 config BUSYBOX_CONFIG_DEVFSD_MODLOAD
 	bool "Adds support for MODLOAD keyword in devsfd.conf"
@@ -190,9 +200,11 @@ config BUSYBOX_CONFIG_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	default n
 	help
-	  This is obsolete and will be going away at the end of 2008..
+	  This is obsolete and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
 
-	  This tells busybox to look for names like /dev/loop/0 instead of
+	  For legacy systems -- if there is no way around devfsd -- this
+	  tells busybox to look for names like /dev/loop/0 instead of
 	  /dev/loop0. If your /dev directory has normal names instead of
 	  devfs names, you don't want this.
 
@@ -238,6 +250,20 @@ config BUSYBOX_CONFIG_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 
+config BUSYBOX_CONFIG_FLASH_ERASEALL
+	bool "flash_eraseall"
+	default n
+	help
+	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	  This utility is used to erase the whole MTD device.
+
+config BUSYBOX_CONFIG_IONICE
+	bool "ionice"
+	default n
+	help
+	  Set/set program io scheduling class and priority
+	  Requires kernel >= 2.6.13
+
 config BUSYBOX_CONFIG_INOTIFYD
 	bool "inotifyd"
 	default n
@@ -300,14 +326,6 @@ config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
 	  The -M flag enables a more sophisticated status line.
 	  The -m flag enables a simpler status line with a percentage.
 
-config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
-	bool "Enable flag changes ('-' command)"
-	default n
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
-
 config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
 	bool "Enable marks"
 	default n
@@ -322,13 +340,6 @@ config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
 	help
 	  Enable regular expressions, allowing complex file searches.
 
-config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
-	bool "Enable dynamic switching of line numbers"
-	default n
-	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
-	help
-	  Enable "-N" command.
-
 config BUSYBOX_CONFIG_FEATURE_LESS_WINCH
 	bool "Enable automatic resizing on window size changes"
 	default n
@@ -336,6 +347,21 @@ config BUSYBOX_CONFIG_FEATURE_LESS_WINCH
 	help
 	  Makes less track window size changes.
 
+config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	default n
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
+config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
+	bool "Enable dynamic switching of line numbers"
+	default n
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	help
+	  Enable "-N" command.
+
 config BUSYBOX_CONFIG_HDPARM
 	bool "hdparm"
 	default n
@@ -388,12 +414,11 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
 	  stuff, so you should probably say N.
 
 config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
-	bool "Get/set using_dma flag (DANGEROUS)"
+	bool "Get/set using_dma flag"
 	default n
 	depends on BUSYBOX_CONFIG_HDPARM
 	help
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
-	  This is dangerous stuff, so you should probably say N.
 
 config BUSYBOX_CONFIG_LOCK
 	bool "lock"
@@ -535,6 +560,13 @@ config BUSYBOX_CONFIG_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
+config BUSYBOX_CONFIG_TIMEOUT
+	bool "timeout"
+	default n
+	help
+	  Runs a program and watches it. If it does not terminate in
+	  specified number of seconds, it is sent a signal.
+
 config BUSYBOX_CONFIG_TTYSIZE
 	bool "ttysize"
 	default n
diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in
index f02f03178e..e2f880faf2 100644
--- a/package/busybox/config/modutils/Config.in
+++ b/package/busybox/config/modutils/Config.in
@@ -5,20 +5,6 @@
 
 menu "Linux Module Utilities"
 
-config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR
-	string "Default directory containing modules"
-	default "/lib/modules"
-	help
-	  Directory that contains kernel modules.
-	  Defaults to "/lib/modules"
-
-config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE
-	string "Default name of modules.dep"
-	default "modules.dep"
-	help
-	  Filename that contains kernel modules dependencies.
-	  Defaults to "modules.dep"
-
 config BUSYBOX_CONFIG_MODPROBE_SMALL
 	bool "Simplified modutils"
 	default n
@@ -58,7 +44,6 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 	depends on BUSYBOX_CONFIG_MODPROBE_SMALL
 	help
 	  Allow insmod and modprobe take module options from command line.
-	  N.B. Very bloaty.
 
 config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	bool "Skip loading of already loaded modules"
@@ -66,7 +51,6 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	depends on BUSYBOX_CONFIG_MODPROBE_SMALL
 	help
 	  Check if the module is already loaded.
-	  N.B. It's racy.
 
 config BUSYBOX_CONFIG_INSMOD
 	bool "insmod"
@@ -157,7 +141,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	  By adding module symbols to the kernel symbol table, Oops messages
 	  occuring within kernel modules can be properly debugged. By enabling
 	  this feature, module symbols will always be added to the kernel symbol
-	  table for properly debugging support. If you are not interested in
+	  table for proper debugging support. If you are not interested in
 	  Oops messages from kernel modules, say N.
 
 config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM
@@ -193,7 +177,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
 config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	bool "Support tainted module checking with new kernels"
 	default y
-	depends on !BUSYBOX_CONFIG_MODPROBE_SMALL
+	depends on (BUSYBOX_CONFIG_LSMOD || BUSYBOX_CONFIG_FEATURE_2_4_MODULES) && !BUSYBOX_CONFIG_MODPROBE_SMALL
 	help
 	  Support checking for tainted modules. These are usually binary
 	  only modules that will make the linux-kernel list ignore your
@@ -227,4 +211,20 @@ config BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS
 
 	  Say Y if unsure.
 
+config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR
+	string "Default directory containing modules"
+	default "/lib/modules"
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL
+	help
+	  Directory that contains kernel modules.
+	  Defaults to "/lib/modules"
+
+config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE
+	string "Default name of modules.dep"
+	default "modules.dep"
+	depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL
+	help
+	  Filename that contains kernel modules dependencies.
+	  Defaults to "modules.dep"
+
 endmenu
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index de7484aa99..0bde42b14f 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -13,7 +13,7 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
 	  This adds IPv6 support in the networking applets.
 
 config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
-	bool "Preferentially use IPv4 addresses from DNS queries"
+	bool "Prefer IPv4 addresses from DNS queries"
 	default y
 	depends on BUSYBOX_CONFIG_FEATURE_IPV6
 	help
@@ -66,12 +66,12 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	  This adds about 600 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
-	bool "Support show, showmac and showstp"
+	bool "Support show"
 	default y
 	depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	help
 	  Add support for option which prints the current config:
-	    showmacs, showstp, show
+	    show
 
 config BUSYBOX_CONFIG_DNSD
 	bool "dnsd"
@@ -93,6 +93,19 @@ config BUSYBOX_CONFIG_FAKEIDENTD
 	  fakeidentd listens on the ident port and returns a predefined
 	  fake value on any query.
 
+config BUSYBOX_CONFIG_FTPD
+	bool "ftpd"
+	default n
+	help
+	  simple FTP daemon. You have to run it via inetd.
+
+config BUSYBOX_CONFIG_FEATURE_FTP_WRITE
+	bool "Enable upload commands"
+	default n
+	depends on BUSYBOX_CONFIG_FTPD
+	help
+	  Enable all kinds of FTP upload commands (-w option)
+
 config BUSYBOX_CONFIG_FTPGET
 	bool "ftpget"
 	default n
@@ -827,7 +840,7 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
 config BUSYBOX_CONFIG_TFTP_DEBUG
 	bool "Enable debug"
 	default n
-	depends on BUSYBOX_CONFIG_TFTP
+	depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD
 	help
 	  Enable debug settings for tftp. This is useful if you're running
 	  into problems with tftp as the protocol doesn't help you much when
@@ -844,7 +857,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
 	default y
 	depends on BUSYBOX_CONFIG_TRACEROUTE
 	help
-	  Add some verbosity to traceroute. This includes amongst other things
+	  Add some verbosity to traceroute. This includes among other things
 	  hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
@@ -860,10 +873,19 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 	default n
 	depends on BUSYBOX_CONFIG_TRACEROUTE
 	help
-	  Add feature to allow for ICMP ECHO instead of UDP datagrams.
+	  Add option -I to use ICMP ECHO instead of UDP datagrams.
 
 source package/busybox/config/networking/udhcp/Config.in
 
+config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	string "ifup udhcpc command line options"
+	default "-R -n"
+	depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_APP_UDHCPC
+	help
+	  Command line options to pass to udhcpc from ifup.
+	  Intended to alter options not available in /etc/network/interfaces.
+	  (IE: --syslog --background etc...)
+
 config BUSYBOX_CONFIG_VCONFIG
 	bool "vconfig"
 	default y
@@ -917,6 +939,20 @@ config BUSYBOX_CONFIG_TCPSVD
 	  tcpsvd listens on a TCP port and runs a program for each new
 	  connection.
 
+config BUSYBOX_CONFIG_TUNCTL
+	bool "tunctl"
+	default n
+	help
+	  tunctl creates or deletes tun devices.
+
+config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
+	bool "Support owner:group assignment"
+	default n
+	depends on BUSYBOX_CONFIG_TUNCTL
+	help
+	  Allow to specify owner and group of newly created interface.
+	  340 bytes of pure bloat. Say no here.
+
 config BUSYBOX_CONFIG_UDPSVD
 	bool "udpsvd"
 	default n
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 4107e127d4..233c3a8f41 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -84,22 +84,6 @@ config BUSYBOX_CONFIG_ASH_ALIAS
 	help
 	  Enable alias support in the ash shell.
 
-config BUSYBOX_CONFIG_ASH_MATH_SUPPORT
-	bool "Posix math support"
-	default y
-	depends on BUSYBOX_CONFIG_ASH
-	help
-	  Enable math support in the ash shell.
-
-config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64
-	bool "Extend Posix math support to 64 bit"
-	default y
-	depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT
-	help
-	  Enable 64-bit math support in the ash shell. This will make
-	  the shell slightly larger, but will allow computation with very
-	  large numbers.
-
 config BUSYBOX_CONFIG_ASH_GETOPTS
 	bool "Builtin getopt to parse positional parameters"
 	default y
@@ -152,14 +136,14 @@ config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE
 	  Compile ash for reduced size at the price of speed.
 
 config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT
-	bool "Pseudorandom generator and variable $RANDOM"
+	bool "Pseudorandom generator and $RANDOM variable"
 	default n
 	depends on BUSYBOX_CONFIG_ASH
 	help
 	  Enable pseudorandom generator and dynamic variable "$RANDOM".
 	  Each read of "$RANDOM" will generate a new pseudorandom value.
 	  You can reset the generator by using a specified start value.
-	  After "unset RANDOM" then generator will switch off and this
+	  After "unset RANDOM" the generator will switch off and this
 	  variable will no longer have special treatment.
 
 config BUSYBOX_CONFIG_ASH_EXPAND_PRMT
@@ -167,7 +151,7 @@ config BUSYBOX_CONFIG_ASH_EXPAND_PRMT
 	default y
 	depends on BUSYBOX_CONFIG_ASH
 	help
-	  "PS#" may be contain volatile content, such as backquote commands.
+	  "PS#" may contain volatile content, such as backquote commands.
 	  This option recreates the prompt string from the environment
 	  variable each time it is displayed.
 
@@ -175,16 +159,15 @@ config BUSYBOX_CONFIG_HUSH
 	bool "hush"
 	default n
 	help
-	  hush is a very small shell (just 18k) and it has fairly complete
-	  Bourne shell grammar. It even handles all the normal flow control
-	  options such as if/then/elif/else/fi, for/in/do/done, while loops,
-	  case/esac.
+	  hush is a small shell (22k). It handles the normal flow control
+	  constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
+	  case/esac. Redirections, here documents, $((arithmetic))
+	  and functions are supported.
 
-	  It uses only vfork, so it can be used on uClinux systems.
+	  It will compile and work on no-mmu systems.
 
-	  It does not handle select, functions, here documents ( <<
-	  word ), arithmetic expansion, aliases, brace expansion, tilde
-	  expansion, &> and >& redirection of stdout+stderr, etc.
+	  It does not handle select, aliases, brace expansion,
+	  tilde expansion, &>file and >&file redirection of stdout+stderr.
 
 config BUSYBOX_CONFIG_HUSH_HELP
 	bool "help builtin"
@@ -234,7 +217,6 @@ config BUSYBOX_CONFIG_HUSH_LOOPS
 	depends on BUSYBOX_CONFIG_HUSH
 	help
 	  Enable for, while and until loops in hush.
-	  As of 2008-07, break and continue statements are not supported.
 
 config BUSYBOX_CONFIG_HUSH_CASE
 	bool "Support case ... esac statement"
@@ -243,27 +225,54 @@ config BUSYBOX_CONFIG_HUSH_CASE
 	help
 	  Enable case ... esac statement in hush. +400 bytes.
 
+config BUSYBOX_CONFIG_HUSH_FUNCTIONS
+	bool "Support funcname() { commands; } syntax"
+	default n
+	depends on BUSYBOX_CONFIG_HUSH
+	help
+	  Enable support for shell functions in hush. +800 bytes.
+
 config BUSYBOX_CONFIG_LASH
-	bool "lash"
+	bool "lash (deprecated: aliased to hush)"
 	default n
 	select BUSYBOX_CONFIG_HUSH
 	help
 	  lash is deprecated and will be removed, please migrate to hush.
 
 config BUSYBOX_CONFIG_MSH
-	bool "msh"
+	bool "msh (deprecated: please use hush)"
 	default n
 	help
-	  The minix shell (adds just 30k) is quite complete and handles things
-	  like for/do/done, case/esac and all the things you expect a Bourne
-	  shell to do. It is not always pedantically correct about Bourne
-	  shell grammar (try running the shell testscript "tests/sh.testcases"
-	  on it and compare vs bash) but for most things it works quite well.
-	  It uses only vfork, so it can be used on uClinux systems.
+	  msh is deprecated and will be removed, please migrate to hush.
+	  If there is a feature msh has but hush does not, please let us know.
+
+#	  The minix shell (adds just 30k) is quite complete and handles things
+#	  like for/do/done, case/esac and all the things you expect a Bourne
+#	  shell to do. It is not always pedantically correct about Bourne
+#	  shell grammar (try running the shell testscript "tests/sh.testcases"
+#	  on it and compare vs bash) but for most things it works quite well.
+#	  It uses only vfork, so it can be used on uClinux systems.
+
 
 comment "Bourne Shell Options"
 	depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
 
+config BUSYBOX_CONFIG_SH_MATH_SUPPORT
+	bool "POSIX math support"
+	default y
+	depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH
+	help
+	  Enable math support in the shell via $((...)) syntax.
+
+config BUSYBOX_CONFIG_SH_MATH_SUPPORT_64
+	bool "Extend POSIX math support to 64 bit"
+	default y
+	depends on BUSYBOX_CONFIG_SH_MATH_SUPPORT
+	help
+	  Enable 64-bit math support in the shell. This will make the shell
+	  slightly larger, but will allow computation with very large numbers.
+	  This is not in POSIX, so do not rely on this in portable code.
+
 config BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 6b8dcdf7f6..526ea00cc0 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -5,6 +5,28 @@
 
 menu "Linux System Utilities"
 
+config BUSYBOX_CONFIG_ACPID
+	bool "acpid"
+	default n
+	help
+	  acpid listens to ACPI events coming either in textual form from
+	  /proc/acpi/event (though it is marked deprecated it is still widely
+	  used and _is_ a standard) or in binary form from specified evdevs
+	  (just use /dev/input/event*).
+
+	  It parses the event to retrieve ACTION and a possible PARAMETER.
+	  It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+	  (if the resulting path is a directory) or directly as an executable.
+
+	  N.B. acpid relies on run-parts so have the latter installed.
+
+config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
+	bool "Accept and ignore redundant options"
+	default n
+	depends on BUSYBOX_CONFIG_ACPID
+	help
+	  Accept and ignore compatibility options -g -m -s -S -v.
+
 config BUSYBOX_CONFIG_BLKID
 	bool "blkid"
 	default n
@@ -211,6 +233,12 @@ config BUSYBOX_CONFIG_FEATURE_MINIX2
 	  this. If you enabled 'mkfs_minix' then you almost certainly want to
 	  be using the version 2 filesystem support.
 
+config BUSYBOX_CONFIG_MKFS_VFAT
+	bool "mkfs_vfat"
+	default n
+	help
+	  Utility to create FAT32 filesystems.
+
 config BUSYBOX_CONFIG_GETOPT
 	bool "getopt"
 	default n