busybox: version bump 1.18.5 -> 1.20.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

23 files changed, 804 insertions, 466 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index eafe8dee4..c5ad60002 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -83,20 +83,21 @@ config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS
 endchoice
 
 config BUSYBOX_SHOW_USAGE
-	bool "Show terse applet usage messages"
+	bool "Show applet usage messages"
 	default y
 	help
-	  All BusyBox applets will show help messages when invoked with
-	  wrong arguments. You can turn off printing these terse usage
-	  messages if you say no here.
-	  This will save you up to 7k.
+	  Enabling this option, BusyBox applets will show terse help messages
+	  when invoked with wrong arguments.
+	  If you do not want to show any (helpful) usage message when
+	  issuing wrong command syntax, you can say 'N' here,
+	  saving approximately 7k.
 
 config BUSYBOX_FEATURE_VERBOSE_USAGE
 	bool "Show verbose applet usage messages"
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  All BusyBox applets will show more verbose help messages when
+	  All BusyBox applets will show verbose help messages when
 	  busybox is invoked with --help. This will add a lot of text to the
 	  busybox binary. In the default configuration, this will add about
 	  13k, but it can add much more depending on your configuration.
@@ -106,8 +107,8 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  Store usage messages in compressed form, uncompress them on-the-fly
-	  when <applet> --help is called.
+	  Store usage messages in .bz compressed form, uncompress them
+	  on-the-fly when <applet> --help is called.
 
 	  If you have a really tiny busybox with few applets enabled (and
 	  bunzip2 isn't one of them), the overhead of the decompressor might
@@ -248,8 +249,9 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT
 	help
-	  With this option on, invalid UTF-8 bytes are not substituted
-	  with the selected substitution character.
+	  With this option on, on line-editing input (such as used by shells)
+	  invalid UTF-8 bytes are not substituted with the selected
+	  substitution character.
 	  For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
 	  at shell prompt will list file named 0xff (single char name
 	  with char value 255), not file named '?'.
@@ -283,10 +285,19 @@ config BUSYBOX_FEATURE_CLEAN_UP
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
+config BUSYBOX_FEATURE_UTMP
+	bool "Support utmp file"
+	default y
+	help
+	  The file /var/run/utmp is used to track who is currently logged in.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will create and delete entries there.
+	  "who" applet requires this option.
+
 config BUSYBOX_FEATURE_WTMP
 	bool "Support wtmp file"
 	default y
-	select BUSYBOX_FEATURE_UTMP
+	depends on BUSYBOX_FEATURE_UTMP
 	help
 	  The file /var/run/wtmp is used to track when users have logged into
 	  and logged out of the system.
@@ -294,15 +305,6 @@ config BUSYBOX_FEATURE_WTMP
 	  will append new entries there.
 	  "last" applet requires this option.
 
-config BUSYBOX_FEATURE_UTMP
-	bool "Support utmp file"
-	default y
-	help
-	  The file /var/run/utmp is used to track who is currently logged in.
-	  With this option on, certain applets (getty, login, telnetd etc)
-	  will create and delete entries there.
-	  "who" applet requires this option.
-
 config BUSYBOX_FEATURE_PIDFILE
 	bool "Support writing pidfiles"
 	default y
@@ -327,21 +329,39 @@ config BUSYBOX_FEATURE_SUID
 	  symlinks pointing to each binary), and only set the suid bit on the
 	  one that needs it.
 
-	  The applets currently marked to need the suid bit are:
+	  The applets which require root rights (need suid bit or
+	  to be run by root) and will refuse to execute otherwise:
+	  crontab, login, passwd, su, vlock, wall.
+
+	  The applets which will use root rights if they have them
+	  (via suid bit, or because run by root), but would try to work
+	  without root right nevertheless:
+	  findfs, ping[6], traceroute[6], mount.
 
-	  crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
-	  traceroute, vlock.
+	  Note that if you DONT select this option, but DO make busybox
+	  suid root, ALL applets will run under root, which is a huge
+	  security hole (think "cp /some/file /etc/passwd").
 
 config BUSYBOX_FEATURE_SUID_CONFIG
 	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
-	default y if BUSYBOX_FEATURE_SUID
+	default y
 	depends on BUSYBOX_FEATURE_SUID
 	help
 	  Allow the SUID / SGID state of an applet to be determined at runtime
 	  by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
 	  The format of this file is as follows:
 
-	  <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
+	  APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+
+	  s: USER or GROUP is allowed to execute APPLET.
+	     APPLET will run under USER or GROUP
+	     (reagardless of who's running it).
+	  S: USER or GROUP is NOT allowed to execute APPLET.
+	     APPLET will run under USER or GROUP.
+	     This option is not very sensical.
+	  x: USER/GROUP/others are allowed to execute APPLET.
+	     No UID/GID change will be done when it is run.
+	  -: USER/GROUP/others are not allowed to execute APPLET.
 
 	  An example might help:
 
@@ -351,7 +371,8 @@ config BUSYBOX_FEATURE_SUID_CONFIG
 	  su = ssx        # exactly the same
 
 	  mount = sx- root.disk # applet mount can be run by root and members
-	                        # of group disk and runs with euid=0
+	                        # of group disk (but not anyone else)
+	                        # and runs with euid=0 (egid is not changed)
 
 	  cp = --- # disable applet cp for everyone
 
@@ -377,7 +398,7 @@ config BUSYBOX_FEATURE_SUID_CONFIG_QUIET
 config BUSYBOX_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Enable support for SELinux in applets ls, ps, and id. Also provide
 	  the option of compiling in SELinux applets.
@@ -458,7 +479,10 @@ config BUSYBOX_PIE
 	default n
 	depends on !BUSYBOX_STATIC
 	help
-	  (TODO: what is it and why/when is it useful?)
+	  Hardened code option. PIE binaries are loaded at a different
+	  address at each invocation. This has some overhead,
+	  particularly on x86-32 which is short on registers.
+
 	  Most people will leave this set to 'N'.
 
 config BUSYBOX_NOMMU
@@ -555,7 +579,6 @@ config BUSYBOX_FEATURE_SHARED_BUSYBOX
 config BUSYBOX_LFS
 	bool "Build with Large File Support (for accessing files > 2 GB)"
 	default y
-	select BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
 	help
 	  If you want to build BusyBox with large file support, then enable
 	  this option. This will have no effect if your kernel or your C
@@ -577,12 +600,39 @@ config BUSYBOX_CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
+config BUSYBOX_SYSROOT
+	string "Path to sysroot"
+	default ""
+	help
+	  If you want to build BusyBox with a cross compiler, then you
+	  might also need to specify where /usr/include and /usr/lib
+	  will be found.
+
+	  For example, BusyBox can be built against an installed
+	  Android NDK, platform version 9, for ARM ABI with
+
+	  CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+
+	  Native builds leave this empty.
+
 config BUSYBOX_EXTRA_CFLAGS
 	string "Additional CFLAGS"
 	default ""
 	help
 	  Additional CFLAGS to pass to the compiler verbatim.
 
+config BUSYBOX_EXTRA_LDFLAGS
+	string "Additional LDFLAGS"
+	default ""
+	help
+	  Additional LDFLAGS to pass to the linker verbatim.
+
+config BUSYBOX_EXTRA_LDLIBS
+	string "Additional LDLIBS"
+	default ""
+	help
+	  Additional LDLIBS to pass to the linker with -l.
+
 endmenu
 
 menu 'Debugging Options'
@@ -659,9 +709,6 @@ config BUSYBOX_EFENCE
 
 endchoice
 
-### config PARSE
-###	bool "Uniform config file parser debugging applet: parse"
-
 endmenu
 
 menu 'Installation Options ("make install" behavior)'
@@ -692,7 +739,6 @@ config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS
 
 config BUSYBOX_INSTALL_APPLET_DONT
 	bool "not installed"
-	depends on BUSYBOX_FEATURE_INSTALLER || BUSYBOX_FEATURE_SH_STANDALONE || BUSYBOX_FEATURE_PREFER_APPLETS
 	help
 	  Do not install applet links. Useful when you plan to use
 	  busybox --install for installing links, or plan to use
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 375412331..d1435d6e7 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -7,7 +7,6 @@
 menu "Archival Utilities"
 
 
-
 config BUSYBOX_FEATURE_SEAMLESS_XZ
 	bool "Make tar, rpm, modprobe etc understand .xz data"
 	default y
@@ -33,10 +32,10 @@ config BUSYBOX_FEATURE_SEAMLESS_GZ
 	  Make tar, rpm, modprobe etc understand .gz data.
 
 config BUSYBOX_FEATURE_SEAMLESS_Z
-	bool "Make tar and gunzip understand .Z data"
+	bool "tar, rpm, modprobe etc understand .Z data"
 	default n
 	help
-	  Make tar and gunzip understand .Z data.
+	  Make tar, rpm, modprobe etc understand .Z data.
 
 config BUSYBOX_AR
 	bool "ar"
@@ -188,6 +187,18 @@ config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS
 	help
 	  Enable use of long options, increases size by about 106 Bytes
 
+config BUSYBOX_GZIP_FAST
+	int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+	default 0
+	range 0 2
+	depends on BUSYBOX_GZIP
+	help
+	  Enable big memory options for gzip.
+	  0: small buffers, small hash-tables
+	  1: larger buffers, larger hash-tables
+	  2: larger buffers, largest hash-tables
+	  Larger models may give slightly better compression
+
 config BUSYBOX_LZOP
 	bool "lzop"
 	default y
@@ -331,15 +342,12 @@ config BUSYBOX_UNLZMA
 	  is generally considerably better than that achieved by the bzip2
 	  compressors.
 
-	  The BusyBox unlzma applet is limited to de-compression only.
+	  The BusyBox unlzma applet is limited to decompression only.
 	  On an x86 system, this applet adds about 4K.
 
-	  Unless you have a specific application which requires unlzma, you
-	  should probably say N here.
-
 config BUSYBOX_FEATURE_LZMA_FAST
 	bool "Optimize unlzma for speed"
-	default y
+	default n
 	depends on BUSYBOX_UNLZMA
 	help
 	  This option reduces decompression time by about 25% at the cost of
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index 084efbf49..667dc8ae2 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -7,11 +7,10 @@
 menu "Console Utilities"
 
 
-
 config BUSYBOX_CHVT
 	bool "chvt"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program is used to change to another terminal.
 	  Example: chvt 4 (change to terminal /dev/tty4)
@@ -19,7 +18,7 @@ config BUSYBOX_CHVT
 config BUSYBOX_FGCONSOLE
 	bool "fgconsole"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program prints active (foreground) console number.
 
@@ -32,14 +31,14 @@ config BUSYBOX_CLEAR
 config BUSYBOX_DEALLOCVT
 	bool "deallocvt"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program deallocates unused virtual consoles.
 
 config BUSYBOX_DUMPKMAP
 	bool "dumpkmap"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program dumps the kernel's keyboard translation table to
 	  stdout, in binary format. You can then use loadkmap to load it.
@@ -47,21 +46,21 @@ config BUSYBOX_DUMPKMAP
 config BUSYBOX_KBD_MODE
 	bool "kbd_mode"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program reports and sets keyboard mode.
 
 config BUSYBOX_LOADFONT
 	bool "loadfont"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads a console font from standard input.
 
 config BUSYBOX_LOADKMAP
 	bool "loadkmap"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads a keyboard translation table from
 	  standard input.
@@ -69,7 +68,7 @@ config BUSYBOX_LOADKMAP
 config BUSYBOX_OPENVT
 	bool "openvt"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program is used to start a command on an unused
 	  virtual terminal.
@@ -101,7 +100,7 @@ config BUSYBOX_FEATURE_RESIZE_PRINT
 config BUSYBOX_SETCONSOLE
 	bool "setconsole"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program redirects the system console to another device,
 	  like the current tty while logged in via telnet.
@@ -116,7 +115,7 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
 config BUSYBOX_SETFONT
 	bool "setfont"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Allows to load console screen map. Useful for i18n.
 
@@ -138,7 +137,7 @@ config BUSYBOX_DEFAULT_SETFONT_DIR
 config BUSYBOX_SETKEYCODES
 	bool "setkeycodes"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads entries into the kernel's scancode-to-keycode
 	  map, allowing unusual keyboards to generate usable keycodes.
@@ -146,14 +145,14 @@ config BUSYBOX_SETKEYCODES
 config BUSYBOX_SETLOGCONS
 	bool "setlogcons"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program redirects the output console of kernel messages.
 
 config BUSYBOX_SHOWKEY
 	bool "showkey"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Shows keys pressed.
 
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 22bbc55d3..6393c1c14 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -38,7 +38,8 @@ config BUSYBOX_FEATURE_DATE_ISOFMT
 config BUSYBOX_FEATURE_DATE_NANO
 	bool "Support %[num]N nanosecond format specifier"
 	default n
-	depends on BUSYBOX_DATE && BUSYBOX_PLATFORM_LINUX # syscall(BUSYBOX___NR_clockBUSYBOX__gettime)
+	depends on BUSYBOX_DATE  # syscall(__NR_clock_gettime)
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Support %[num]N format specifier. Adds ~250 bytes of code.
 
@@ -57,6 +58,22 @@ config BUSYBOX_FEATURE_DATE_COMPAT
 	  With this option off, 'date DATE' is 'date -s DATE' support
 	  the same format. With it on, 'date DATE' additionally supports
 	  MMDDhhmm[[YY]YY][.ss] format.
+config BUSYBOX_HOSTID
+	bool "hostid"
+	default y
+	help
+	  hostid prints the numeric identifier (in hexadecimal) for
+	  the current host.
+config BUSYBOX_ID
+	bool "id"
+	default y
+	help
+	  id displays the current user and group ID names.
+config BUSYBOX_GROUPS
+	bool "groups"
+	default y
+	help
+	  Print the group names associated with current user id.
 config BUSYBOX_TEST
 	bool "test"
 	default y
@@ -71,6 +88,19 @@ config BUSYBOX_FEATURE_TEST_64
 	depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH
 	help
 	  Enable 64-bit support in test.
+config BUSYBOX_TOUCH
+	bool "touch"
+	default y
+	help
+	  touch is used to create or change the access and/or
+	  modification timestamp of specified files.
+
+config BUSYBOX_FEATURE_TOUCH_SUSV3
+	bool "Add support for SUSV3 features (-d -t -r)"
+	default y
+	depends on BUSYBOX_TOUCH
+	help
+	  Enable touch to use a reference file or a given date/time argument.
 config BUSYBOX_TR
 	bool "tr"
 	default y
@@ -101,6 +131,18 @@ config BUSYBOX_BASE64
 	default y
 	help
 	  Base64 encode and decode
+config BUSYBOX_WHO
+      bool "who"
+      default y
+      depends on BUSYBOX_FEATURE_UTMP
+      help
+        who is used to show who is logged on.
+config BUSYBOX_USERS
+      bool "users"
+      default y
+      depends on BUSYBOX_FEATURE_UTMP
+      help
+        Print users currently logged on.
 
 config BUSYBOX_CAL
 	bool "cal"
@@ -364,19 +406,6 @@ config BUSYBOX_FEATURE_FANCY_HEAD
 	help
 	  This enables the head options (-c, -q, and -v).
 
-config BUSYBOX_HOSTID
-	bool "hostid"
-	default y
-	help
-	  hostid prints the numeric identifier (in hexadecimal) for
-	  the current host.
-
-config BUSYBOX_ID
-	bool "id"
-	default y
-	help
-	  id displays the current user and group ID names.
-
 config BUSYBOX_INSTALL
 	bool "install"
 	default y
@@ -390,11 +419,11 @@ config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS
 	help
 	  Support long options for the install applet.
 
-config BUSYBOX_LENGTH
-	bool "length"
-	default y
-	help
-	  length is used to print out the length of a specified string.
+####config LENGTH
+####	bool "length"
+####	default y
+####	help
+####	  length is used to print out the length of a specified string.
 
 config BUSYBOX_LN
 	bool "ln"
@@ -686,7 +715,7 @@ config BUSYBOX_FEATURE_SPLIT_FANCY
 config BUSYBOX_STAT
 	bool "stat"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX # statfs()
+	select BUSYBOX_PLATFORM_LINUX # statfs()
 	help
 	  display file or filesystem status.
 
@@ -756,13 +785,6 @@ config BUSYBOX_FEATURE_TEE_USE_BLOCK_IO
 	help
 	  Enable this option for a faster tee, at expense of size.
 
-config BUSYBOX_TOUCH
-	bool "touch"
-	default y
-	help
-	  touch is used to create or change the access and/or
-	  modification timestamp of specified files.
-
 config BUSYBOX_TRUE
 	bool "true"
 	default y
@@ -833,13 +855,6 @@ config BUSYBOX_FEATURE_WC_LARGE
 	help
 	  Use "unsigned long long" in wc for counter variables.
 
-config BUSYBOX_WHO
-	bool "who"
-	default y
-	depends on BUSYBOX_FEATURE_UTMP
-	help
-	  who is used to show who is logged on.
-
 config BUSYBOX_WHOAMI
 	bool "whoami"
 	default y
diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in
index f3d189115..89fcf279a 100644
--- a/config/busybox/debianutils/Config.in
+++ b/config/busybox/debianutils/Config.in
@@ -7,7 +7,6 @@
 menu "Debian Utilities"
 
 
-
 config BUSYBOX_MKTEMP
 	bool "mktemp"
 	default y
diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index 2cc7c3a3c..6d2f3c43c 100644
--- a/config/busybox/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -7,7 +7,6 @@
 menu "Linux Ext2 FS Progs"
 
 
-
 config BUSYBOX_CHATTR
 	bool "chattr"
 	default y
@@ -34,7 +33,7 @@ config BUSYBOX_FSCK
 config BUSYBOX_LSATTR
 	bool "lsattr"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  lsattr lists the file attributes on a second extended file system.
 
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 8d71283d7..39a1e0cc8 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -11,67 +11,6 @@ config BUSYBOX_PATCH
 	default y
 	help
 	  Apply a unified diff formatted patch.
-
-config BUSYBOX_AWK
-	bool "awk"
-	default y
-	help
-	  Awk is used as a pattern scanning and processing language. This is
-	  the BusyBox implementation of that programming language.
-
-config BUSYBOX_FEATURE_AWK_LIBM
-	bool "Enable math functions (requires libm)"
-	default y
-	depends on BUSYBOX_AWK
-	help
-	  Enable math functions of the Awk programming language.
-	  NOTE: This will require libm to be present for linking.
-
-config BUSYBOX_CMP
-	bool "cmp"
-	default y
-	help
-	  cmp is used to compare two files and returns the result
-	  to standard output.
-
-config BUSYBOX_DIFF
-	bool "diff"
-	default y
-	help
-	  diff compares two files or directories and outputs the
-	  differences between them in a form that can be given to
-	  the patch command.
-
-config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS
-	help
-	  Enable use of long options.
-
-config BUSYBOX_FEATURE_DIFF_DIR
-	bool "Enable directory support"
-	default y
-	depends on BUSYBOX_DIFF
-	help
-	  This option enables support for directory and subdirectory
-	  comparison.
-
-config BUSYBOX_ED
-	bool "ed"
-	default y
-	help
-	  The original 1970's Unix text editor, from the days of teletypes.
-	  Small, simple, evil. Part of SUSv3. If you're not already using
-	  this, you don't need it.
-
-config BUSYBOX_SED
-	bool "sed"
-	default y
-	help
-	  sed is used to perform text transformations on a file
-	  or input from a pipeline.
-
 config BUSYBOX_VI
 	bool "vi"
 	default y
@@ -124,6 +63,13 @@ config BUSYBOX_FEATURE_VI_SEARCH
 	  Select this if you wish to be able to do search and replace in
 	  busybox vi.
 
+config BUSYBOX_FEATURE_VI_REGEX_SEARCH
+	bool "Enable regex in search and replace"
+	default n   # Uses GNU regex, which may be unavailable. FIXME
+	depends on BUSYBOX_FEATURE_VI_SEARCH
+	help
+	  Use extended regex search.
+
 config BUSYBOX_FEATURE_VI_USE_SIGNALS
 	bool "Catch signals"
 	default y
@@ -176,8 +122,8 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 	help
 	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
 	  this option makes vi perform a last-ditch effort to find it:
-	  vi positions cursor to 999,999 and asks terminal to report real
-	  cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
+	  position cursor to 999,999 and ask terminal to report real
+	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
 
 	  This is not clean but helps a lot on serial lines and such.
 
@@ -189,6 +135,66 @@ config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR
 	  This will make the cursor movement faster, but requires more memory
 	  and it makes the applet a tiny bit larger.
 
+config BUSYBOX_AWK
+	bool "awk"
+	default y
+	help
+	  Awk is used as a pattern scanning and processing language. This is
+	  the BusyBox implementation of that programming language.
+
+config BUSYBOX_FEATURE_AWK_LIBM
+	bool "Enable math functions (requires libm)"
+	default y
+	depends on BUSYBOX_AWK
+	help
+	  Enable math functions of the Awk programming language.
+	  NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_CMP
+	bool "cmp"
+	default y
+	help
+	  cmp is used to compare two files and returns the result
+	  to standard output.
+
+config BUSYBOX_DIFF
+	bool "diff"
+	default y
+	help
+	  diff compares two files or directories and outputs the
+	  differences between them in a form that can be given to
+	  the patch command.
+
+config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS
+	help
+	  Enable use of long options.
+
+config BUSYBOX_FEATURE_DIFF_DIR
+	bool "Enable directory support"
+	default y
+	depends on BUSYBOX_DIFF
+	help
+	  This option enables support for directory and subdirectory
+	  comparison.
+
+config BUSYBOX_ED
+	bool "ed"
+	default y
+	help
+	  The original 1970's Unix text editor, from the days of teletypes.
+	  Small, simple, evil. Part of SUSv3. If you're not already using
+	  this, you don't need it.
+
+config BUSYBOX_SED
+	bool "sed"
+	default y
+	help
+	  sed is used to perform text transformations on a file
+	  or input from a pipeline.
+
 config BUSYBOX_FEATURE_ALLOW_EXEC
 	bool "Allow vi and awk to execute shell commands"
 	default y
diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in
index e67d968be..c3dd5caef 100644
--- a/config/busybox/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -61,11 +61,11 @@ config BUSYBOX_FEATURE_FIND_XDEV
 	  This option allows find to restrict searches to a single filesystem.
 
 config BUSYBOX_FEATURE_FIND_MAXDEPTH
-	bool "Enable -maxdepth N"
+	bool "Enable -mindepth N and -maxdepth N"
 	default y
 	depends on BUSYBOX_FIND
 	help
-	  This option enables -maxdepth N option.
+	  This option enables -mindepth N and -maxdepth N option.
 
 config BUSYBOX_FEATURE_FIND_NEWER
 	bool "Enable -newer: compare file modification times"
@@ -73,7 +73,7 @@ config BUSYBOX_FEATURE_FIND_NEWER
 	depends on BUSYBOX_FIND
 	help
 	  Support the 'find -newer' option for finding any files which have
-	  a modified time that is more recent than the specified FILE.
+	  modification time that is more recent than the specified FILE.
 
 config BUSYBOX_FEATURE_FIND_INUM
 	bool "Enable -inum: inode number matching"
diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in
index 9399b156a..60918a89d 100644
--- a/config/busybox/init/Config.in
+++ b/config/busybox/init/Config.in
@@ -169,4 +169,16 @@ config BUSYBOX_MESG
 	  Mesg controls access to your terminal by others. It is typically
 	  used to allow or disallow other users to write to your terminal
 
+config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
+	bool "Enable writing to tty only by group, not by everybody"
+	default y
+	depends on BUSYBOX_MESG
+	help
+	  Usually, ttys are owned by group "tty", and "write" tool is
+	  setgid to this group. This way, "mesg y" only needs to enable
+	  "write by owning group" bit in tty mode.
+
+	  If you set this option to N, "mesg y" will enable writing
+	  by anybody at all. This is not recommended.
+
 endmenu
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 2c9cecbba..032d746b1 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -6,7 +6,20 @@
 
 menu "Busybox Library Tuning"
 
-
+config BUSYBOX_FEATURE_SYSTEMD
+	bool "Enable systemd support"
+	default y
+	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
+	help
+	  Support RTMIN[+n] and RTMAX[-n] signal names
+	  in kill, killall etc. This costs ~250 bytes.
 
 config BUSYBOX_PASSWORD_MINLEN
 	int "Minimum password length"
@@ -15,9 +28,9 @@ config BUSYBOX_PASSWORD_MINLEN
 	help
 	  Minimum allowable password length.
 
-config BUSYBOX_MD5_SIZE_VS_SPEED
+config BUSYBOX_MD5_SMALL
 	int "MD5: Trade bytes for speed (0:fast, 3:slow)"
-	default 2
+	default 1
 	range 0 3
 	help
 	  Trade binary size versus speed for the md5sum algorithm.
@@ -81,11 +94,12 @@ config BUSYBOX_FEATURE_EDITING_VI
 
 config BUSYBOX_FEATURE_EDITING_HISTORY
 	int "History size"
-	range 0 99999
+	# Don't allow way too big values here, code uses fixed "char *history[N]" struct member
+	range 0 9999
 	default 255
 	depends on BUSYBOX_FEATURE_EDITING
 	help
-	  Specify command history size.
+	  Specify command history size (0 - disable).
 
 config BUSYBOX_FEATURE_EDITING_SAVEHISTORY
 	bool "History saving"
@@ -94,6 +108,21 @@ config BUSYBOX_FEATURE_EDITING_SAVEHISTORY
 	help
 	  Enable history saving in shells.
 
+config BUSYBOX_FEATURE_EDITING_SAVE_ON_EXIT
+	bool "Save history on shell exit, not after every command"
+	default n
+	depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY
+	help
+	  Save history on shell exit, not after every command.
+
+config BUSYBOX_FEATURE_REVERSE_SEARCH
+	bool "Reverse history search"
+	default y
+	depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY
+	help
+	  Enable readline-like Ctrl-R combination for reverse history search.
+	  Increases code by about 0.5k.
+
 config BUSYBOX_FEATURE_TAB_COMPLETION
 	bool "Tab completion"
 	default y
@@ -136,7 +165,7 @@ config BUSYBOX_FEATURE_NON_POSIX_CP
 	  and create a regular file. This does not conform to POSIX,
 	  but prevents a symlink attack.
 	  Similarly, "cp file device" will not send file's data
-	  to the device.
+	  to the device. (To do that, use "cat file >device")
 
 config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
 	bool "Give more precise messages when copy fails (cp, mv etc)"
@@ -157,15 +186,34 @@ config BUSYBOX_FEATURE_COPYBUF_KB
 	range 1 1024
 	default 4
 	help
-	  Size of buffer used by cp, mv, install etc.
+	  Size of buffer used by cp, mv, install, wget etc.
 	  Buffers which are 4 kb or less will be allocated on stack.
 	  Bigger buffers will be allocated with mmap, with fallback to 4 kb
 	  stack buffer if mmap fails.
 
+config BUSYBOX_FEATURE_SKIP_ROOTFS
+	bool "Skip rootfs in mount table"
+	default y
+	help
+	  Ignore rootfs entry in mount table.
+
+	  In Linux, kernel has a special filesystem, rootfs, which is initially
+	  mounted on /. It contains initramfs data, if kernel is configured
+	  to have one. Usually, another file system is mounted over / early
+	  in boot process, and therefore most tools which manipulate
+	  mount table, such as df, will skip rootfs entry.
+
+	  However, some systems do not mount anything on /.
+	  If you need to configure busybox for one of these systems,
+	  you may find it useful to turn this option off to make df show
+	  initramfs statistics.
+
+	  Otherwise, choose Y.
+
 config BUSYBOX_MONOTONIC_SYSCALL
 	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
 	  time intervals (time, ping, traceroute etc need this).
diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
index d392f24ce..978ac3d2c 100644
--- a/config/busybox/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -192,7 +192,19 @@ config BUSYBOX_GETTY
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  getty lets you log in on a tty, it is normally invoked by init.
+	  getty lets you log in on a tty. It is normally invoked by init.
+
+	  Note that you can save a few bytes by disabling it and
+	  using login applet directly.
+	  If you need to reset tty attributes before calling login,
+	  this script approximates getty:
+
+	  exec </dev/$1 >/dev/$1 2>&1 || exit 1
+	  reset
+	  stty sane; stty ispeed 38400; stty ospeed 38400
+	  printf "%s login: " "`hostname`"
+	  read -r login
+	  exec /bin/login "$login"
 
 config BUSYBOX_LOGIN
 	bool "login"
@@ -204,6 +216,17 @@ config BUSYBOX_LOGIN
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
+config BUSYBOX_LOGIN_SESSION_AS_CHILD
+	bool "Run logged in session in a child process"
+	default y if BUSYBOX_PAM
+	depends on BUSYBOX_LOGIN
+	help
+	  Run the logged in session in a child process.  This allows
+	  login to clean up things such as utmp entries or PAM sessions
+	  when the login session is complete.  If you use PAM, you
+	  almost always would want this to be set to Y, else PAM session
+	  will not be cleaned up.
+
 config BUSYBOX_PAM
 	bool "Support for PAM (Pluggable Authentication Modules)"
 	default n
@@ -271,6 +294,13 @@ config BUSYBOX_CHPASSWD
 	  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_FEATURE_DEFAULT_PASSWD_ALGO
+	string "Default password encryption method (passwd -a, cryptpw -m parameter)"
+	default "des"
+	depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW
+	help
+	  Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+
 config BUSYBOX_SU
 	bool "su"
 	default y
diff --git a/config/busybox/mailutils/Config.in b/config/busybox/mailutils/Config.in
index 9566d9dec..1bcff4139 100644
--- a/config/busybox/mailutils/Config.in
+++ b/config/busybox/mailutils/Config.in
@@ -2,7 +2,6 @@
 menu "Mail Utilities"
 
 
-
 config BUSYBOX_MAKEMIME
 	bool "makemime"
 	default y
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index 5e81daca4..12bee0bdb 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -8,44 +8,153 @@ menu "Miscellaneous Utilities"
 
 config BUSYBOX_CONSPY
 	bool "conspy"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  A text-mode VNC like program for Linux virtual terminals.
 	  example:  conspy NUM      shared access to console num
 	  or        conspy -nd NUM  screenshot of console num
 	  or        conspy -cs NUM  poor man's GNU screen like
+config BUSYBOX_LESS
+	bool "less"
+	default y
+	help
+	  'less' is a pager, meaning that it displays text files. It possesses
+	  a wide array of features, and is an improvement over 'more'.
+
+config BUSYBOX_FEATURE_LESS_MAXLINES
+	int "Max number of input lines less will try to eat"
+	default 9999999
+	depends on BUSYBOX_LESS
+
+config BUSYBOX_FEATURE_LESS_BRACKETS
+	bool "Enable bracket searching"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  This option adds the capability to search for matching left and right
+	  brackets, facilitating programming.
+
+config BUSYBOX_FEATURE_LESS_FLAGS
+	bool "Enable -m/-M"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  The -M/-m flag enables a more sophisticated status line.
+
+config BUSYBOX_FEATURE_LESS_MARKS
+	bool "Enable marks"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  Marks enable positions in a file to be stored for easy reference.
+
+config BUSYBOX_FEATURE_LESS_REGEXP
+	bool "Enable regular expressions"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  Enable regular expressions, allowing complex file searches.
+
+config BUSYBOX_FEATURE_LESS_WINCH
+	bool "Enable automatic resizing on window size changes"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  Makes less track window size changes.
+
+config BUSYBOX_FEATURE_LESS_ASK_TERMINAL
+	bool "Use 'tell me cursor position' ESC sequence to measure window"
+	default y
+	depends on BUSYBOX_FEATURE_LESS_WINCH
+	help
+	  Makes less track window size changes.
+	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	  this option makes less perform a last-ditch effort to find it:
+	  position cursor to 999,999 and ask terminal to report real
+	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+
+	  This is not clean but helps a lot on serial lines and such.
+
+config BUSYBOX_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	default y
+	depends on BUSYBOX_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
+config BUSYBOX_FEATURE_LESS_LINENUMS
+	bool "Enable dynamic switching of line numbers"
+	default y
+	depends on BUSYBOX_FEATURE_LESS_DASHCMD
+	help
+	  Enables "-N" command.
 config BUSYBOX_NANDWRITE
 	bool "nandwrite"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Write to the specified MTD device, with bad blocks awareness
 
 config BUSYBOX_NANDDUMP
 	bool "nanddump"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Dump the content of raw NAND chip
+config BUSYBOX_SETSERIAL
+	bool "setserial"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Retrieve or set Linux serial port.
 config BUSYBOX_UBIATTACH
 	bool "ubiattach"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Attach MTD device to an UBI device.
 
 config BUSYBOX_UBIDETACH
 	bool "ubidetach"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Detach MTD device from an UBI device.
 
+config BUSYBOX_UBIMKVOL
+	bool "ubimkvol"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Create a UBI volume.
+
+config BUSYBOX_UBIRMVOL
+	bool "ubirmvol"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Delete a UBI volume.
+
+config BUSYBOX_UBIRSVOL
+	bool "ubirsvol"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Resize a UBI volume.
+
+config BUSYBOX_UBIUPDATEVOL
+	bool "ubiupdatevol"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Update a UBI volume.
+
 config BUSYBOX_ADJTIMEX
 	bool "adjtimex"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Adjtimex reads and optionally sets adjustment parameters for
 	  the Linux clock adjustment algorithm.
@@ -74,7 +183,7 @@ config BUSYBOX_FEATURE_COMPRESS_BBCONFIG
 config BUSYBOX_BEEP
 	bool "beep"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The beep applets beeps in a given freq/Hz.
 
@@ -229,7 +338,7 @@ config BUSYBOX_FEATURE_DC_LIBM
 config BUSYBOX_DEVFSD
 	bool "devfsd (obsolete)"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
 	  This is deprecated and should NOT be used anymore.
@@ -273,7 +382,7 @@ config BUSYBOX_DEVFSD_VERBOSE
 config BUSYBOX_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This is obsolete and should NOT be used anymore.
 	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
@@ -293,7 +402,7 @@ config BUSYBOX_DEVMEM
 config BUSYBOX_EJECT
 	bool "eject"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Used to eject cdroms. (defaults to /dev/cdrom)
 
@@ -308,7 +417,7 @@ config BUSYBOX_FEATURE_EJECT_SCSI
 config BUSYBOX_FBSPLASH
 	bool "fbsplash"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Shows splash image and progress bar on framebuffer device.
 	  Can be used during boot phase of an embedded device. ~2kb.
@@ -358,7 +467,7 @@ config BUSYBOX_FLASH_ERASEALL
 config BUSYBOX_IONICE
 	bool "ionice"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Set/set program io scheduling class and priority
 	  Requires kernel >= 2.6.13
@@ -395,76 +504,10 @@ config BUSYBOX_FEATURE_LAST_FANCY
 	  logged into the system (mimics sysvinit last). +900 bytes.
 endchoice
 
-config BUSYBOX_LESS
-	bool "less"
-	default y
-	help
-	  'less' is a pager, meaning that it displays text files. It possesses
-	  a wide array of features, and is an improvement over 'more'.
-
-config BUSYBOX_FEATURE_LESS_MAXLINES
-	int "Max number of input lines less will try to eat"
-	default 9999999
-	depends on BUSYBOX_LESS
-
-config BUSYBOX_FEATURE_LESS_BRACKETS
-	bool "Enable bracket searching"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  This option adds the capability to search for matching left and right
-	  brackets, facilitating programming.
-
-config BUSYBOX_FEATURE_LESS_FLAGS
-	bool "Enable extra flags"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  The extra flags provided do the following:
-
-	  The -M flag enables a more sophisticated status line.
-	  The -m flag enables a simpler status line with a percentage.
-
-config BUSYBOX_FEATURE_LESS_MARKS
-	bool "Enable marks"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  Marks enable positions in a file to be stored for easy reference.
-
-config BUSYBOX_FEATURE_LESS_REGEXP
-	bool "Enable regular expressions"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  Enable regular expressions, allowing complex file searches.
-
-config BUSYBOX_FEATURE_LESS_WINCH
-	bool "Enable automatic resizing on window size changes"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  Makes less track window size changes.
-
-config BUSYBOX_FEATURE_LESS_DASHCMD
-	bool "Enable flag changes ('-' command)"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
-
-config BUSYBOX_FEATURE_LESS_LINENUMS
-	bool "Enable dynamic switching of line numbers"
-	default y
-	depends on BUSYBOX_FEATURE_LESS_DASHCMD
-	help
-	  Enables "-N" command.
-
 config BUSYBOX_HDPARM
 	bool "hdparm"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
 	  drives. Adds about 13k (or around 30k if you enable the
@@ -581,7 +624,7 @@ config BUSYBOX_MT
 config BUSYBOX_RAIDAUTORUN
 	bool "raidautorun"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  raidautorun tells the kernel md driver to
 	  search and start RAID arrays.
@@ -589,7 +632,8 @@ config BUSYBOX_RAIDAUTORUN
 config BUSYBOX_READAHEAD
 	bool "readahead"
 	default y
-	depends on BUSYBOX_LFS && BUSYBOX_PLATFORM_LINUX
+	depends on BUSYBOX_LFS
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Preload the files listed on the command line into RAM cache so that
 	  subsequent reads on these files will not block on disk I/O.
@@ -606,7 +650,7 @@ config BUSYBOX_READAHEAD
 config BUSYBOX_RFKILL
 	bool "rfkill"
 	default n  # doesn't build on Ubuntu 9.04
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Enable/disable wireless devices.
 
@@ -618,6 +662,7 @@ config BUSYBOX_RFKILL
 config BUSYBOX_RUNLEVEL
 	bool "runlevel"
 	default y
+	depends on BUSYBOX_FEATURE_UTMP
 	help
 	  find the current and previous system runlevel.
 
@@ -627,7 +672,7 @@ config BUSYBOX_RUNLEVEL
 config BUSYBOX_RX
 	bool "rx"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Receive files using the Xmodem protocol.
 
@@ -693,13 +738,14 @@ config BUSYBOX_VOLNAME
 config BUSYBOX_WALL
 	bool "wall"
 	default y
+	depends on BUSYBOX_FEATURE_UTMP
 	help
 	  Write a message to all users that are logged in.
 
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The watchdog utility is used with hardware or software watchdog
 	  device drivers. It opens the specified watchdog device special file
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index 6f2aa9f6a..7f2b355a2 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -5,17 +5,18 @@
 #
 
 menu "Linux Module Utilities"
-	depends on BUSYBOX_PLATFORM_LINUX
 
 config BUSYBOX_MODINFO
 	bool "modinfo"
 	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Show information about a Linux Kernel module
 
 config BUSYBOX_MODPROBE_SMALL
 	bool "Simplified modutils"
 	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Simplified modutils.
 
@@ -50,6 +51,7 @@ config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 	bool "Accept module options on modprobe command line"
 	default y
 	depends on BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Allow insmod and modprobe take module options from command line.
 
@@ -64,6 +66,7 @@ config BUSYBOX_INSMOD
 	bool "insmod"
 	default n
 	depends on !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  insmod is used to load specified modules in the running kernel.
 
@@ -71,6 +74,7 @@ config BUSYBOX_RMMOD
 	bool "rmmod"
 	default n
 	depends on !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  rmmod is used to unload specified modules from the kernel.
 
@@ -78,6 +82,7 @@ config BUSYBOX_LSMOD
 	bool "lsmod"
 	default n
 	depends on !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  lsmod is used to display a list of loaded modules.
 
@@ -85,6 +90,7 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool "Pretty output"
 	default n
 	depends on BUSYBOX_LSMOD
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This option makes output format of lsmod adjusted to
 	  the format of module-init-tools for Linux kernel 2.6.
@@ -94,6 +100,7 @@ config BUSYBOX_MODPROBE
 	bool "modprobe"
 	default n
 	depends on !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Handle the loading of modules, and their dependencies on a high
 	  level.
@@ -102,6 +109,7 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST
 	bool "Blacklist support"
 	default n
 	depends on BUSYBOX_MODPROBE
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Say 'y' here to enable support for the 'blacklist' command in
 	  modprobe.conf. This prevents the alias resolver to resolve
@@ -113,6 +121,7 @@ config BUSYBOX_DEPMOD
 	bool "depmod"
 	default n
 	depends on !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  depmod generates modules.dep (and potentially modules.alias
 	  and modules.symbols) that contain dependency information
@@ -124,6 +133,7 @@ config BUSYBOX_FEATURE_2_4_MODULES
 	bool "Support version 2.2/2.4 Linux kernels"
 	default n
 	depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Support module loading for 2.2.x and 2.4.x Linux kernels.
 	  This increases size considerably. Say N unless you plan
@@ -133,6 +143,7 @@ config BUSYBOX_FEATURE_INSMOD_TRY_MMAP
 	bool "Try to load module from a mmap'ed area"
 	default n
 	depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This option causes module loading code to try to mmap
 	  module first. If it does not work (for example,
@@ -149,6 +160,7 @@ config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING
 	bool "Enable module version checking"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Support checking of versions for modules. This is used to
 	  ensure that the kernel and module are made for each other.
@@ -157,6 +169,7 @@ config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	bool "Add module symbols to kernel symbol table"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  By adding module symbols to the kernel symbol table, Oops messages
 	  occuring within kernel modules can be properly debugged. By enabling
@@ -168,6 +181,7 @@ config BUSYBOX_FEATURE_INSMOD_LOADINKMEM
 	bool "In kernel memory optimization (uClinux only)"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE)
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This is a special uClinux only memory optimization that lets insmod
 	  load the specified kernel module directly into kernel space, reducing
@@ -178,6 +192,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP
 	bool "Enable insmod load map (-m) option"
 	default n
 	depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Enabling this, one would be able to get a load map
 	  output on stdout. This makes kernel module debugging
@@ -189,6 +204,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL
 	bool "Symbols in load map"
 	default y
 	depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Without this option, -m will only output section
 	  load map. With this option, -m will also output
@@ -198,6 +214,7 @@ config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
 	bool "Support tainted module checking with new kernels"
 	default y
 	depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Support checking for tainted modules. These are usually binary
 	  only modules that will make the linux-kernel list ignore your
@@ -208,6 +225,7 @@ config BUSYBOX_FEATURE_MODUTILS_ALIAS
 	bool "Support for module.aliases file"
 	default y
 	depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Generate and parse modules.alias containing aliases for bus
 	  identifiers:
@@ -224,6 +242,7 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS
 	bool "Support for module.symbols file"
 	default y
 	depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Generate and parse modules.symbols containing aliases for
 	  symbol_request() kernel calls, such as:
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index c1d414821..f62356774 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -6,6 +6,35 @@
 
 menu "Networking Utilities"
 
+config BUSYBOX_NAMEIF
+	bool "nameif"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_FEATURE_SYSLOG
+	help
+	  nameif is used to rename network interface by its MAC address.
+	  Renamed interfaces MUST be in the down state.
+	  It is possible to use a file (default: /etc/mactab)
+	  with list of new interface names and MACs.
+	  Maximum interface name length: IFNAMSIZ = 16
+	  File fields are separated by space or tab.
+	  File format:
+	  # Comment
+	  new_interface_name    XX:XX:XX:XX:XX:XX
+
+config BUSYBOX_FEATURE_NAMEIF_EXTENDED
+	bool "Extended nameif"
+	default y
+	depends on BUSYBOX_NAMEIF
+	help
+	  This extends the nameif syntax to support the bus_info, driver,
+	  phyaddr selectors. The syntax is compatible to the normal nameif.
+	  File format:
+	    new_interface_name  driver=asix bus=usb-0000:00:08.2-3
+	    new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
+	    new_interface_name  phy_address=2 00:80:C8:38:91:B5
+	    new_interface_name  mac=00:80:C8:38:91:B5
+	    new_interface_name  00:80:C8:38:91:B5
 config BUSYBOX_NBDCLIENT
 	bool "nbd-client"
 	default y
@@ -43,6 +72,33 @@ config BUSYBOX_NC_110_COMPAT
 	  The code is about 2.5k bigger. It enables
 	  -s ADDR, -n, -u, -v, -o FILE, -z options, but loses
 	  busybox-specific extensions: -f FILE and -ll.
+config BUSYBOX_PING
+	bool "ping"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
+	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
+
+config BUSYBOX_PING6
+	bool "ping6"
+	default y
+	depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING
+	help
+	  This will give you a ping that can talk IPv6.
+
+config BUSYBOX_FEATURE_FANCY_PING
+	bool "Enable fancy ping output"
+	default y
+	depends on BUSYBOX_PING
+	help
+	  Make the output from the ping applet include statistics, and at the
+	  same time provide full support for ICMP packets.
+config BUSYBOX_WHOIS
+	bool "whois"
+	default y
+	help
+	  whois is a client for the whois directory service
 
 config BUSYBOX_FEATURE_IPV6
 	bool "Enable IPv6 support"
@@ -88,21 +144,21 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
 config BUSYBOX_ARP
 	bool "arp"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Manipulate the system ARP cache.
 
 config BUSYBOX_ARPING
 	bool "arping"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Ping hosts by ARP packets.
 
 config BUSYBOX_BRCTL
 	bool "brctl"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Manage ethernet bridges.
 	  Supports addbr/delbr and addif/delif.
@@ -135,7 +191,7 @@ config BUSYBOX_DNSD
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Send a magic packet to wake up sleeping machines.
 
@@ -236,14 +292,22 @@ config BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
 	help
 	  Utilizes password settings from /etc/httpd.conf for basic
 	  authentication on a per url basis.
+	  Example for httpd.conf file:
+	  /adm:toor:PaSsWd
 
 config BUSYBOX_FEATURE_HTTPD_AUTH_MD5
 	bool "Support MD5 crypted passwords for http Authentication"
 	default y
 	depends on BUSYBOX_FEATURE_HTTPD_BASIC_AUTH
 	help
-	  Enables basic per URL authentication from /etc/httpd.conf
-	  using md5 passwords.
+	  Enables encrypted passwords, and wildcard user/passwords
+	  in httpd.conf file.
+	  User '*' means 'any system user name is ok',
+	  password of '*' means 'use system password for this user'
+	  Examples:
+	  /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0
+	  /adm:root:*
+	  /wiki:*:*
 
 config BUSYBOX_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
@@ -260,8 +324,8 @@ config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 	help
 	  This option enables support for running scripts through an
 	  interpreter. Turn this on if you want PHP scripts to work
-	  properly. You need to supply an additional line in your httpd
-	  config file:
+	  properly. You need to supply an additional line in your
+	  httpd.conf file:
 	  *.php:/path/to/your/php
 
 config BUSYBOX_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
@@ -318,7 +382,7 @@ config BUSYBOX_FEATURE_HTTPD_GZIP
 config BUSYBOX_IFCONFIG
 	bool "ifconfig"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Ifconfig is used to configure the kernel-resident network interfaces.
 
@@ -366,7 +430,7 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
 config BUSYBOX_IFENSLAVE
 	bool "ifenslave"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Userspace application to bind several interfaces
 	  to a logical interface (use with kernel bonding driver).
@@ -374,7 +438,7 @@ config BUSYBOX_IFENSLAVE
 config BUSYBOX_IFPLUGD
 	bool "ifplugd"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Network interface plug detection daemon.
 
@@ -416,7 +480,8 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP
 config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
 	bool "Use busybox ip applet"
 	default y
-	depends on BUSYBOX_FEATURE_IFUPDOWN_IP && BUSYBOX_PLATFORM_LINUX
+	depends on BUSYBOX_FEATURE_IFUPDOWN_IP
+	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_IP
 	select BUSYBOX_FEATURE_IP_ADDRESS
 	select BUSYBOX_FEATURE_IP_LINK
@@ -535,7 +600,7 @@ config BUSYBOX_FEATURE_INETD_RPC
 config BUSYBOX_IP
 	bool "ip"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The "ip" applet is a TCP/IP interface configuration and routing
 	  utility. You generally don't need "ip" to use busybox with
@@ -648,39 +713,10 @@ config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS
 	help
 	  Support long options for the ipcalc applet.
 
-config BUSYBOX_NAMEIF
-	bool "nameif"
-	default y
-	depends on BUSYBOX_PLATFORM_LINUX
-	select BUSYBOX_FEATURE_SYSLOG
-	help
-	  nameif is used to rename network interface by its MAC address.
-	  Renamed interfaces MUST be in the down state.
-	  It is possible to use a file (default: /etc/mactab)
-	  with list of new interface names and MACs.
-	  Maximum interface name length: IFNAMSIZ = 16
-	  File fields are separated by space or tab.
-	  File format:
-	  # Comment
-	  new_interface_name    XX:XX:XX:XX:XX:XX
-
-config BUSYBOX_FEATURE_NAMEIF_EXTENDED
-	bool "Extended nameif"
-	default y
-	depends on BUSYBOX_NAMEIF
-	help
-	  This extends the nameif syntax to support the bus_info and driver
-	  checks. The syntax is compatible to the normal nameif.
-	  File format:
-	    new_interface_name  driver=asix bus=usb-0000:00:08.2-3
-	    new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5
-	    new_interface_name  mac=00:80:C8:38:91:B5
-	    new_interface_name  00:80:C8:38:91:B5
-
 config BUSYBOX_NETSTAT
 	bool "netstat"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  netstat prints information about the Linux networking subsystem.
 
@@ -709,7 +745,7 @@ config BUSYBOX_NSLOOKUP
 config BUSYBOX_NTPD
 	bool "ntpd"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The NTP client/server daemon.
 
@@ -721,29 +757,6 @@ config BUSYBOX_FEATURE_NTPD_SERVER
 	  Make ntpd usable as a NTP server. If you disable this option
 	  ntpd will be usable only as a NTP client.
 
-config BUSYBOX_PING
-	bool "ping"
-	default y
-	depends on BUSYBOX_PLATFORM_LINUX
-	help
-	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
-
-config BUSYBOX_PING6
-	bool "ping6"
-	default y
-	depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING
-	help
-	  This will give you a ping that can talk IPv6.
-
-config BUSYBOX_FEATURE_FANCY_PING
-	bool "Enable fancy ping output"
-	default y
-	depends on BUSYBOX_PING
-	help
-	  Make the output from the ping applet include statistics, and at the
-	  same time provide full support for ICMP packets.
-
 config BUSYBOX_PSCAN
 	bool "pscan"
 	default y
@@ -753,14 +766,14 @@ config BUSYBOX_PSCAN
 config BUSYBOX_ROUTE
 	bool "route"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Route displays or manipulates the kernel's IP routing tables.
 
 config BUSYBOX_SLATTACH
 	bool "slattach"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  slattach is a small utility to attach network interfaces to serial
 	  lines.
@@ -947,7 +960,7 @@ config BUSYBOX_TFTP_DEBUG
 config BUSYBOX_TRACEROUTE
 	bool "traceroute"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Utility to trace the route of IP packets.
 
@@ -984,7 +997,7 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
 config BUSYBOX_TUNCTL
 	bool "tunctl"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  tunctl creates or deletes tun devices.
 
@@ -1017,7 +1030,7 @@ config BUSYBOX_UDPSVD
 config BUSYBOX_VCONFIG
 	bool "vconfig"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Creates, removes, and configures VLAN interfaces
 
@@ -1064,7 +1077,7 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT
 config BUSYBOX_ZCIP
 	bool "zcip"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
 	  ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 23ecfb907..6ece73097 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -4,12 +4,16 @@
 # see scripts/kbuild/config-language.txt.
 #
 
-
+config BUSYBOX_UDHCPC6
+       bool "udhcp client for DHCPv6 (udhcpc6)"
+       default n  # not yet ready
+       help
+         udhcpc6 is a DHCPv6 client
 
 config BUSYBOX_UDHCPD
 	bool "udhcp server (udhcpd)"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  udhcpd is a DHCP server geared primarily toward embedded systems,
 	  while striving to be fully functional and RFC compliant.
@@ -40,7 +44,21 @@ config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY
 	  If selected, udhcpd will write a new file with leases every
 	  time a new lease has been accepted, thus eliminating the need
 	  to send SIGUSR1 for the initial writing or updating. Any timed
-	  rewriting remains undisturbed
+	  rewriting remains undisturbed.
+
+config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC
+	bool "Select IP address based on client MAC"
+	default n
+	depends on BUSYBOX_UDHCPD
+	help
+	  If selected, udhcpd will base its selection of IP address to offer
+	  on the client's hardware address. Otherwise udhcpd uses the next
+	  consecutive free address.
+
+	  This reduces the frequency of IP address changes for clients
+	  which let their lease expire, and makes consecutive DHCPOFFERS
+	  for the same client to (almost always) contain the same
+	  IP address.
 
 config BUSYBOX_DHCPD_LEASES_FILE
 	string "Absolute path to lease file"
@@ -53,7 +71,7 @@ config BUSYBOX_DHCPD_LEASES_FILE
 config BUSYBOX_UDHCPC
 	bool "udhcp client (udhcpc)"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  udhcpc is a DHCP client geared primarily toward embedded systems,
 	  while striving to be fully functional and RFC compliant.
@@ -73,7 +91,7 @@ config BUSYBOX_FEATURE_UDHCPC_ARPING
 
 config BUSYBOX_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
-	default y
+	default n
 	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
 	help
 	  At the cost of ~300 bytes, enables -P port option.
@@ -100,6 +118,14 @@ config BUSYBOX_FEATURE_UDHCP_RFC3397
 	  search lists via option 119, specified in RFC 3397,
 	  and SIP servers option 120, specified in RFC 3361.
 
+config BUSYBOX_FEATURE_UDHCP_8021Q
+	bool "Support for 802.1Q VLAN parameters"
+	default y
+	depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC
+	help
+	  If selected, both client and server will support passing of VLAN
+	  ID and priority via options 132 and 133 as per 802.1Q.
+
 config BUSYBOX_UDHCPC_DEFAULT_SCRIPT
 	string "Absolute path to config script"
 	default "/usr/share/udhcpc/default.script"
diff --git a/config/busybox/printutils/Config.in b/config/busybox/printutils/Config.in
index 6f26eb029..52cc1dbba 100644
--- a/config/busybox/printutils/Config.in
+++ b/config/busybox/printutils/Config.in
@@ -7,7 +7,6 @@
 menu "Print Utilities"
 
 
-
 config BUSYBOX_LPD
 	bool "lpd"
 	default y
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 5066e23b3..2e11bd0ef 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -11,11 +11,22 @@ config BUSYBOX_IOSTAT
 	default y
 	help
 	  Report CPU and I/O statistics
+config BUSYBOX_LSOF
+	bool "lsof"
+	default y
+	help
+	  Show open files in the format of:
+	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
 config BUSYBOX_MPSTAT
 	bool "mpstat"
 	default y
 	help
 	  Per-processor statistics
+config BUSYBOX_NMETER
+	bool "nmeter"
+	default y
+	help
+	  Prints selected system stats continuously, one line per update.
 config BUSYBOX_PMAP
        bool "pmap"
        default y
@@ -26,17 +37,42 @@ config BUSYBOX_POWERTOP
 	default y
 	help
 	  Analyze power consumption on Intel-based laptops
+config BUSYBOX_PSTREE
+	bool "pstree"
+	default y
+	help
+	  Display a tree of processes.
+config BUSYBOX_PWDX
+	bool "pwdx"
+	default y
+	help
+	  Report current working directory of a process
 config BUSYBOX_SMEMCAP
 	bool "smemcap"
 	default y
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+config BUSYBOX_UPTIME
+	bool "uptime"
+	default y
+	select BUSYBOX_PLATFORM_LINUX #sysinfo()
+	help
+	  uptime gives a one line display of the current time, how long
+	  the system has been running, how many users are currently logged
+	  on, and the system load averages for the past 1, 5, and 15 minutes.
+
+config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT
+	bool "Support for showing the number of users"
+	default y
+	depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP
+	help
+	  Makes uptime display the number of users currently logged on.
 
 config BUSYBOX_FREE
 	bool "free"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX #sysinfo()
+	select BUSYBOX_PLATFORM_LINUX #sysinfo()
 	help
 	  free displays the total amount of free and used physical and swap
 	  memory in the system, as well as the buffers used by the kernel.
@@ -72,12 +108,6 @@ config BUSYBOX_KILLALL5
 	default y
 	depends on BUSYBOX_KILL
 
-config BUSYBOX_NMETER
-	bool "nmeter"
-	default y
-	help
-	  Prints selected system stats continuously, one line per update.
-
 config BUSYBOX_PGREP
 	bool "pgrep"
 	default y
@@ -122,16 +152,25 @@ config BUSYBOX_PS
 config BUSYBOX_FEATURE_PS_WIDE
 	bool "Enable wide output option (-w)"
 	default y
-	depends on BUSYBOX_PS
+	depends on BUSYBOX_PS && !BUSYBOX_DESKTOP
 	help
 	  Support argument 'w' for wide output.
 	  If given once, 132 chars are printed, and if given more
 	  than once, the length is unlimited.
 
+config BUSYBOX_FEATURE_PS_LONG
+	bool "Enable long output option (-l)"
+	default y
+	depends on BUSYBOX_PS && !BUSYBOX_DESKTOP
+	help
+	  Support argument 'l' for long output.
+	  Adds fields PPID, RSS, START, TIME & TTY
+
 config BUSYBOX_FEATURE_PS_TIME
 	bool "Enable time and elapsed time output"
 	default y
-	depends on BUSYBOX_PS && BUSYBOX_DESKTOP && BUSYBOX_PLATFORM_LINUX #sysinfo()
+	depends on BUSYBOX_PS && BUSYBOX_DESKTOP
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Support -o time and -o etime output specifiers.
 
@@ -218,20 +257,12 @@ config BUSYBOX_FEATURE_TOPMEM
 	  Enable 's' in top (gives lots of memory info).
 
 config BUSYBOX_FEATURE_SHOW_THREADS
-	bool "Support for showing threads in ps/top"
+	bool "Support for showing threads in ps/pstree/top"
 	default y
-	depends on BUSYBOX_PS || BUSYBOX_TOP
+	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
 	help
-	  Enables ps -T option and 'h' command in top
-
-config BUSYBOX_UPTIME
-	bool "uptime"
-	default y
-	depends on BUSYBOX_PLATFORM_LINUX #sysinfo()
-	help
-	  uptime gives a one line display of the current time, how long
-	  the system has been running, how many users are currently logged
-	  on, and the system load averages for the past 1, 5, and 15 minutes.
+	  Enables the ps -T option, showing of threads in pstree,
+	  and 'h' command in top.
 
 config BUSYBOX_WATCH
 	bool "watch"
diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in
index a0dd87484..e993a1379 100644
--- a/config/busybox/runit/Config.in
+++ b/config/busybox/runit/Config.in
@@ -7,7 +7,6 @@
 menu "Runit Utilities"
 
 
-
 config BUSYBOX_RUNSV
 	bool "runsv"
 	default y
diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in
index 37a5e41fd..8818ef5a1 100644
--- a/config/busybox/selinux/Config.in
+++ b/config/busybox/selinux/Config.in
@@ -8,7 +8,6 @@ menu "SELinux Utilities"
 	depends on BUSYBOX_SELINUX
 
 
-
 config BUSYBOX_CHCON
 	bool "chcon"
 	default n
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index ba6a76681..96eb7bc4e 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -24,6 +24,13 @@ config BUSYBOX_ASH_BASH_COMPAT
 	help
 	  Enable bash-compatible extensions.
 
+config BUSYBOX_ASH_IDLE_TIMEOUT
+	bool "Idle timeout variable"
+	default n
+	depends on BUSYBOX_ASH
+	help
+	  Enables bash-like auto-logout after $TMOUT seconds of idle time.
+
 config BUSYBOX_ASH_JOB_CONTROL
 	bool "Job control"
 	default y
@@ -32,7 +39,7 @@ config BUSYBOX_ASH_JOB_CONTROL
 	  Enable job control in the ash shell.
 
 config BUSYBOX_ASH_ALIAS
-	bool "alias support"
+	bool "Alias support"
 	default y
 	depends on BUSYBOX_ASH
 	help
@@ -43,28 +50,28 @@ config BUSYBOX_ASH_GETOPTS
 	default y
 	depends on BUSYBOX_ASH
 	help
-	  Enable getopts builtin in the ash shell.
+	  Enable support for getopts builtin in ash.
 
 config BUSYBOX_ASH_BUILTIN_ECHO
 	bool "Builtin version of 'echo'"
 	default y
 	depends on BUSYBOX_ASH
 	help
-	  Enable support for echo, builtin to ash.
+	  Enable support for echo builtin in ash.
 
 config BUSYBOX_ASH_BUILTIN_PRINTF
 	bool "Builtin version of 'printf'"
 	default y
 	depends on BUSYBOX_ASH
 	help
-	  Enable support for printf, builtin to ash.
+	  Enable support for printf builtin in ash.
 
 config BUSYBOX_ASH_BUILTIN_TEST
 	bool "Builtin version of 'test'"
 	default y
 	depends on BUSYBOX_ASH
 	help
-	  Enable support for test, builtin to ash.
+	  Enable support for test builtin in ash.
 
 config BUSYBOX_ASH_CMDCMD
 	bool "'command' command to override shell builtins"
@@ -80,7 +87,7 @@ config BUSYBOX_ASH_MAIL
 	default n
 	depends on BUSYBOX_ASH
 	help
-	  Enable "check for new mail" in the ash shell.
+	  Enable "check for new mail" function in the ash shell.
 
 config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size instead of speed"
@@ -113,18 +120,22 @@ config BUSYBOX_CTTYHACK
 	bool "cttyhack"
 	default y
 	help
-	  One common problem reported on the mailing list is "can't access tty;
-	  job control turned off" error message which typically appears when
-	  one tries to use shell with stdin/stdout opened to /dev/console.
+	  One common problem reported on the mailing list is the "can't
+	  access tty; job control turned off" error message, which typically
+	  appears when one tries to use a shell with stdin/stdout on
+	  /dev/console.
 	  This device is special - it cannot be a controlling tty.
 
-	  Proper solution is to use correct device instead of /dev/console.
+	  The proper solution is to use the correct device instead of
+	  /dev/console.
 
-	  cttyhack provides "quick and dirty" solution to this problem.
+	  cttyhack provides a "quick and dirty" solution to this problem.
 	  It analyzes stdin with various ioctls, trying to determine whether
 	  it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line).
-	  If it detects one, it closes stdin/out/err and reopens that device.
-	  Then it executes given program. Opening the device will make
+	  On Linux it also checks sysfs for a pointer to the active console.
+	  If cttyhack is able to find the real console device, it closes
+	  stdin/out/err and reopens that device.
+	  Then it executes the given program. Opening the device will make
 	  that device a controlling tty. This may require cttyhack
 	  to be a session leader.
 
@@ -145,6 +156,9 @@ config BUSYBOX_CTTYHACK
 
 	  # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
 
+	  Starting getty on a controlling tty from a shell script:
+
+	  # getty 115200 $(cttyhack)
 config BUSYBOX_HUSH
 	bool "hush"
 	default y
@@ -281,6 +295,7 @@ config BUSYBOX_MSH
 	  msh is deprecated and will be removed, please migrate to hush.
 
 
+
 choice
 	prompt "Choose which shell is aliased to 'sh' name"
 	default BUSYBOX_FEATURE_SH_IS_ASH
@@ -396,9 +411,9 @@ config BUSYBOX_FEATURE_SH_NOFORK
 	default n
 	depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS
 	help
-	  This option causes busybox shells [currently only ash]
-	  to not execute typical fork/exec/wait sequence, but call <applet>_main
-	  directly, if possible. (Sometimes it is not possible: for example,
+	  This option causes busybox shells to not execute typical
+	  fork/exec/wait sequence, but call <applet>_main directly,
+	  if possible. (BUSYBOX_Sometimes it is not possible: for example,
 	  this is not possible in pipes).
 
 	  This will be done only for some applets (those which are marked
@@ -406,6 +421,17 @@ config BUSYBOX_FEATURE_SH_NOFORK
 
 	  This may significantly speed up some shell scripts.
 
-	  This feature is relatively new. Use with care.
+	  This feature is relatively new. Use with care. Report bugs
+	  to project mailing list.
+
+config BUSYBOX_FEATURE_SH_HISTFILESIZE
+	bool "Use $HISTFILESIZE"
+	default y
+	depends on BUSYBOX_HUSH || BUSYBOX_ASH
+	help
+	  This option makes busybox shells to use $HISTFILESIZE variable
+	  to set shell history size. Note that its max value is capped
+	  by "History size" setting in library tuning section.
+
 
 endmenu
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 4f5541d44..13c9dce2c 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -7,7 +7,6 @@
 menu "System Logging Utilities"
 
 
-
 config BUSYBOX_SYSLOGD
 	bool "syslogd"
 	default y
@@ -53,6 +52,13 @@ config BUSYBOX_FEATURE_SYSLOGD_DUP
 	  Option -D instructs syslogd to drop consecutive messages
 	  which are totally the same.
 
+config BUSYBOX_FEATURE_SYSLOGD_CFG
+	bool "Support syslog.conf"
+	default y
+	depends on BUSYBOX_SYSLOGD
+	help
+	  Supports restricted syslogd config. See docs/syslog.conf.txt
+
 config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE
 	int "Read buffer size in bytes"
 	default 256
@@ -120,7 +126,8 @@ config BUSYBOX_KLOGD
 config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y
-	depends on BUSYBOX_KLOGD && BUSYBOX_PLATFORM_LINUX
+	depends on BUSYBOX_KLOGD
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The klogd applet supports two interfaces for reading
 	  kernel messages. Linux provides the klogctl() interface
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index 99dbca504..e865b6b0c 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -11,6 +11,63 @@ config BUSYBOX_BLOCKDEV
 	default y
 	help
 	  Performs some ioctls with block devices.
+config BUSYBOX_MDEV
+	bool "mdev"
+	default y
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  mdev is a mini-udev implementation for dynamically creating device
+	  nodes in the /dev directory.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_FEATURE_MDEV_CONF
+	bool "Support /etc/mdev.conf"
+	default y
+	depends on BUSYBOX_MDEV
+	help
+	  Add support for the mdev config file to control ownership and
+	  permissions of the device nodes.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_FEATURE_MDEV_RENAME
+	bool "Support subdirs/symlinks"
+	default y
+	depends on BUSYBOX_FEATURE_MDEV_CONF
+	help
+	  Add support for renaming devices and creating symlinks.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP
+	bool "Support regular expressions substitutions when renaming device"
+	default y
+	depends on BUSYBOX_FEATURE_MDEV_RENAME
+	help
+	  Add support for regular expressions substitutions when renaming
+	  device.
+
+config BUSYBOX_FEATURE_MDEV_EXEC
+	bool "Support command execution at device addition/removal"
+	default y
+	depends on BUSYBOX_FEATURE_MDEV_CONF
+	help
+	  This adds support for an optional field to /etc/mdev.conf for
+	  executing commands when devices are created/removed.
+
+	  For more information, please see docs/mdev.txt
+
+config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
+	bool "Support loading of firmwares"
+	default y
+	depends on BUSYBOX_MDEV
+	help
+	  Some devices need to load firmware before they can be usable.
+
+	  These devices will request userspace look up the files in
+	  /lib/firmware/ and if it exists, send it to the kernel for
+	  loading into the hardware.
 config BUSYBOX_REV
 	bool "rev"
 	default y
@@ -20,7 +77,7 @@ config BUSYBOX_REV
 config BUSYBOX_ACPID
 	bool "acpid"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  acpid listens to ACPI events coming either in textual form from
 	  /proc/acpi/event (though it is marked deprecated it is still widely
@@ -43,17 +100,24 @@ config BUSYBOX_FEATURE_ACPID_COMPAT
 config BUSYBOX_BLKID
 	bool "blkid"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
 	  Lists labels and UUIDs of all filesystems.
 	  WARNING:
 	  With all submodules selected, it will add ~8k to busybox.
 
+config BUSYBOX_FEATURE_BLKID_TYPE
+	bool "Print filesystem type"
+	default n
+	depends on BUSYBOX_BLKID
+	help
+	  Show TYPE="filesystem type"
+
 config BUSYBOX_DMESG
 	bool "dmesg"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  dmesg is used to examine or control the kernel ring buffer. When the
 	  Linux kernel prints messages to the system log, they are stored in
@@ -87,7 +151,7 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
 config BUSYBOX_FBSET
 	bool "fbset"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  fbset is used to show or change the settings of a Linux frame buffer
 	  device. The frame buffer device provides a simple and unique
@@ -116,7 +180,7 @@ config BUSYBOX_FEATURE_FBSET_READMODE
 config BUSYBOX_FDFLUSH
 	bool "fdflush"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  fdflush is only needed when changing media on slightly-broken
 	  removable media drives. It is used to make Linux believe that a
@@ -129,14 +193,14 @@ config BUSYBOX_FDFLUSH
 config BUSYBOX_FDFORMAT
 	bool "fdformat"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  fdformat is used to low-level format a floppy disk.
 
 config BUSYBOX_FDISK
 	bool "fdisk"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The fdisk utility is used to divide hard disks into one or more
 	  logical disks, which are generally called partitions. This utility
@@ -147,6 +211,7 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
 	bool "Support over 4GB disks"
 	default y
 	depends on BUSYBOX_FDISK
+	depends on !BUSYBOX_LFS   # with LFS no special code is needed
 	help
 	  Enable this option to support large disks > 4GB.
 
@@ -212,7 +277,7 @@ config BUSYBOX_FEATURE_FDISK_ADVANCED
 config BUSYBOX_FINDFS
 	bool "findfs"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
 	  Prints the name of a filesystem with given label or UUID.
@@ -228,7 +293,7 @@ config BUSYBOX_FLOCK
 config BUSYBOX_FREERAMDISK
 	bool "freeramdisk"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Linux allows you to create ramdisks. This utility allows you to
 	  delete them and completely free all memory that was used for the
@@ -251,14 +316,14 @@ config BUSYBOX_FSCK_MINIX
 config BUSYBOX_MKFS_EXT2
 	bool "mkfs_ext2"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Utility to create EXT2 filesystems.
 
 config BUSYBOX_MKFS_MINIX
 	bool "mkfs_minix"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The minix filesystem is a nice, small, compact, read-write filesystem
 	  with little overhead. If you wish to be able to create minix
@@ -276,7 +341,7 @@ config BUSYBOX_FEATURE_MINIX2
 config BUSYBOX_MKFS_REISER
 	bool "mkfs_reiser"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Utility to create ReiserFS filesystems.
 	  Note: this applet needs a lot of testing and polishing.
@@ -284,7 +349,7 @@ config BUSYBOX_MKFS_REISER
 config BUSYBOX_MKFS_VFAT
 	bool "mkfs_vfat"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Utility to create FAT32 filesystems.
 
@@ -333,7 +398,7 @@ config BUSYBOX_HD
 config BUSYBOX_HWCLOCK
 	bool "hwclock"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The hwclock utility is used to read and set the hardware clock
 	  on a system. This is primarily used to set the current time on
@@ -372,7 +437,7 @@ config BUSYBOX_IPCRM
 config BUSYBOX_IPCS
 	bool "ipcs"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The ipcs utility is used to provide information on the currently
 	  allocated System V interprocess (IPC) objects in the system.
@@ -380,7 +445,7 @@ config BUSYBOX_IPCS
 config BUSYBOX_LOSETUP
 	bool "losetup"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  losetup is used to associate or detach a loop device with a regular
 	  file or block device, and to query the status of a loop device. This
@@ -389,7 +454,7 @@ config BUSYBOX_LOSETUP
 config BUSYBOX_LSPCI
 	bool "lspci"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  lspci is a utility for displaying information about PCI buses in the
 	  system and devices connected to them.
@@ -399,71 +464,13 @@ config BUSYBOX_LSPCI
 config BUSYBOX_LSUSB
 	bool "lsusb"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  lsusb is a utility for displaying information about USB buses in the
 	  system and devices connected to them.
 
 	  This version uses sysfs (/sys/bus/usb/devices) only.
 
-config BUSYBOX_MDEV
-	bool "mdev"
-	default y
-	depends on BUSYBOX_PLATFORM_LINUX
-	help
-	  mdev is a mini-udev implementation for dynamically creating device
-	  nodes in the /dev directory.
-
-	  For more information, please see docs/mdev.txt
-
-config BUSYBOX_FEATURE_MDEV_CONF
-	bool "Support /etc/mdev.conf"
-	default y
-	depends on BUSYBOX_MDEV
-	help
-	  Add support for the mdev config file to control ownership and
-	  permissions of the device nodes.
-
-	  For more information, please see docs/mdev.txt
-
-config BUSYBOX_FEATURE_MDEV_RENAME
-	bool "Support subdirs/symlinks"
-	default y
-	depends on BUSYBOX_FEATURE_MDEV_CONF
-	help
-	  Add support for renaming devices and creating symlinks.
-
-	  For more information, please see docs/mdev.txt
-
-config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP
-	bool "Support regular expressions substitutions when renaming device"
-	default y
-	depends on BUSYBOX_FEATURE_MDEV_RENAME
-	help
-	  Add support for regular expressions substitutions when renaming
-	  device.
-
-config BUSYBOX_FEATURE_MDEV_EXEC
-	bool "Support command execution at device addition/removal"
-	default y
-	depends on BUSYBOX_FEATURE_MDEV_CONF
-	help
-	  This adds support for an optional field to /etc/mdev.conf for
-	  executing commands when devices are created/removed.
-
-	  For more information, please see docs/mdev.txt
-
-config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
-	bool "Support loading of firmwares"
-	default y
-	depends on BUSYBOX_MDEV
-	help
-	  Some devices need to load firmware before they can be usable.
-
-	  These devices will request userspace look up the files in
-	  /lib/firmware/ and if it exists, send it to the kernel for
-	  loading into the hardware.
-
 config BUSYBOX_MKSWAP
 	bool "mkswap"
 	default y
@@ -497,7 +504,7 @@ config BUSYBOX_MORE
 config BUSYBOX_MOUNT
 	bool "mount"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  All files and filesystems in Unix are arranged into one big directory
 	  tree. The 'mount' utility is used to graft a filesystem onto a
@@ -545,13 +552,18 @@ config BUSYBOX_FEATURE_MOUNT_LABEL
 	  This also enables label or uuid support for swapon.
 
 config BUSYBOX_FEATURE_MOUNT_NFS
-	bool "Support mounting NFS file systems"
-	default y
+	bool "Support mounting NFS file systems on Linux < 2.6.23"
+	default n
 	depends on BUSYBOX_MOUNT
 	select BUSYBOX_FEATURE_HAVE_RPC
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  Enable mounting of NFS file systems.
+	  Enable mounting of NFS file systems on Linux kernels prior
+	  to version 2.6.23. Note that in this case mounting of NFS
+	  over IPv6 will not be possible.
+
+	  Note that this option links in RPC support from libc,
+	  which is rather large (~10 kbytes on uclibc).
 
 config BUSYBOX_FEATURE_MOUNT_CIFS
 	bool "Support mounting CIFS/SMB file systems"
@@ -580,7 +592,7 @@ config BUSYBOX_FEATURE_MOUNT_FSTAB
 config BUSYBOX_PIVOT_ROOT
 	bool "pivot_root"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The pivot_root utility swaps the mount points for the root filesystem
 	  with some other mounted filesystem. This allows you to do all sorts
@@ -608,14 +620,14 @@ config BUSYBOX_RDEV
 config BUSYBOX_READPROFILE
 	bool "readprofile"
 	default y
-	#depends on PLATFORM_LINUX
+	#select PLATFORM_LINUX
 	help
 	  This allows you to parse /proc/profile for basic profiling.
 
 config BUSYBOX_RTCWAKE
 	bool "rtcwake"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Enter a system sleep state until specified wakeup time.
 
@@ -635,7 +647,7 @@ config BUSYBOX_SCRIPTREPLAY
 config BUSYBOX_SETARCH
 	bool "setarch"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The linux32 utility is used to create a 32bit environment for the
 	  specified program (usually a shell). It only makes sense to have
@@ -645,7 +657,7 @@ config BUSYBOX_SETARCH
 config BUSYBOX_SWAPONOFF
 	bool "swaponoff"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This option enables both the 'swapon' and the 'swapoff' utilities.
 	  Once you have created some swap space using 'mkswap', you also need
@@ -664,7 +676,7 @@ config BUSYBOX_FEATURE_SWAPON_PRI
 config BUSYBOX_SWITCH_ROOT
 	bool "switch_root"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The switch_root utility is used from initramfs to select a new
 	  root device. Under initramfs, you have to use this instead of
@@ -684,7 +696,7 @@ config BUSYBOX_SWITCH_ROOT
 config BUSYBOX_UMOUNT
 	bool "umount"
 	default y
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  When you want to remove a mounted filesystem from its current mount
 	  point, for example when you are shutting down the system, the