Busybox-1.9.0

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7709 33e552b5-05e3-0310-8538-816dae2090ed

28 files changed, 1333 insertions, 494 deletions

diff --git a/config/busybox-1.4.2/Extract b/config/busybox-1.4.2/Extract
deleted file mode 100755
index 0655850ff..000000000
--- a/config/busybox-1.4.2/Extract
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# find out which version of busybox we have; this is taken from the name
-# of this directory
-
-bb_version=$(echo $(basename $(pwd)) | sed -e "s/busybox-//g")
-bb_path=/tmp/busybox-${bb_version}
-
-#
-# first extract all configuration files from the original source tree
-#
-
-for cfgfile in $(find ${bb_path} -name "Config.in"); do
-	new_cfgfile=$(echo $cfgfile | sed -e "s~${bb_path}~\.~g")
-	dir=$(echo $new_cfgfile | sed -e "s~Config\.in~~g")
-	mkdir -p $dir
-	../../scripts/mkprefix -v -p BB_CONFIG_ < $cfgfile > $new_cfgfile
-done
-
-#
-# fix some entries 
-# 
-
-echo "---------------------------------------------------------------------\n";
-echo "Fixing some stuff...\n";
-echo "---------------------------------------------------------------------\n";
-
-for cfgfile in $(find . -name "Config.in"); do
-
-	sed -i -e "s/^source \(.*\)/source config\/busybox-${bb_version}\/\1/g" $cfgfile
-	sed -i -e "s/^mainmenu \(.*$\)/# mainmenu \1/g" $cfgfile
-	sed -i -e "s/^\(menu .*\)$/\1\n  depends on BUSYBOX/g" $cfgfile
-
-done
-
diff --git a/config/busybox-1.4.2/libbb/Config.in b/config/busybox-1.4.2/libbb/Config.in
deleted file mode 100644
index 2cd2cc623..000000000
--- a/config/busybox-1.4.2/libbb/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-menu "Busybox Library Tuning"
-  depends on BUSYBOX
-
-config BB_CONFIG_PASSWORD_MINLEN
-	int "Minimum password length"
-	default 6
-	range 5 32
-	help
-	  Minimum allowable password length.
-
-config BB_CONFIG_MD5_SIZE_VS_SPEED
-	int "MD5: Trade Bytes for Speed"
-	default 2
-	range 0 3
-	help
-	  Trade binary size versus speed for the md5sum algorithm.
-	  Approximate values running uClibc and hashing
-	  linux-2.4.4.tar.bz2 were:
-	                    user times (sec)  text size (386)
-	  0 (fastest)         1.1                6144
-	  1                   1.4                5392
-	  2                   3.0                5088
-	  3 (smallest)        5.1                4912
-
-endmenu
diff --git a/config/busybox-1.4.2/networking/udhcp/Config.in b/config/busybox-1.4.2/networking/udhcp/Config.in
deleted file mode 100644
index a5ce08ded..000000000
--- a/config/busybox-1.4.2/networking/udhcp/Config.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-config BB_CONFIG_APP_UDHCPD
-	bool "udhcp Server (udhcpd)"
-	default n
-	help
-	  uDHCPd is a DHCP server geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
-
-	  See http://udhcp.busybox.net for further details.
-
-config BB_CONFIG_APP_DHCPRELAY
-	bool "dhcprelay"
-	default n
-	depends on BB_CONFIG_APP_UDHCPD
-	help
-	  dhcprelay listens for dhcp requests on one or more interfaces
-	  and forwards these requests to a different interface or dhcp
-	  server.
-
-config BB_CONFIG_APP_DUMPLEASES
-	bool "Lease display utility (dumpleases)"
-	default n
-	depends on BB_CONFIG_APP_UDHCPD
-	help
-	  dumpleases displays the leases written out by the udhcpd server.
-	  Lease times are stored in the file by time remaining in lease, or
-	  by the absolute time that it expires in seconds from epoch.
-
-	  See http://udhcp.busybox.net for further details.
-
-config BB_CONFIG_APP_UDHCPC
-	bool "udhcp Client (udhcpc)"
-	default n
-	help
-	  uDHCPc is a DHCP client geared primarily toward embedded systems,
-	  while striving to be fully functional and RFC compliant.
-
-	  The udhcp client negotiates a lease with the DHCP server and
-	  notifies a set of scripts when a lease is obtained or lost.
-
-	  See http://udhcp.busybox.net for further details.
-
-config BB_CONFIG_FEATURE_UDHCP_SYSLOG
-	bool "Log udhcp messages to syslog"
-	default n
-	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
-	select BB_CONFIG_FEATURE_SYSLOG
-	help
-	  If not daemonized, udhcpd prints its messages to stdout/stderr.
-	  If this option is selected, it will also log them to syslog.
-
-	  See http://udhcp.busybox.net for further details.
-
-config BB_CONFIG_FEATURE_UDHCP_DEBUG
-	bool "Compile udhcp with noisy debugging messages"
-	default n
-	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
-	help
-	  If selected, udhcpd will output extra debugging output.  If using
-	  this option, compile uDHCP with "-g", and do not fork the daemon to
-	  the background.
-
-	  See http://udhcp.busybox.net for further details.
diff --git a/config/busybox-1.4.2/Config.in b/config/busybox/Config.in
index ba9eb0c2c..d5b208310 100644
--- a/config/busybox-1.4.2/Config.in
+++ b/config/busybox/Config.in
@@ -10,10 +10,10 @@ config BB_CONFIG_HAVE_DOT_CONFIG
 	default y
 
 menu "Busybox Settings"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 menu "General Configuration"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_NITPICK
 	bool "See lots more (probably unnecessary) configuration options."
@@ -103,8 +103,7 @@ config BB_CONFIG_FEATURE_INSTALLER
 	help
 	  Enable 'busybox --install [-s]' support.  This will allow you to use
 	  busybox at runtime to create hard links or symlinks for all the
-	  applets that are compiled into busybox.  This feature requires the
-	  /proc filesystem.
+	  applets that are compiled into busybox.
 
 config BB_CONFIG_LOCALE_SUPPORT
 	bool "Enable locale support (system needs locale for this to work)"
@@ -143,6 +142,13 @@ config BB_CONFIG_FEATURE_CLEAN_UP
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
+config BB_CONFIG_FEATURE_PIDFILE
+	bool "Support writing pidfiles"
+	default n
+	help
+	  This option makes some applets (e.g. crond, syslogd, inetd) write
+	  a pidfile in /var/run. Some applications rely on them.
+
 config BB_CONFIG_FEATURE_SUID
 	bool "Support for SUID/SGID handling"
 	default n
@@ -158,13 +164,6 @@ config BB_CONFIG_FEATURE_SUID
 	  are login, passwd, su, ping, traceroute, crontab, dnsd, ipcrm, ipcs,
 	  and vlock.
 
-config BB_CONFIG_FEATURE_SYSLOG
-	bool "Support for syslog"
-	default n
-	help
-	  This option is auto-selected when you select any applet which may
-	  send its output to syslog. You do not need to select it manually.
-
 config BB_CONFIG_FEATURE_SUID_CONFIG
 	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
 	default n if BB_CONFIG_FEATURE_SUID
@@ -189,10 +188,10 @@ config BB_CONFIG_FEATURE_SUID_CONFIG
 
 	  The file has to be owned by user root, group root and has to be
 	  writeable only by root:
-	  	(chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+	        (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
 	  The busybox executable has to be owned by user root, group
 	  root and has to be setuid root for this to work:
-	  	(chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+	        (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
 
 	  Robert 'sandman' Griebl has more information here:
 	  <url: http://www.softforge.de/bb/suid.html >.
@@ -205,14 +204,6 @@ config BB_CONFIG_FEATURE_SUID_CONFIG_QUIET
 	  /etc/busybox.conf should be readable by the user needing the SUID, check
 	  this option to avoid users to be notified about missing permissions.
 
-config BB_CONFIG_FEATURE_HAVE_RPC
-	bool "RPC support"
-	default y
-	help
-	  Select this if you have rpc support.
-	  This automatically turns off all configuration options that rely
-	  on RPC.
-
 config BB_CONFIG_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
@@ -233,6 +224,20 @@ config BB_CONFIG_SELINUX
 
 	  Most people will leave this set to 'N'.
 
+config BB_CONFIG_FEATURE_PREFER_APPLETS
+	bool "exec prefers applets"
+	default n
+	help
+	  This is an experimental option which directs applets about to
+	  call 'exec' to try and find an applicable busybox applet before
+	  searching the PATH. This is typically done by exec'ing
+	  /proc/self/exe.
+	  This may affect shell, find -exec, xargs and similar applets.
+	  They will use applets even if /bin/<applet> -> busybox link
+	  is missing (or is not a link to busybox). However, this causes
+	  problems in chroot jails without mounted /proc and with ps/top
+	  (command name can be shown as 'exe' for applets started this way).
+
 config BB_CONFIG_BUSYBOX_EXEC_PATH
 	string "Path to BusyBox executable"
 	default "/proc/self/exe"
@@ -243,10 +248,26 @@ config BB_CONFIG_BUSYBOX_EXEC_PATH
 	  executable.  If you haven't got /proc, set this to wherever you
 	  want to run BusyBox from.
 
+# These are auto-selected by other options
+
+config BB_CONFIG_FEATURE_SYSLOG
+	bool "Support for logging to syslog"
+	default n
+	help
+	  This option is auto-selected when you select any applet which may
+	  send its output to syslog. You do not need to select it manually.
+
+config BB_CONFIG_FEATURE_HAVE_RPC
+	bool "RPC support"
+	default n
+	help
+	  This is automatically selected if any of enabled applets need it.
+	  You do not need to select it manually.
+
 endmenu
 
 menu 'Build Options'
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_STATIC
 	bool "Build BusyBox as a static binary (no shared libs)"
@@ -265,41 +286,80 @@ config BB_CONFIG_STATIC
 config BB_CONFIG_BUILD_LIBBUSYBOX
 	bool "Build shared libbusybox"
 	default n
+	depends on !BB_CONFIG_FEATURE_PREFER_APPLETS
 	help
-	  Build a shared library libbusybox.so which contains all
-	  libraries used inside busybox.
-
-	  This is an experimental feature intended to support the upcoming
-	  "make standalone" mode.  Enabling it against the one big busybox
-	  binary serves no purpose (and increases the size).  You should
-	  almost certainly say "no" to this right now.
-
-config BB_CONFIG_FEATURE_FULL_LIBBUSYBOX
-	bool "Feature-complete libbusybox"
-	default n if !BB_CONFIG_FEATURE_SHARED_BUSYBOX
-	depends on BB_CONFIG_BUILD_LIBBUSYBOX
+	  Build a shared library libbusybox.so.N.N.N which contains all
+	  busybox code.
+
+	  This feature allows every applet to be built as a tiny
+	  separate executable.  Enabling it for "one big busybox binary"
+	  approach serves no purpose and increases code size.
+	  You should almost certainly say "no" to this.
+
+### config FEATURE_FULL_LIBBUSYBOX
+###	bool "Feature-complete libbusybox"
+###	default n if !FEATURE_SHARED_BUSYBOX
+###	depends on BUILD_LIBBUSYBOX
+###	help
+###	  Build a libbusybox with the complete feature-set, disregarding
+###	  the actually selected config.
+###
+###	  Normally, libbusybox will only contain the features which are
+###	  used by busybox itself. If you plan to write a separate
+###	  standalone application which uses libbusybox say 'Y'.
+###
+###	  Note: libbusybox is GPL, not LGPL, and exports no stable API that
+###	  might act as a copyright barrier.  We can and will modify the
+###	  exported function set between releases (even minor version number
+###	  changes), and happily break out-of-tree features.
+###
+###	  Say 'N' if in doubt.
+
+config BB_CONFIG_FEATURE_INDIVIDUAL
+	bool "Produce a binary for each applet, linked against libbusybox"
+	default y
+	depends on !BB_CONFIG_STATIC && BB_CONFIG_BUILD_LIBBUSYBOX
 	help
-	  Build a libbusybox with the complete feature-set, disregarding
-	  the actually selected config.
+	  If your CPU architecture doesn't allow for sharing text/rodata
+	  sections of running binaries, but allows for runtime dynamic
+	  libraries, this option will allow you to reduce memory footprint
+	  when you have many different applets running at once.
 
-	  Normally, libbusybox will only contain the features which are
-	  used by busybox itself. If you plan to write a separate
-	  standalone application which uses libbusybox say 'Y'.
+	  If your CPU architecture allows for sharing text/rodata,
+	  having single binary is more optimal.
 
-	  Note: libbusybox is GPL, not LGPL, and exports no stable API that
-	  might act as a copyright barrier.  We can and will modify the
-	  exported function set between releases (even minor version number
-	  changes), and happily break out-of-tree features.
+	  Each applet will be a tiny program, dynamically linked
+	  against libbusybox.so.N.N.N.
 
-	  Say 'N' if in doubt.
+	  You need to have a working dynamic linker.
 
 config BB_CONFIG_FEATURE_SHARED_BUSYBOX
-	bool "Use shared libbusybox for busybox"
-	default y if BB_CONFIG_BUILD_LIBBUSYBOX
+	bool "Produce additional busybox binary linked against libbusybox"
+	default y
 	depends on !BB_CONFIG_STATIC && BB_CONFIG_BUILD_LIBBUSYBOX
 	help
-	  Use libbusybox.so also for busybox itself.
-	  You need to have a working dynamic linker to use this variant.
+	  Build busybox, dynamically linked against libbusybox.so.N.N.N.
+
+	  You need to have a working dynamic linker.
+
+### config BUILD_AT_ONCE
+###	bool "Compile all sources at once"
+###	default n
+###	help
+###	  Normally each source-file is compiled with one invocation of
+###	  the compiler.
+###	  If you set this option, all sources are compiled at once.
+###	  This gives the compiler more opportunities to optimize which can
+###	  result in smaller and/or faster binaries.
+###
+###	  Setting this option will consume alot of memory, e.g. if you
+###	  enable all applets with all features, gcc uses more than 300MB
+###	  RAM during compilation of busybox.
+###
+###	  This option is most likely only beneficial for newer compilers
+###	  such as gcc-4.1 and above.
+###
+###	  Say 'N' unless you know what you are doing.
 
 config BB_CONFIG_LFS
 	bool "Build with Large File Support (for accessing files > 2 GB)"
@@ -313,29 +373,10 @@ config BB_CONFIG_LFS
 	  cp, mount, tar, and many others.  If you want to access files larger
 	  than 2 Gigabytes, enable this option.  Otherwise, leave it set to 'N'.
 
-config BB_CONFIG_BUILD_AT_ONCE
-	bool "Compile all sources at once"
-	default n
-	help
-	  Normally each source-file is compiled with one invocation of
-	  the compiler.
-	  If you set this option, all sources are compiled at once.
-	  This gives the compiler more opportunities to optimize which can
-	  result in smaller and/or faster binaries.
-
-	  Setting this option will consume alot of memory, e.g. if you
-	  enable all applets with all features, gcc uses more than 300MB
-	  RAM during compilation of busybox.
-
-	  This option is most likely only beneficial for newer compilers
-	  such as gcc-4.1 and above.
-
-	  Say 'N' unless you know what you are doing.
-
 endmenu
 
 menu 'Debugging Options'
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_DEBUG
 	bool "Build BusyBox with extra Debugging symbols"
@@ -348,21 +389,29 @@ config BB_CONFIG_DEBUG
 
 	  Most people should answer N.
 
-config BB_CONFIG_DEBUG_PESSIMIZE
-	bool "Disable compiler optimizations."
+config BB_CONFIG_WERROR
+	bool "Abort compilation on any warning"
 	default n
-	depends on BB_CONFIG_DEBUG
 	help
-	  The compiler's optimization of source code can eliminate and reorder
-	  code, resulting in an executable that's hard to understand when
-	  stepping through it with a debugger.  This switches it off, resulting
-	  in a much bigger executable that more closely matches the source
-	  code.
+	  Selecting this will add -Werror to gcc command line.
+
+	  Most people should answer N.
+
+# Seems to be unused
+#config DEBUG_PESSIMIZE
+#	bool "Disable compiler optimizations."
+#	default n
+#	depends on DEBUG
+#	help
+#	  The compiler's optimization of source code can eliminate and reorder
+#	  code, resulting in an executable that's hard to understand when
+#	  stepping through it with a debugger.  This switches it off, resulting
+#	  in a much bigger executable that more closely matches the source
+#	  code.
 
 choice
 	prompt "Additional debugging library"
 	default BB_CONFIG_NO_DEBUG_LIB
-	depends on BB_CONFIG_DEBUG
 	help
 	  Using an additional debugging library will make BusyBox become
 	  considerable larger and will cause it to run more slowly.  You
@@ -413,7 +462,7 @@ config BB_CONFIG_INCLUDE_SUSv2
 endmenu
 
 menu 'Installation Options'
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_INSTALL_NO_USR
 	bool "Don't use /usr"
@@ -423,31 +472,59 @@ config BB_CONFIG_INSTALL_NO_USR
 	  that you really want this behaviour.
 
 choice
-       prompt "Applets links"
-       default BB_CONFIG_INSTALL_APPLET_SYMLINKS
-       help
-         Choose how you install applets links.
+	prompt "Applets links"
+	default BB_CONFIG_INSTALL_APPLET_SYMLINKS
+	help
+	  Choose how you install applets links.
 
 config BB_CONFIG_INSTALL_APPLET_SYMLINKS
-       bool "as soft-links"
-       help
-         Install applets as soft-links to the busybox binary. This needs some
-         free inodes on the filesystem, but might help with filesystem
-         generators that can't cope with hard-links.
+	bool "as soft-links"
+	help
+	  Install applets as soft-links to the busybox binary. This needs some
+	  free inodes on the filesystem, but might help with filesystem
+	  generators that can't cope with hard-links.
 
 config BB_CONFIG_INSTALL_APPLET_HARDLINKS
-       bool "as hard-links"
-       help
-         Install applets as hard-links to the busybox binary. This might count
-         on a filesystem with few inodes.
+	bool "as hard-links"
+	help
+	  Install applets as hard-links to the busybox binary. This might count
+	  on a filesystem with few inodes.
+
+config BB_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+	bool "as script wrappers"
+	help
+	  Install applets as script wrappers that call the busybox binary.
 
 config BB_CONFIG_INSTALL_APPLET_DONT
-       bool
-       prompt "not installed"
-       depends on BB_CONFIG_FEATURE_INSTALLER || BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
-       help
-         Do not install applet links. Useful when using the -install feature
-         or a standalone shell for rescue pruposes.
+	bool "not installed"
+	depends on BB_CONFIG_FEATURE_INSTALLER || BB_CONFIG_FEATURE_SH_STANDALONE || BB_CONFIG_FEATURE_PREFER_APPLETS
+	help
+	  Do not install applet links. Useful when using the -install feature
+	  or a standalone shell for rescue purposes.
+
+endchoice
+
+choice
+	prompt "/bin/sh applet link"
+	default BB_CONFIG_INSTALL_SH_APPLET_SYMLINK
+	depends on BB_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS
+	help
+	  Choose how you install /bin/sh applet link.
+
+config BB_CONFIG_INSTALL_SH_APPLET_SYMLINK
+	bool "as soft-link"
+	help
+	  Install /bin/sh applet as soft-link to the busybox binary.
+
+config BB_CONFIG_INSTALL_SH_APPLET_HARDLINK
+	bool "as hard-link"
+	help
+	  Install /bin/sh applet as hard-link to the busybox binary.
+
+config BB_CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+	bool "as script wrapper"
+	help
+	  Install /bin/sh applet as script wrapper that call the busybox binary.
 
 endchoice
 
@@ -459,26 +536,28 @@ config BB_CONFIG_PREFIX
 
 endmenu
 
-source config/busybox-1.4.2/libbb/Config.in
+source config/busybox/libbb/Config.in
 
 endmenu
 
 comment "Applets"
 
-source config/busybox-1.4.2/archival/Config.in
-source config/busybox-1.4.2/coreutils/Config.in
-source config/busybox-1.4.2/console-tools/Config.in
-source config/busybox-1.4.2/debianutils/Config.in
-source config/busybox-1.4.2/editors/Config.in
-source config/busybox-1.4.2/findutils/Config.in
-source config/busybox-1.4.2/init/Config.in
-source config/busybox-1.4.2/loginutils/Config.in
-source config/busybox-1.4.2/e2fsprogs/Config.in
-source config/busybox-1.4.2/modutils/Config.in
-source config/busybox-1.4.2/util-linux/Config.in
-source config/busybox-1.4.2/miscutils/Config.in
-source config/busybox-1.4.2/networking/Config.in
-source config/busybox-1.4.2/procps/Config.in
-source config/busybox-1.4.2/shell/Config.in
-source config/busybox-1.4.2/sysklogd/Config.in
-source config/busybox-1.4.2/runit/Config.in
+source config/busybox/archival/Config.in
+source config/busybox/coreutils/Config.in
+source config/busybox/console-tools/Config.in
+source config/busybox/debianutils/Config.in
+source config/busybox/editors/Config.in
+source config/busybox/findutils/Config.in
+source config/busybox/init/Config.in
+source config/busybox/loginutils/Config.in
+source config/busybox/e2fsprogs/Config.in
+source config/busybox/modutils/Config.in
+source config/busybox/util-linux/Config.in
+source config/busybox/miscutils/Config.in
+source config/busybox/networking/Config.in
+source config/busybox/procps/Config.in
+source config/busybox/shell/Config.in
+source config/busybox/sysklogd/Config.in
+source config/busybox/runit/Config.in
+source config/busybox/selinux/Config.in
+source config/busybox/ipsvd/Config.in
diff --git a/config/busybox/Extract b/config/busybox/Extract
new file mode 100755
index 000000000..cb4ee0c90
--- /dev/null
+++ b/config/busybox/Extract
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+dir=/tmp
+
+# Try to be smart and get latest and greatest.
+bb_path=`find ${dir} -maxdepth 1 -type d -name "busybox-*" | sort | tail -n 1`
+
+if test -z ${bb_path}
+then
+	echo "Extract busybox to ${dir} directory before running this script."
+	exit 1
+fi
+
+bb_version=`basename ${bb_path} | sed -e "s/busybox-//g"`
+echo "---------------------------------------------------------------------"
+echo "Extracting busybox configuration from version ${bb_version}..."
+echo "---------------------------------------------------------------------"
+
+#
+# first extract all configuration files from the original source tree
+#
+
+for cfgfile in $(find ${bb_path} -name "Config.in"); do
+	new_cfgfile=$(echo $cfgfile | sed -e "s~${bb_path}~\.~g")
+	dir=$(echo $new_cfgfile | sed -e "s~Config\.in~~g")
+	mkdir -p $dir
+	../../scripts/mkprefix -v -p BB_CONFIG_ < $cfgfile > $new_cfgfile
+done
+
+#
+# fix some entries
+# 
+
+echo "---------------------------------------------------------------------"
+echo "Fixing some stuff..."
+echo "---------------------------------------------------------------------"
+
+for cfgfile in $(find . -name "Config.in"); do
+	sed -i -e "s/^source \(.*\)/source config\/busybox\/\1/g" $cfgfile
+	sed -i -e "s/^mainmenu \(.*$\)/# mainmenu \1/g" $cfgfile
+	sed -i -e "s/^\(menu .*\)$/\1\n\tdepends on BUSYBOX/g" $cfgfile
+done
diff --git a/config/busybox-1.4.2/Remove b/config/busybox/Remove
index d7740740d..ed0cb1b61 100755
--- a/config/busybox-1.4.2/Remove
+++ b/config/busybox/Remove
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 find . -type d | grep -v "\.$" | xargs rm -fr  
-
+rm -r *.in
diff --git a/config/busybox-1.4.2/archival/Config.in b/config/busybox/archival/Config.in
index 45ebe71f6..900f24fb9 100644
--- a/config/busybox-1.4.2/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Archival Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_AR
 	bool "ar"
@@ -49,12 +49,22 @@ config BB_CONFIG_BUNZIP2
 	  conventional LZ77/LZ78-based compressors, and approaches the
 	  performance of the PPM family of statistical compressors.
 
-	  The BusyBox bunzip2 applet is limited to de-compression only.
-	  On an x86 system, this applet adds about 11K.
-
 	  Unless you have a specific application which requires bunzip2, you
 	  should probably say N here.
 
+config BB_CONFIG_BZIP2
+	bool "bzip2"
+	default n
+	help
+	  bzip2 is a compression utility using the Burrows-Wheeler block
+	  sorting text compression algorithm, and Huffman coding.  Compression
+	  is generally considerably better than that achieved by more
+	  conventional LZ77/LZ78-based compressors, and approaches the
+	  performance of the PPM family of statistical compressors.
+
+	  Unless you have a specific application which requires bzip2, you
+	  should probably say N here.
+
 config BB_CONFIG_CPIO
 	bool "cpio"
 	default n
@@ -134,6 +144,13 @@ config BB_CONFIG_RPM
 	help
 	  Mini RPM applet - queries and extracts RPM packages.
 
+config BB_CONFIG_FEATURE_RPM_BZ2
+	bool "Enable handling of rpms with bzip2-compressed data inside"
+	default n
+	depends on BB_CONFIG_RPM
+	help
+	  Enable handling of rpms with bzip2-compressed data inside.
+
 config BB_CONFIG_TAR
 	bool "tar"
 	default n
@@ -199,6 +216,15 @@ config BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	  the old GNU format; help to kill this old format by
 	  repacking your ancient archives with the new format.
 
+config BB_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY
+	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
+	default N
+	depends on BB_CONFIG_TAR
+	help
+	  This option is required to unpack archives created by some old
+	  version of Sun's tar (it was calculating checksum using signed arithmetic).
+	  It is said to be fixed in newer Sun tar, but "old" tarballs still exist.
+
 config BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
 	bool "Enable support for some GNU tar extensions"
 	default y
diff --git a/config/busybox-1.4.2/console-tools/Config.in b/config/busybox/console-tools/Config.in
index 75b3cbca7..0b85cdb21 100644
--- a/config/busybox-1.4.2/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Console Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_CHVT
 	bool "chvt"
@@ -32,6 +32,12 @@ config BB_CONFIG_DUMPKMAP
 	  This program dumps the kernel's keyboard translation table to
 	  stdout, in binary format. You can then use loadkmap to load it.
 
+config BB_CONFIG_KBD_MODE
+	bool "kbd_mode"
+	default n
+	help
+	  This program reports and sets keyboard mode.
+
 config BB_CONFIG_LOADFONT
 	bool "loadfont"
 	default n
@@ -86,7 +92,7 @@ config BB_CONFIG_SETCONSOLE
 config BB_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool "Enable long options"
 	default n
-	depends on BB_CONFIG_SET_CONSOLE && BB_CONFIG_GETOPT_LONG
+	depends on BB_CONFIG_SETCONSOLE && BB_CONFIG_GETOPT_LONG
 	help
 	  Support long options for the setconsole applet.
 
diff --git a/config/busybox-1.4.2/coreutils/Config.in b/config/busybox/coreutils/Config.in
index eea9d600f..90be19049 100644
--- a/config/busybox-1.4.2/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Coreutils"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_BASENAME
 	bool "basename"
@@ -66,13 +66,6 @@ config BB_CONFIG_CKSUM
 	help
 	  cksum is used to calculate the CRC32 checksum of a file.
 
-config BB_CONFIG_CMP
-	bool "cmp"
-	default n
-	help
-	  cmp is used to compare two files and returns the result
-	  to standard output.
-
 config BB_CONFIG_COMM
 	bool "comm"
 	default n
@@ -143,37 +136,12 @@ config BB_CONFIG_DF
 	  df reports the amount of disk space used and available
 	  on filesystems.
 
-config BB_CONFIG_DIFF
-	bool "diff"
+config BB_CONFIG_FEATURE_DF_INODE
+	bool "Enable -i (inode information)"
 	default n
+	depends on BB_CONFIG_DF
 	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 BB_CONFIG_FEATURE_DIFF_BINARY
-	bool "Enable checks for binary files"
-	default y
-	depends on BB_CONFIG_DIFF
-	help
-	  This option enables support for checking for binary files
-	  before a comparison is carried out.
-
-config BB_CONFIG_FEATURE_DIFF_DIR
-	bool "Enable directory support"
-	default y
-	depends on BB_CONFIG_DIFF
-	help
-	  This option enables support for directory and subdirectory
-	  comparison.
-
-config BB_CONFIG_FEATURE_DIFF_MINIMAL
-	bool "Enable -d option to find smaller sets of changes"
-	default n
-	depends on BB_CONFIG_DIFF
-	help
-	  Enabling this option allows the use of -d to make diff
-	  try hard to find the smallest possible set of changes.
+	  This option enables support for df -i.
 
 config BB_CONFIG_DIRNAME
 	bool "dirname"
@@ -240,6 +208,19 @@ config BB_CONFIG_FEATURE_ENV_LONG_OPTIONS
 	help
 	  Support long options for the env applet.
 
+config BB_CONFIG_EXPAND
+	bool "expand"
+	default n
+	help
+	  By default, convert all tabs to spaces.
+
+config BB_CONFIG_FEATURE_EXPAND_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_CONFIG_EXPAND && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the expand applet.
+
 config BB_CONFIG_EXPR
 	bool "expr"
 	default n
@@ -475,6 +456,20 @@ config BB_CONFIG_PWD
 	help
 	  pwd is used to print the current directory.
 
+config BB_CONFIG_READLINK
+	bool "readlink"
+	default n
+	help
+	  This program reads a symbolic link and returns the name
+	  of the file it points to
+
+config BB_CONFIG_FEATURE_READLINK_FOLLOW
+	bool "Enable canonicalization by following all symlinks (-f)"
+	default n
+	depends on BB_CONFIG_READLINK
+	help
+	  Enable the readlink option (-f).
+
 config BB_CONFIG_REALPATH
 	bool "realpath"
 	default n
@@ -537,6 +532,21 @@ config BB_CONFIG_FEATURE_SORT_BIG
 	  The SuSv3 sort standard is available at:
 	  http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 
+config BB_CONFIG_SPLIT
+	bool "split"
+	default n
+	help
+	  split a file into pieces.
+
+config BB_CONFIG_FEATURE_SPLIT_FANCY
+	bool "fancy extensions"
+	default n
+	depends on BB_CONFIG_SPLIT
+	help
+	  Add support for features not required by SUSv3.
+	  Supports additional suffixes 'b' for 512 bytes,
+	  'g' for 1GiB for the -b option.
+
 config BB_CONFIG_STAT
 	bool "stat"
 	default n
@@ -666,6 +676,19 @@ config BB_CONFIG_UNAME
 	help
 	  uname is used to print system information.
 
+config BB_CONFIG_UNEXPAND
+	bool "unexpand"
+	default n
+	help
+	  By default, convert only leading sequences of blanks to tabs.
+
+config BB_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_CONFIG_UNEXPAND && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the unexpand applet.
+
 config BB_CONFIG_UNIQ
 	bool "uniq"
 	default n
@@ -690,14 +713,6 @@ config BB_CONFIG_UUENCODE
 	help
 	  uuencode is used to uuencode a file.
 
-config BB_CONFIG_WATCH
-	bool "watch"
-	default n
-	select BB_CONFIG_DATE
-	help
-	  watch is used to execute a program periodically, showing
-	  output to the screen.
-
 config BB_CONFIG_WC
 	bool "wc"
 	default n
diff --git a/config/busybox-1.4.2/debianutils/Config.in b/config/busybox/debianutils/Config.in
index af776e0d3..72ed8d548 100644
--- a/config/busybox-1.4.2/debianutils/Config.in
+++ b/config/busybox/debianutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Debian Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_MKTEMP
 	bool "mktemp"
@@ -18,20 +18,6 @@ config BB_CONFIG_PIPE_PROGRESS
 	help
 	  Display a dot to indicate pipe activity.
 
-config BB_CONFIG_READLINK
-	bool "readlink"
-	default n
-	help
-	  This program reads a symbolic link and returns the name
-	  of the file it points to
-
-config BB_CONFIG_FEATURE_READLINK_FOLLOW
-	bool "Enable canonicalization by following all symlinks (-f)"
-	default n
-	depends on BB_CONFIG_READLINK
-	help
-	  Enable the readlink option (-f).
-
 config BB_CONFIG_RUN_PARTS
 	bool "run-parts"
 	default n
@@ -54,6 +40,15 @@ config BB_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS
 	help
 	  Support long options for the run-parts applet.
 
+config BB_CONFIG_FEATURE_RUN_PARTS_FANCY
+	bool "Support additional arguments"
+	default n
+	depends on BB_CONFIG_RUN_PARTS
+	help
+	  Support additional options:
+	  -l --list print the names of the all matching files (not
+	            limited to executables), but don't actually run them.
+
 config BB_CONFIG_START_STOP_DAEMON
 	bool "start-stop-daemon"
 	default y
diff --git a/config/busybox-1.4.2/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index c7714f27e..0e556ea07 100644
--- a/config/busybox-1.4.2/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux Ext2 FS Progs"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_CHATTR
 	bool "chattr"
diff --git a/config/busybox-1.4.2/e2fsprogs/old_e2fsprogs/Config.in b/config/busybox/e2fsprogs/old_e2fsprogs/Config.in
index 2b5e3698c..e06fa9bc9 100644
--- a/config/busybox-1.4.2/e2fsprogs/old_e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/old_e2fsprogs/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux Ext2 FS Progs"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_CHATTR
 	bool "chattr"
diff --git a/config/busybox-1.4.2/editors/Config.in b/config/busybox/editors/Config.in
index ecdd6365a..592b66fb0 100644
--- a/config/busybox-1.4.2/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Editors"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_AWK
 	bool "awk"
@@ -21,6 +21,45 @@ config BB_CONFIG_FEATURE_AWK_MATH
 	  Enable math functions of the Awk programming language.
 	  NOTE: This will require libm to be present for linking.
 
+config BB_CONFIG_CMP
+	bool "cmp"
+	default n
+	help
+	  cmp is used to compare two files and returns the result
+	  to standard output.
+
+config BB_CONFIG_DIFF
+	bool "diff"
+	default n
+	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 BB_CONFIG_FEATURE_DIFF_BINARY
+	bool "Enable checks for binary files"
+	default y
+	depends on BB_CONFIG_DIFF
+	help
+	  This option enables support for checking for binary files
+	  before a comparison is carried out.
+
+config BB_CONFIG_FEATURE_DIFF_DIR
+	bool "Enable directory support"
+	default y
+	depends on BB_CONFIG_DIFF
+	help
+	  This option enables support for directory and subdirectory
+	  comparison.
+
+config BB_CONFIG_FEATURE_DIFF_MINIMAL
+	bool "Enable -d option to find smaller sets of changes"
+	default n
+	depends on BB_CONFIG_DIFF
+	help
+	  Enabling this option allows the use of -d to make diff
+	  try hard to find the smallest possible set of changes.
+
 config BB_CONFIG_ED
 	bool "ed"
 	default n
@@ -51,6 +90,25 @@ config BB_CONFIG_VI
 	  learning curve.  If you are not already comfortable with 'vi'
 	  you may wish to use something else.
 
+config BB_CONFIG_FEATURE_VI_MAX_LEN
+	int "Maximum screen width in vi"
+	range 256 16384
+	default 4096
+	depends on BB_CONFIG_VI
+	help
+	  Contrary to what you may think, this is not eating much.
+	  Make it smaller than 4k only if you are very limited on memory.
+
+config BB_CONFIG_FEATURE_VI_8BIT
+	bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+	default y
+	depends on BB_CONFIG_VI
+	help
+	  If your terminal can display characters with high bit set,
+	  you may want to enable this. Note: vi is not Unicode-capable.
+	  If your terminal combines several 8-bit bytes into one character
+	  (as in Unicode mode), this will not work properly.
+
 config BB_CONFIG_FEATURE_VI_COLON
 	bool "Enable \":\" colon commands (no \"ex\" mode)"
 	default y
diff --git a/config/busybox-1.4.2/findutils/Config.in b/config/busybox/findutils/Config.in
index 60cf7c9e7..64fedce76 100644
--- a/config/busybox-1.4.2/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Finding Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_FIND
 	bool "find"
@@ -31,7 +31,7 @@ config BB_CONFIG_FEATURE_FIND_MTIME
 	  files, in days.
 
 config BB_CONFIG_FEATURE_FIND_MMIN
-	bool "Enable modified time matching (-min) option"
+	bool "Enable modified time matching (-mmin) option"
 	default y
 	depends on BB_CONFIG_FIND
 	help
@@ -58,8 +58,14 @@ config BB_CONFIG_FEATURE_FIND_XDEV
 	default y
 	depends on BB_CONFIG_FIND
 	help
-	  This option will allow find to restrict searches to a single
-	  filesystem.
+	  This option allows find to restrict searches to a single filesystem.
+
+config BB_CONFIG_FEATURE_FIND_MAXDEPTH
+	bool "Enable -maxdepth N option"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  This option enables -maxdepth N option.
 
 config BB_CONFIG_FEATURE_FIND_NEWER
 	bool "Enable -newer option for comparing file mtimes"
@@ -84,6 +90,88 @@ config BB_CONFIG_FEATURE_FIND_EXEC
 	  Support the 'find -exec' option for executing commands based upon
 	  the files matched.
 
+config BB_CONFIG_FEATURE_FIND_USER
+	bool "Enable username/uid matching (-user) option"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Support the 'find -user' option for searching by username or uid.
+
+config BB_CONFIG_FEATURE_FIND_GROUP
+	bool "Enable group/gid matching (-group) option"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Support the 'find -group' option for searching by group name or gid.
+
+config BB_CONFIG_FEATURE_FIND_NOT
+	bool "Enable the 'not' (!) operator"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Support the '!' operator to invert the test results.
+	  If 'Enable full-blown desktop' is enabled, then will also support
+	  the non-POSIX notation '-not'.
+
+config BB_CONFIG_FEATURE_FIND_DEPTH
+	bool "Enable the -depth option"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Process each directory's contents before the directory itself.
+
+config BB_CONFIG_FEATURE_FIND_PAREN
+	bool "Enable parens in options"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Enable usage of parens '(' to specify logical order of arguments.
+
+config BB_CONFIG_FEATURE_FIND_SIZE
+	bool "Enable (-size) option allowing matching for file size"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Support the 'find -size' option for searching by file size.
+
+config BB_CONFIG_FEATURE_FIND_PRUNE
+	bool "Enable (-prune) option allowing to exclude subdirectories"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  If the file is a directory, dont descend into it. Useful for
+	  exclusion .svn and CVS directories.
+
+config BB_CONFIG_FEATURE_FIND_DELETE
+	bool "Enable -delete option allowing to delete files"
+	default n
+	depends on BB_CONFIG_FIND && BB_CONFIG_FEATURE_FIND_DEPTH
+	help
+	  Support the 'find -delete' option for deleting files and direcotries.
+	  WARNING: This option can do much harm if used wrong. Busybox will not
+	  try to protect the user from doing stupid things. Use with care.
+
+config BB_CONFIG_FEATURE_FIND_PATH
+	bool "Enable -path option allowing to match pathname patterns"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  The -path option matches whole pathname instead of just filename.
+
+config BB_CONFIG_FEATURE_FIND_REGEX
+	bool "Enable -regex: match pathname to regex"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  The -regex option matches whole pathname against regular expression.
+
+config BB_CONFIG_FEATURE_FIND_CONTEXT
+	bool "Enable (-context) option for matching security context"
+	default n
+	depends on BB_CONFIG_FIND && BB_CONFIG_SELINUX
+	help
+	  Support the 'find -context' option for matching security context.
+
 config BB_CONFIG_GREP
 	bool "grep"
 	default n
diff --git a/config/busybox-1.4.2/init/Config.in b/config/busybox/init/Config.in
index a4b0f3d97..b385e48c4 100644
--- a/config/busybox-1.4.2/init/Config.in
+++ b/config/busybox/init/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Init Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_INIT
 	bool "init"
@@ -38,6 +38,12 @@ config BB_CONFIG_FEATURE_INIT_SCTTY
 	  controlling tty (TIOCSCTTY).  This is not the traditional init
 	  behavour, but is often what you want in an embedded system where
 	  the console is only accessed during development or for maintenance.
+	  NB: using cttyhack applet may work better.
+
+config BB_CONFIG_FEATURE_INIT_SYSLOG
+	bool "Enable init to write to syslog"
+	default n
+	depends on BB_CONFIG_INIT
 
 config BB_CONFIG_FEATURE_EXTRA_QUIET
 	bool "Be _extra_ quiet on boot"
diff --git a/config/busybox/ipsvd/Config.in b/config/busybox/ipsvd/Config.in
new file mode 100644
index 000000000..254cca985
--- /dev/null
+++ b/config/busybox/ipsvd/Config.in
@@ -0,0 +1,21 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "ipsvd utilities"
+	depends on BUSYBOX
+
+config BB_CONFIG_TCPSVD
+	bool "tcpsvd"
+	default n
+	help
+	  tcpsvd listens on a tcp port and runs a program for each new connection
+
+config BB_CONFIG_UDPSVD
+	bool "udpsvd"
+	default n
+	help
+	  udpsvd listens on a udp port and runs a program for each new connection
+
+endmenu
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
new file mode 100644
index 000000000..19c2d450f
--- /dev/null
+++ b/config/busybox/libbb/Config.in
@@ -0,0 +1,141 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Busybox Library Tuning"
+	depends on BUSYBOX
+
+config BB_CONFIG_PASSWORD_MINLEN
+	int "Minimum password length"
+	default 6
+	range 5 32
+	help
+	  Minimum allowable password length.
+
+config BB_CONFIG_MD5_SIZE_VS_SPEED
+	int " MD5: Trade Bytes for Speed"
+	default 2
+	range 0 3
+	help
+	  Trade binary size versus speed for the md5sum algorithm.
+	  Approximate values running uClibc and hashing
+	  linux-2.4.4.tar.bz2 were:
+	                    user times (sec)  text size (386)
+	  0 (fastest)         1.1                6144
+	  1                   1.4                5392
+	  2                   3.0                5088
+	  3 (smallest)        5.1                4912
+
+config BB_CONFIG_FEATURE_FAST_TOP
+	bool "Faster /proc scanning code (+100 bytes)"
+	default n
+	help
+	  This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
+	  but code size is slightly bigger.
+
+config BB_CONFIG_FEATURE_ETC_NETWORKS
+	bool "Support for /etc/networks"
+	default n
+	help
+	  Enable support for network names in /etc/networks. This is
+	  a rarely used feature which allows you to use names
+	  instead of IP/mask pairs in route command.
+
+config BB_CONFIG_FEATURE_EDITING
+	bool "Command line editing"
+	default n
+	help
+	  Enable line editing (mainly for shell command line).
+
+config BB_CONFIG_FEATURE_EDITING_MAX_LEN
+	int "Maximum length of input"
+	range 128 8192
+	default 1024
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Line editing code uses on-stack buffers for storage.
+	  You may want to decrease this parameter if your target machine
+	  benefits from smaller stack usage.
+
+config BB_CONFIG_FEATURE_EDITING_FANCY_KEYS
+	bool "Additional editing keys"
+	default n
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Enable additonal editing keys (Ctrl-E, Ctrl-U etc).
+	  Arrow keys, Home/End/Delete and Ctrl-W work even without this option.
+
+config BB_CONFIG_FEATURE_EDITING_VI
+	bool "vi-style line editing commands"
+	default n
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Enable vi-style line editing.  In shells, this mode can be
+	  turned on and off with "set -o vi" and "set +o vi".
+
+config BB_CONFIG_FEATURE_EDITING_HISTORY
+	int "History size"
+	range 0 99999
+	default 15
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Specify command history size.
+
+config BB_CONFIG_FEATURE_EDITING_SAVEHISTORY
+	bool "History saving"
+	default n
+	depends on BB_CONFIG_ASH && BB_CONFIG_FEATURE_EDITING
+	help
+	  Enable history saving in ash shell.
+
+config BB_CONFIG_FEATURE_TAB_COMPLETION
+	bool "Tab completion"
+	default n
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Enable tab completion.
+
+config BB_CONFIG_FEATURE_USERNAME_COMPLETION
+	bool "Username completion"
+	default n
+	depends on BB_CONFIG_FEATURE_TAB_COMPLETION
+	help
+	  Enable username completion.
+
+config BB_CONFIG_FEATURE_EDITING_FANCY_PROMPT
+	bool "Fancy shell prompts"
+	default n
+	depends on BB_CONFIG_FEATURE_EDITING
+	help
+	  Setting this option allows for prompts to use things like \w and
+	  \$ and escape codes.
+
+config BB_CONFIG_FEATURE_COPYBUF_KB
+	int "Copy buffer size, in kilobytes"
+	range 1 1024
+	default 4
+	help
+	  Size of buffer used by cp, mv, install 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 BB_CONFIG_MONOTONIC_SYSCALL
+	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
+	default y
+	help
+	  Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+	  time intervals (time, ping, traceroute etc need this).
+	  Probably requires Linux 2.6+. If not selected, gettimeofday
+	  will be used instead (which gives wrong results if date/time
+	  is reset).
+
+config BB_CONFIG_IOCTL_HEX2STR_ERROR
+	bool "Use ioctl names rather than hex values in error messages"
+	default y
+	help
+	  Use ioctl names rather than hex values in error messages
+	  (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+	  saves about 1400 bytes.
+endmenu
diff --git a/config/busybox-1.4.2/loginutils/Config.in b/config/busybox/loginutils/Config.in
index 308025d38..a2ed4f55a 100644
--- a/config/busybox-1.4.2/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Login/Password Management Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_FEATURE_SHADOWPASSWDS
 	bool "Support for shadow passwords"
@@ -15,7 +15,7 @@ config BB_CONFIG_FEATURE_SHADOWPASSWDS
 	  publicly readable.
 
 config BB_CONFIG_USE_BB_SHADOW
-	bool "Use busybox shadow password functions"
+	bool "  Use busybox shadow password functions"
 	default y
 	depends on BB_CONFIG_USE_BB_PWD_GRP && BB_CONFIG_FEATURE_SHADOWPASSWDS
 	help
@@ -60,12 +60,29 @@ config BB_CONFIG_ADDGROUP
 	help
 	  Utility for creating a new group account.
 
+config BB_CONFIG_FEATURE_ADDUSER_TO_GROUP
+	bool "Support for adding users to groups"
+	default n
+	depends on BB_CONFIG_ADDGROUP
+	help
+	  If  called  with two non-option arguments,
+	  addgroup will add an existing user to an
+	  existing group.
+
 config BB_CONFIG_DELGROUP
 	bool "delgroup"
 	default n
 	help
 	  Utility for deleting a group account.
 
+config BB_CONFIG_FEATURE_DEL_USER_FROM_GROUP
+	bool "Support for removing users from groups."
+	default n
+	depends on BB_CONFIG_DELGROUP
+	help
+	  If called with two non-option arguments, deluser
+	  or delgroup will remove an user from a specified group.
+
 config BB_CONFIG_ADDUSER
 	bool "adduser"
 	default n
@@ -112,6 +129,13 @@ config BB_CONFIG_LOGIN
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
+config BB_CONFIG_PAM
+	bool "Support for PAM (Pluggable Authentication Modules)"
+	default n
+	depends on BB_CONFIG_LOGIN
+	help
+	  Use PAM in login(1) instead of direct access to password database.
+
 config BB_CONFIG_LOGIN_SCRIPTS
 	bool "Support for login scripts"
 	depends on BB_CONFIG_LOGIN
@@ -120,12 +144,20 @@ config BB_CONFIG_LOGIN_SCRIPTS
 	  Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
 	  just prior to switching from root to logged-in user.
 
+config BB_CONFIG_FEATURE_NOLOGIN
+	bool "Support for /etc/nologin"
+	default y
+	depends on BB_CONFIG_LOGIN
+	help
+	  The file /etc/nologin is used by (some versions of) login(1).
+	  If it exists, non-root logins are prohibited.
+
 config BB_CONFIG_FEATURE_SECURETTY
 	bool "Support for /etc/securetty"
 	default y
 	depends on BB_CONFIG_LOGIN
 	help
-	  The file  /etc/securetty  is used by (some versions of) login(1).
+	  The file /etc/securetty is used by (some versions of) login(1).
 	  The file contains the device names of tty lines (one per line,
 	  without leading /dev/) on which root is allowed to login.
 
@@ -150,6 +182,20 @@ config BB_CONFIG_FEATURE_PASSWD_WEAK_CHECK
 	help
 	  With this option passwd will refuse new passwords which are "weak".
 
+config BB_CONFIG_CRYPTPW
+	bool "cryptpw"
+	default n
+	help
+	  Applet for crypting a string.
+
+config BB_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.
+
 config BB_CONFIG_SU
 	bool "su"
 	default n
diff --git a/config/busybox-1.4.2/miscutils/Config.in b/config/busybox/miscutils/Config.in
index f78f50b46..94017906d 100644
--- a/config/busybox-1.4.2/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Miscellaneous Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_ADJTIMEX
 	bool "adjtimex"
@@ -20,6 +20,13 @@ config BB_CONFIG_BBCONFIG
 	  The bbconfig applet will print the config file with which
 	  busybox was built.
 
+config BB_CONFIG_CHRT
+	bool "chrt"
+	default n
+	help
+	  manipulate real-time attributes of a process.
+	  This requires sched_{g,s}etparam support in your libc.
+
 config BB_CONFIG_CROND
 	bool "crond"
 	default n
@@ -105,7 +112,7 @@ config BB_CONFIG_DEVFSD_VERBOSE
 	  Increases logging to stderr or syslog.
 
 config BB_CONFIG_FEATURE_DEVFS
-	bool "Use devfs names for all devices (obsolete)"
+	bool "  Use devfs names for all devices (obsolete)"
 	default n
 	help
 	  This is obsolete and will be going away at the end of 2008..
@@ -251,25 +258,31 @@ config BB_CONFIG_MAKEDEVS
 	  'leaf' is traditionally what busybox follows, it allows multiple
 	  devices of a particluar type to be created per command.
 	  e.g. /dev/hda[0-9]
-          Device properties are passed as command line arguments.
+	  Device properties are passed as command line arguments.
 	  .
 	  'table' reads device properties from a file or stdin, allowing
 	  a batch of unrelated devices to be made with one command.
-          User/group names are allowed as an alternative to uid/gid.
+	  User/group names are allowed as an alternative to uid/gid.
 
 choice
 	prompt "Choose makedevs behaviour"
-	depends BB_CONFIG_MAKEDEVS
+	depends on BB_CONFIG_MAKEDEVS
 	default BB_CONFIG_FEATURE_MAKEDEVS_TABLE
 
 config BB_CONFIG_FEATURE_MAKEDEVS_LEAF
-        bool "leaf"
+	bool "leaf"
 
 config BB_CONFIG_FEATURE_MAKEDEVS_TABLE
 	bool "table"
 
 endchoice
 
+config BB_CONFIG_MICROCOM
+	bool "microcom"
+	default n
+	help
+	  The poor man's minicom utility for chatting with serial port devices.
+
 config BB_CONFIG_MOUNTPOINT
 	bool "mountpoint"
 	default n
@@ -284,12 +297,6 @@ config BB_CONFIG_MT
 	  to advance or rewind a tape past a specified number of archive
 	  files on the tape.
 
-config BB_CONFIG_NMETER
-	bool "nmeter"
-	default n
-	help
-	  nmeter prints various system parameters continuously.
-
 config BB_CONFIG_RAIDAUTORUN
 	bool "raidautorun"
 	default n
@@ -298,11 +305,11 @@ config BB_CONFIG_RAIDAUTORUN
 	  search and start RAID arrays.
 
 config BB_CONFIG_READAHEAD
-        bool "readahead"
+	bool "readahead"
 	default n
 	depends on BB_CONFIG_LFS
 	help
- 	  Preload the files listed on the command line into RAM cache so that
+	  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.
 
 	  This applet just calls the readahead(2) system call on each file.
@@ -315,19 +322,19 @@ config BB_CONFIG_READAHEAD
 	  run this applet as a background job.
 
 config BB_CONFIG_RUNLEVEL
-        bool "runlevel"
+	bool "runlevel"
 	default n
 	help
- 	  find the current and previous system runlevel.
+	  find the current and previous system runlevel.
 
 	  This applet uses utmp but does not rely on busybox supporing
 	  utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
 
 config BB_CONFIG_RX
-        bool "rx"
+	bool "rx"
 	default n
 	help
- 	  Receive files using the Xmodem protocol.
+	  Receive files using the Xmodem protocol.
 
 config BB_CONFIG_STRINGS
 	bool "strings"
@@ -366,6 +373,14 @@ config BB_CONFIG_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
+config BB_CONFIG_TTYSIZE
+	bool "ttysize"
+	default n
+	help
+	  A replacement for "stty size". Unlike stty, can report only width,
+	  only height, or both, in any order. It also does not complain on error,
+	  but returns default 80x24. Usage in shell scripts: width=`ttysize w`.
+
 config BB_CONFIG_WATCHDOG
 	bool "watchdog"
 	default n
diff --git a/config/busybox-1.4.2/modutils/Config.in b/config/busybox/modutils/Config.in
index ae6779348..a94deebbb 100644
--- a/config/busybox-1.4.2/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux Module Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_INSMOD
 	bool "insmod"
diff --git a/config/busybox-1.4.2/networking/Config.in b/config/busybox/networking/Config.in
index f58219fef..caaf54491 100644
--- a/config/busybox-1.4.2/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Networking Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_FEATURE_IPV6
 	bool "Enable IPv6 support"
@@ -13,17 +13,40 @@ config BB_CONFIG_FEATURE_IPV6
 	  Enable IPv6 support in busybox.
 	  This adds IPv6 support in the networking applets.
 
+config BB_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
+	bool "Preferentially use IPv4 addresses from DNS queries"
+	default y
+	depends on BB_CONFIG_FEATURE_IPV6
+	help
+	  Use IPv4 address of network host if it has one.
+
+	  If this option is off, the first returned address will be used.
+	  This may cause problems when your DNS server is IPv6-capable and
+	  is returning IPv6 host addresses too. If IPv6 address
+	  precedes IPv4 one in DNS reply, busybox network applets
+	  (e.g. wget) will use IPv6 address. On an IPv6-incapable host
+	  or network applets will fail to connect to the host
+	  using IPv6 address.
+
+config BB_CONFIG_VERBOSE_RESOLUTION_ERRORS
+	bool "Verbose resolution errors"
+	default n
+	help
+	  Enable if you are not satisfied with simplistic
+	  "can't resolve 'hostname.com'" and want to know more.
+	  This may increase size of your executable a bit.
+
 config BB_CONFIG_ARP
 	bool "arp"
 	default n
 	help
-	  Manipulate the system ARP cache
+	  Manipulate the system ARP cache.
 
 config BB_CONFIG_ARPING
 	bool "arping"
 	default n
 	help
-	  Ping hosts by ARP packets
+	  Ping hosts by ARP packets.
 
 config BB_CONFIG_DNSD
 	bool "dnsd"
@@ -68,7 +91,7 @@ config BB_CONFIG_HOSTNAME
 	bool "hostname"
 	default n
 	help
-	  Show or set the system's host name
+	  Show or set the system's host name.
 
 config BB_CONFIG_HTTPD
 	bool "httpd"
@@ -76,6 +99,23 @@ config BB_CONFIG_HTTPD
 	help
 	  Serve web pages via an HTTP server.
 
+config BB_CONFIG_FEATURE_HTTPD_RANGES
+	bool "Support 'Ranges:' header"
+	default n
+	depends on BB_CONFIG_HTTPD
+	help
+	  Makes httpd emit "Accept-Ranges: bytes" header and understand
+	  "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted
+	  downloads, seeking in multimedia players etc.
+
+config BB_CONFIG_FEATURE_HTTPD_USE_SENDFILE
+	bool "Use sendfile system call"
+	default n
+	depends on BB_CONFIG_HTTPD
+	help
+	  When enabled, httpd will use the kernel sendfile() function
+	  instead of read/write loop.
+
 config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
 	bool "Support reloading the global config file using hup signal"
 	default n
@@ -133,7 +173,7 @@ config BB_CONFIG_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 addition line in your httpd
+	  properly. You need to supply an additional line in your httpd
 	  config file:
 	  *.php:/path/to/your/php
 
@@ -155,6 +195,31 @@ config BB_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
 	  For example, httpd -e "<Hello World>" as
 	  "&#60Hello&#32World&#62".
 
+config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES
+	bool "Enable support for custom error pages"
+	default n
+	depends on BB_CONFIG_HTTPD
+	help
+	  This option allows you to define custom error pages in
+	  the configuration file instead of the default HTTP status
+	  error pages. For instance, if you add the line:
+	        E404:/path/e404.html
+	  in the config file, the server will respond the specified
+	  '/path/e404.html' file instead of the terse '404 NOT FOUND'
+	  message.
+
+config BB_CONFIG_FEATURE_HTTPD_PROXY
+	bool "Enable support for reverse proxy"
+	default n
+	depends on BB_CONFIG_HTTPD
+	help
+	  This option allows you to define URLs that will be forwarded
+	  to another HTTP server. To setup add the following line to the
+	  configuration file
+	        P:/url/:http://hostname[:port]/new/path/
+	  Then a request to /url/myfile will be forwarded to
+	  http://hostname[:port]/new/path/myfile.
+
 config BB_CONFIG_IFCONFIG
 	bool "ifconfig"
 	default n
@@ -205,7 +270,6 @@ config BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
 config BB_CONFIG_IFUPDOWN
 	bool "ifupdown"
 	default n
-	select BB_CONFIG_RUN_PARTS
 	help
 	  Activate or deactivate the specified interfaces.  This applet makes
 	  use of either "ifconfig" and "route" or the "ip" command to actually
@@ -216,8 +280,19 @@ config BB_CONFIG_IFUPDOWN
 	  against my better judgement (since this will surely result in plenty
 	  of support questions on the mailing list), I do not force you to
 	  enable these additional options.  It is up to you to supply either
-	  "ifconfig" and "route" or the "ip" command, either via busybox or via
-	  standalone utilities.
+	  "ifconfig", "route" and "run-parts" or the "ip" command, either
+	  via busybox or via standalone utilities.
+
+config BB_CONFIG_IFUPDOWN_IFSTATE_PATH
+	string "Absolute path to ifstate file"
+	default "/var/run/ifstate"
+	depends on BB_CONFIG_IFUPDOWN
+	help
+	  ifupdown keeps state information in a file called ifstate.
+	  Typically it is located in /var/run/ifstate, however
+	  some distributions tend to put it in other places
+	  (debian, for example, uses /etc/network/run/ifstate).
+	  This config option defines location of ifstate.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_IP
 	bool "Use ip applet"
@@ -260,7 +335,7 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IPV4
 	default y
 	depends on BB_CONFIG_IFUPDOWN
 	help
-	  If you want busybox to talk IPv4, leave this on.
+	  If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_IPV6
 	bool "Enable support for IPv6"
@@ -269,13 +344,14 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IPV6
 	help
 	  If you need support for IPv6, turn this option on.
 
-config BB_CONFIG_FEATURE_IFUPDOWN_IPX
-	bool "Enable support for IPX"
-	default n
-	depends on BB_CONFIG_IFUPDOWN
-	help
-	  If this option is selected you can use busybox to work with IPX
-	  networks.
+### UNUSED
+###config FEATURE_IFUPDOWN_IPX
+###	bool "Enable support for IPX"
+###	default n
+###	depends on IFUPDOWN
+###	help
+###	  If this option is selected you can use busybox to work with IPX
+###	  networks.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING
 	bool "Enable mapping support"
@@ -285,6 +361,16 @@ config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING
 	  This enables support for the "mapping" stanza, unless you have
 	  a weird network setup you don't need it.
 
+config BB_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
+	bool "Enable support for external dhcp clients"
+	default n
+	depends on BB_CONFIG_IFUPDOWN
+	help
+	  This enables support for the external dhcp clients. Clients are
+	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
+	  Otherwise, if udhcpc applet is enabled, it is used.
+	  Otherwise, ifup/ifdown will have no support for DHCP.
+
 config BB_CONFIG_INETD
 	bool "inetd"
 	default n
@@ -331,7 +417,7 @@ config BB_CONFIG_FEATURE_INETD_RPC
 	bool "Support RPC services"
 	default n
 	depends on BB_CONFIG_INETD
-	depends on BB_CONFIG_FEATURE_HAVE_RPC
+	select BB_CONFIG_FEATURE_HAVE_RPC
 	help
 	  Support Sun-RPC based services
 
@@ -388,10 +474,21 @@ config BB_CONFIG_FEATURE_IP_SHORT_FORMS
 	  ip link   -> iplink
 	  ip route  -> iproute
 	  ip tunnel -> iptunnel
+	  ip rule   -> iprule
 
 	  Say N unless you desparately need the short form of the ip
 	  object commands.
 
+config BB_CONFIG_FEATURE_IP_RARE_PROTOCOLS
+	bool "Support displaying rarely used link types"
+	default n
+	depends on BB_CONFIG_IP
+	help
+	  If you are not going to use links of type "frad", "econet",
+	  "bif" etc, you probably don't need to enable this.
+	  Ethernet, wireless, infrared, ppp/slip, ip tunnelling
+	  link types are supported without this option selected.
+
 config BB_CONFIG_IPADDR
 	bool
 	default y
@@ -453,6 +550,19 @@ config BB_CONFIG_NAMEIF
 	  # Comment
 	  new_interface_name    XX:XX:XX:XX:XX:XX
 
+config BB_CONFIG_FEATURE_NAMEIF_EXTENDED
+	bool "Extended nameif"
+	default n
+	depends on BB_CONFIG_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 BB_CONFIG_NC
 	bool "nc"
 	default n
@@ -461,7 +571,7 @@ config BB_CONFIG_NC
 	  connections.
 
 config BB_CONFIG_NC_SERVER
-	bool "Netcat server options (-lp)"
+	bool "Netcat server options (-l)"
 	default n
 	depends on BB_CONFIG_NC
 	help
@@ -482,6 +592,14 @@ config BB_CONFIG_NETSTAT
 	help
 	  netstat prints information about the Linux networking subsystem.
 
+config BB_CONFIG_FEATURE_NETSTAT_WIDE
+	bool "  Enable wide netstat output"
+	default n
+	depends on BB_CONFIG_NETSTAT
+	help
+	  Add support for wide columns. Useful when displaying IPv6 addresses
+	  (-W option).
+
 config BB_CONFIG_NSLOOKUP
 	bool "nslookup"
 	default n
@@ -495,27 +613,25 @@ config BB_CONFIG_PING
 	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
 	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
 
-config BB_CONFIG_FEATURE_FANCY_PING
-	bool "Enable fancy ping output"
-	default y
-	depends on BB_CONFIG_PING
-	help
-	  Make the output from the ping applet include statistics, and at the
-	  same time provide full support for ICMP packets.
-
 config BB_CONFIG_PING6
 	bool "ping6"
 	default n
-	depends on BB_CONFIG_FEATURE_IPV6
+	depends on BB_CONFIG_FEATURE_IPV6 && BB_CONFIG_PING
 	help
 	  This will give you a ping that can talk IPv6.
 
-config BB_CONFIG_FEATURE_FANCY_PING6
-	bool "Enable fancy ping6 output"
+config BB_CONFIG_PSCAN
+	bool "pscan"
+	default n
+	help
+	  Simple network port scanner.
+
+config BB_CONFIG_FEATURE_FANCY_PING
+	bool "Enable fancy ping output"
 	default y
-	depends on BB_CONFIG_PING6
+	depends on BB_CONFIG_PING
 	help
-	  Make the output from the ping6 applet include statistics, and at the
+	  Make the output from the ping applet include statistics, and at the
 	  same time provide full support for ICMP packets.
 
 config BB_CONFIG_ROUTE
@@ -524,6 +640,12 @@ config BB_CONFIG_ROUTE
 	help
 	  Route displays or manipulates the kernel's IP routing tables.
 
+config BB_CONFIG_SLATTACH
+	bool "slattach"
+	default n
+	help
+	  slattach is a small utility to attach network interfaces to serial lines.
+
 config BB_CONFIG_TELNET
 	bool "telnet"
 	default n
@@ -669,7 +791,7 @@ config BB_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 	help
 	  Add feature to allow for ICMP ECHO instead of UDP datagrams.
 
-source config/busybox-1.4.2/networking/udhcp/Config.in
+source config/busybox/networking/udhcp/Config.in
 
 config BB_CONFIG_VCONFIG
 	bool "vconfig"
@@ -698,13 +820,6 @@ config BB_CONFIG_FEATURE_WGET_AUTHENTICATION
 	help
 	  Support authenticated HTTP transfers.
 
-config BB_CONFIG_FEATURE_WGET_IP6_LITERAL
-	bool "Enable IPv6 literal addresses"
-	default y
-	depends on BB_CONFIG_WGET && BB_CONFIG_FEATURE_IPV6
-	help
-	  Support IPv6 address literal notation in URLs.
-
 config BB_CONFIG_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
 	default n
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
new file mode 100644
index 000000000..c448759e7
--- /dev/null
+++ b/config/busybox/networking/udhcp/Config.in
@@ -0,0 +1,107 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+config BB_CONFIG_APP_UDHCPD
+	bool "udhcp Server (udhcpd)"
+	default n
+	help
+	  uDHCPd is a DHCP server geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+	  See http://udhcp.busybox.net for further details.
+
+config BB_CONFIG_APP_DHCPRELAY
+	bool "dhcprelay"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD
+	help
+	  dhcprelay listens for dhcp requests on one or more interfaces
+	  and forwards these requests to a different interface or dhcp
+	  server.
+
+config BB_CONFIG_APP_DUMPLEASES
+	bool "Lease display utility (dumpleases)"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD
+	help
+	  dumpleases displays the leases written out by the udhcpd server.
+	  Lease times are stored in the file by time remaining in lease, or
+	  by the absolute time that it expires in seconds from epoch.
+
+	  See http://udhcp.busybox.net for further details.
+
+config BB_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
+	bool "Rewrite the lease file at every new acknowledge"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD
+	help
+	  If selected, udhcpd will write a new file with leases every
+	  time a new lease has been accepted, thus eleminating the need
+	  to send SIGUSR1 for the initial writing, or updating. Any timed
+	  rewriting remains undisturbed
+
+config BB_CONFIG_APP_UDHCPC
+	bool "udhcp Client (udhcpc)"
+	default n
+	help
+	  uDHCPc is a DHCP client geared primarily toward embedded systems,
+	  while striving to be fully functional and RFC compliant.
+
+	  The udhcp client negotiates a lease with the DHCP server and
+	  notifies a set of scripts when a lease is obtained or lost.
+
+	  See http://udhcp.busybox.net for further details.
+
+config BB_CONFIG_FEATURE_UDHCPC_ARPING
+	bool "Ask udhcpc to verify that the offered address is free, using arpping"
+	default y
+	depends on BB_CONFIG_APP_UDHCPC
+	help
+	  If selected, udhcpc will use arpping to make sure the offered address
+	  is really available. The client will DHCPDECLINE the offer if the
+	  address is in use, and restart the discover process.
+
+
+config BB_CONFIG_FEATURE_UDHCP_DEBUG
+	bool "Compile udhcp with noisy debugging messages"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
+	help
+	  If selected, udhcpd will output extra debugging output.  If using
+	  this option, compile uDHCP with "-g", and do not fork the daemon to
+	  the background.
+
+	  See http://udhcp.busybox.net for further details.
+
+config BB_CONFIG_FEATURE_RFC3397
+	bool "Support for RFC3397 domain search (experimental)"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
+	help
+	  If selected, both client and server will support passing of domain
+	  search lists via option 119, specified in RFC3397.
+
+config BB_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
+	int "DHCP options slack buffer size"
+	default 80
+	range 0 924
+	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
+	help
+	  Some buggy DHCP servers will send DHCP offer packets with option
+	  field larger than we expect (which might also be considered a
+	  buffer overflow attempt). These packets are normally discarded.
+	  If circumstances beyond your control force you to support such
+	  servers, this may help. The upper limit (924) makes dhcpc accept
+	  even 1500 byte packets (maximum-sized ethernet packets).
+
+	  This options does not make dhcp[cd] emit non-standard
+	  sized packets.
+
+	  Known buggy DHCP servers:
+	  3Com OfficeConnect Remote 812 ADSL Router:
+	    seems to confuse maximum allowed UDP packet size with
+	    maximum size of entire IP packet, and sends packets which are
+	    28 bytes too large.
+	  Seednet (ISP) VDSL: sends packets 2 bytes too big.
diff --git a/config/busybox-1.4.2/procps/Config.in b/config/busybox/procps/Config.in
index 6c48b436b..1ef1d3ee2 100644
--- a/config/busybox-1.4.2/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Process Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_FREE
 	bool "free"
@@ -44,6 +44,18 @@ config BB_CONFIG_KILLALL5
 	default n
 	depends on BB_CONFIG_KILL
 
+config BB_CONFIG_NMETER
+	bool "nmeter"
+	default n
+	help
+	  Prints selected system stats continuously, one line per update.
+
+config BB_CONFIG_PGREP
+	bool "pgrep"
+	default n
+	help
+	  Look for processes by name.
+
 config BB_CONFIG_PIDOF
 	bool "pidof"
 	default n
@@ -67,6 +79,12 @@ config BB_CONFIG_FEATURE_PIDOF_OMIT
 	  The special pid %PPID can be used to name the parent process
 	  of the pidof, in other words the calling shell or shell script.
 
+config BB_CONFIG_PKILL
+	bool "pkill"
+	default n
+	help
+	  Send signals to processes by name.
+
 config BB_CONFIG_PS
 	bool "ps"
 	default n
@@ -103,11 +121,32 @@ config BB_CONFIG_TOP
 	  system.
 
 config BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-	bool "Support showing CPU usage percentage (add 2k bytes)"
+	bool "Show CPU per-process usage percentage (adds 2k bytes)"
+	default y
+	depends on BB_CONFIG_TOP
+	help
+	  Make top display CPU usage for each process.
+
+config BB_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	bool "Show CPU global usage percentage (adds 0.5k bytes)"
 	default y
+	depends on BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Makes top display "CPU: NN% usr NN% sys..." line.
+
+config BB_CONFIG_FEATURE_TOP_DECIMALS
+	bool "Show 1/10th of a percent in CPU/mem statistics (adds 0.3k bytes)"
+	default n
+	depends on BB_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Show 1/10th of a percent in CPU/mem statistics.
+
+config BB_CONFIG_FEATURE_TOPMEM
+	bool "topmem"
+	default n
 	depends on BB_CONFIG_TOP
 	help
-	  Make top display CPU usage.
+	  Enable 's' in top (gives lots of memory info)
 
 config BB_CONFIG_UPTIME
 	bool "uptime"
@@ -117,6 +156,14 @@ config BB_CONFIG_UPTIME
 	  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 BB_CONFIG_WATCH
+	bool "watch"
+	default n
+	#huh?? select DATE
+	help
+	  watch is used to execute a program periodically, showing
+	  output to the screen.
+
 
 endmenu
 
diff --git a/config/busybox-1.4.2/runit/Config.in b/config/busybox/runit/Config.in
index fa2b37ef2..e0ad9b329 100644
--- a/config/busybox-1.4.2/runit/Config.in
+++ b/config/busybox/runit/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Runit Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_RUNSV
 	bool "runsv"
diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in
new file mode 100644
index 000000000..b5764f507
--- /dev/null
+++ b/config/busybox/selinux/Config.in
@@ -0,0 +1,124 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Selinux Utilities"
+	depends on BUSYBOX
+	depends on BB_CONFIG_SELINUX
+
+config BB_CONFIG_CHCON
+	bool "chcon"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to change the security context of file.
+
+config BB_CONFIG_FEATURE_CHCON_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BB_CONFIG_CHCON && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the chcon applet.
+
+config BB_CONFIG_GETENFORCE
+	bool "getenforce"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to get the current mode of SELinux.
+
+config BB_CONFIG_GETSEBOOL
+	bool "getsebool"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to get SELinux boolean values.
+
+config BB_CONFIG_LOAD_POLICY
+	bool "load_policy"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to load SELinux policy.
+
+config BB_CONFIG_MATCHPATHCON
+	bool "matchpathcon"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to get default security context of the
+	  specified path from the file contexts configuration.
+
+config BB_CONFIG_RESTORECON
+	bool "restorecon"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to relabel files. The feature is almost
+	  the same as setfiles, but usage is a little different.
+
+config BB_CONFIG_RUNCON
+	bool "runcon"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to run command in speficied security context.
+
+config BB_CONFIG_FEATURE_RUNCON_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on BB_CONFIG_RUNCON && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the runcon applet.
+
+config BB_CONFIG_SELINUXENABLED
+	bool "selinuxenabled"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support for this command to be used within shell scripts
+	  to determine if selinux is enabled.
+
+config BB_CONFIG_SETENFORCE
+	bool "setenforce"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to modify the mode SELinux is running in.
+
+config BB_CONFIG_SETFILES
+	bool "setfiles"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support to modify to relabel files.
+	  Notice: If you built libselinux with -D_FILE_OFFSET_BITS=64,
+	  (It is default in libselinux's Makefile), you _must_ enable
+	  CONFIG_LFS.
+
+config BB_CONFIG_FEATURE_SETFILES_CHECK_OPTION
+	bool "Enable check option"
+	default n
+	depends on BB_CONFIG_SETFILES
+	help
+	  Support "-c" option (check the validity of the contexts against
+	  the specified binary policy) for setfiles. Requires libsepol.
+
+config BB_CONFIG_SETSEBOOL
+	bool "setsebool"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Enable support for change boolean.
+	  semanage and -P option is not supported yet.
+
+config BB_CONFIG_SESTATUS
+	bool "sestatus"
+	default n
+	depends on BB_CONFIG_SELINUX
+	help
+	  Displays the status of SELinux.
+
+endmenu
+
diff --git a/config/busybox-1.4.2/shell/Config.in b/config/busybox/shell/Config.in
index 2539a0575..fcb98b804 100644
--- a/config/busybox-1.4.2/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Shells"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 choice
 	prompt "Choose your default shell"
@@ -21,9 +21,9 @@ config BB_CONFIG_FEATURE_SH_IS_HUSH
 	select BB_CONFIG_HUSH
 	bool "hush"
 
-config BB_CONFIG_FEATURE_SH_IS_LASH
-	select BB_CONFIG_LASH
-	bool "lash"
+####config FEATURE_SH_IS_LASH
+####	select LASH
+####	bool "lash"
 
 config BB_CONFIG_FEATURE_SH_IS_MSH
 	select BB_CONFIG_MSH
@@ -108,7 +108,7 @@ config BB_CONFIG_ASH_BUILTIN_ECHO
 	select BB_CONFIG_ECHO
 	depends on BB_CONFIG_ASH
 	help
-	  Enable support for echo, built in to ash.
+	  Enable support for echo, builtin to ash.
 
 config BB_CONFIG_ASH_BUILTIN_TEST
 	bool "Builtin version of 'test'"
@@ -116,7 +116,7 @@ config BB_CONFIG_ASH_BUILTIN_TEST
 	select BB_CONFIG_TEST
 	depends on BB_CONFIG_ASH
 	help
-	  Enable support for test, built in to ash.
+	  Enable support for test, builtin to ash.
 
 config BB_CONFIG_ASH_CMDCMD
 	bool "'command' command to override shell builtins"
@@ -167,6 +167,7 @@ config BB_CONFIG_HUSH
 	select BB_CONFIG_TRUE
 	select BB_CONFIG_FALSE
 	select BB_CONFIG_TEST
+	select BB_CONFIG_ECHO
 	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
@@ -177,20 +178,61 @@ config BB_CONFIG_HUSH
 	  word ), arithmetic expansion, aliases, brace expansion, tilde
 	  expansion, &> and >& redirection of stdout+stderr, etc.
 
+config BB_CONFIG_HUSH_HELP
+	bool "help builtin"
+	default n
+	depends on BB_CONFIG_HUSH
+	help
+	  Enable help builtin in hush. Code size + ~1 kbyte.
+
+config BB_CONFIG_HUSH_INTERACTIVE
+	bool "Interactive mode"
+	default y
+	depends on BB_CONFIG_HUSH
+	help
+	  Enable interactive mode (prompt and command editing).
+	  Without this, hush simply reads and executes commands
+	  from stdin just like a shell script from the file.
+	  No prompt, no PS1/PS2 magic shell variables.
+
+config BB_CONFIG_HUSH_JOB
+	bool "Job control"
+	default n
+	depends on BB_CONFIG_HUSH_INTERACTIVE
+	help
+	  Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current
+	  command (not entire shell), fg/bg builtins work. Without this option,
+	  "cmd &" still works by simply spawning a process and immediately
+	  prompting for next command (or executing next command in a script),
+	  but no separate process group is formed.
+
+config BB_CONFIG_HUSH_TICK
+	bool "Process substitution"
+	default n
+	depends on BB_CONFIG_HUSH
+	help
+	  Enable process substitution `command` and $(command) in hush.
+
+config BB_CONFIG_HUSH_IF
+	bool "Support if/then/elif/else/fi"
+	default n
+	depends on BB_CONFIG_HUSH
+	help
+	  Enable if/then/elif/else/fi in hush.
+
+config BB_CONFIG_HUSH_LOOPS
+	bool "Support for, while and until loops"
+	default n
+	depends on BB_CONFIG_HUSH
+	help
+	  Enable for, while and until loops in hush.
 
 config BB_CONFIG_LASH
 	bool "lash"
 	default n
-	select BB_CONFIG_TRUE
-	select BB_CONFIG_FALSE
-	select BB_CONFIG_TEST
+	select BB_CONFIG_HUSH
 	help
-	  lash is the very smallest shell (adds just 10k) and it is quite
-	  usable as a command prompt, but it is not suitable for any but the
-	  most trivial scripting (such as an initrd that calls insmod a few
-	  times) since it does not understand any Bourne shell grammar.  It
-	  does handle pipes, redirects, and job control though.  Adding in
-	  command editing makes it a very nice lightweight command prompt.
+	  lash is deprecated and will be removed, please migrate to hush.
 
 
 config BB_CONFIG_MSH
@@ -217,12 +259,12 @@ config BB_CONFIG_FEATURE_SH_EXTRA_QUIET
 	help
 	  Remove the busybox introduction when starting a shell.
 
-config BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
+config BB_CONFIG_FEATURE_SH_STANDALONE
 	bool "Standalone shell"
 	default n
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
+	depends on (BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH) && BB_CONFIG_FEATURE_PREFER_APPLETS
 	help
-	  This option causes the selected busybox shell to use busybox applets
+	  This option causes busybox shells to use busybox applets
 	  in preference to executables in the PATH whenever possible.  For
 	  example, entering the command 'ifconfig' into the shell would cause
 	  busybox to use the ifconfig busybox applet.  Specifying the fully
@@ -231,66 +273,43 @@ config BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
 	  is generally used when creating a statically linked version of busybox
 	  for use as a rescue shell, in the event that you screw up your system.
 
-	  Note that this will *also* cause applets to take precedence
-	  over shell builtins of the same name.  So turning this on will
-	  eliminate any performance gained by turning on the builtin "echo"
-	  and "test" commands in ash.
-
-	  Note that when using this option, the shell will attempt to directly
-	  run '/bin/busybox'.  If you do not have the busybox binary sitting in
-	  that exact location with that exact name, this option will not work at
-	  all.
-
-config BB_CONFIG_FEATURE_COMMAND_EDITING
-	bool "Command line editing"
-	default n
-	depends on BB_CONFIG_MSH || BB_CONFIG_LASH || BB_CONFIG_HUSH || BB_CONFIG_ASH
-	help
-	  Enable command editing in shell.
-
-config BB_CONFIG_FEATURE_COMMAND_EDITING_VI
-	bool "vi-style line editing commands"
+	  This is implemented by re-execing /proc/self/exe (typically)
+	  with right parameters. Some selected applets ("NOFORK" applets)
+	  can even be executed without creating new process.
+	  Instead, busybox will call <applet>_main() internally.
+
+	  However, this causes problems in chroot jails without mounted /proc
+	  and with ps/top (command name can be shown as 'exe' for applets
+	  started this way).
+# untrue?
+#	  Note that this will *also* cause applets to take precedence
+#	  over shell builtins of the same name.  So turning this on will
+#	  eliminate any performance gained by turning on the builtin "echo"
+#	  and "test" commands in ash.
+# untrue?
+#	  Note that when using this option, the shell will attempt to directly
+#	  run '/bin/busybox'.  If you do not have the busybox binary sitting in
+#	  that exact location with that exact name, this option will not work at
+#	  all.
+
+config BB_CONFIG_CTTYHACK
+	bool "cttyhack"
 	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
 	help
-	  Enable vi-style line editing in the shell.  This mode can be
-	  turned on and off with "set -o vi" and "set +o vi".
-
-config BB_CONFIG_FEATURE_COMMAND_HISTORY
-	int "History size"
-	range 0 99999
-	default 15
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
-	help
-	  Specify command history size in shell.
+	  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.
+	  This device is special - it cannot be a controlling tty.
 
-config BB_CONFIG_FEATURE_COMMAND_SAVEHISTORY
-	bool "History saving"
-	default n
-	depends on BB_CONFIG_ASH && BB_CONFIG_FEATURE_COMMAND_EDITING
-	help
-	  Enable history saving in ash shell.
-
-config BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-	bool "Tab completion"
-	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
-	help
-	  Enable tab completion in shell.
+	  Proper solution is to use correct device instead of /dev/console.
 
-config BB_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
-	bool "Username completion"
-	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-	help
-	  Enable username completion in shell.
+	  cttyhack provides "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. Usage example for /etc/inittab
+	  (for busybox init):
 
-config BB_CONFIG_FEATURE_SH_FANCY_PROMPT
-	bool "Fancy shell prompts"
-	default n
-	depends on BB_CONFIG_FEATURE_COMMAND_EDITING
-	help
-	  Setting this option allows for prompts to use things like \w and
-	  \$ and also using escape codes.
+	  ::respawn:/bin/cttyhack /bin/sh
 
 endmenu
diff --git a/config/busybox-1.4.2/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 1e3225b0a..518210173 100644
--- a/config/busybox-1.4.2/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "System Logging Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_SYSLOGD
 	bool "syslogd"
@@ -58,8 +58,9 @@ config BB_CONFIG_FEATURE_IPC_SYSLOG
 	  break badly.
 
 config BB_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
-	int "Circular buffer size in Kbytes (minimum 4KB)"
+	int "    Circular buffer size in Kbytes (minimum 4KB)"
 	default 16
+	range 4 2147483647
 	depends on BB_CONFIG_FEATURE_IPC_SYSLOG
 	help
 	  This option sets the size of the circular buffer
@@ -89,8 +90,6 @@ config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
 config BB_CONFIG_KLOGD
 	bool "klogd"
 	default n
-	depends on BB_CONFIG_SYSLOGD
-	select BB_CONFIG_FEATURE_SYSLOG
 	help
 	  klogd is a utility which intercepts and logs all
 	  messages from the Linux kernel and sends the messages
diff --git a/config/busybox-1.4.2/util-linux/Config.in b/config/busybox/util-linux/Config.in
index 4303be67c..f3df2454b 100644
--- a/config/busybox-1.4.2/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux System Utilities"
-  depends on BUSYBOX
+	depends on BUSYBOX
 
 config BB_CONFIG_DMESG
 	bool "dmesg"
@@ -128,7 +128,7 @@ config BB_CONFIG_FEATURE_SGI_LABEL
 config BB_CONFIG_FEATURE_SUN_LABEL
 	bool "Support SUN disklabels"
 	default n
- 	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BB_CONFIG_FDISK && BB_CONFIG_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change SUN disklabels.
 	  Most people can safely leave this option disabled.
@@ -182,7 +182,7 @@ config BB_CONFIG_MKFS_MINIX
 	  this utility will do the job for you.
 
 comment "Minix filesystem support"
-    depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX
+	depends on BB_CONFIG_FSCK_MINIX || BB_CONFIG_MKFS_MINIX
 
 config BB_CONFIG_FEATURE_MINIX2
 	bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
@@ -211,6 +211,23 @@ config BB_CONFIG_HEXDUMP
 	  The hexdump utility is used to display binary data in a readable
 	  way that is comparable to the output from most hex editors.
 
+config BB_CONFIG_HD
+	bool "hd"
+	default n
+	select BB_CONFIG_HEXDUMP
+	help
+	  hd is an alias to hexdump -C.
+
+config BB_CONFIG_FEATURE_HEXDUMP_REVERSE
+	bool "Support -R, reverse of 'hexdump -Cv'"
+	default n
+	depends on BB_CONFIG_HEXDUMP
+	help
+	  The hexdump utility is used to display binary data in an ascii
+	  readable way. This option creates binary data from an ascii input.
+	  NB: this option is non-standard. It's unwise to use it in scripts
+	  aimed to be portable.
+
 config BB_CONFIG_HWCLOCK
 	bool "hwclock"
 	default n
@@ -270,46 +287,41 @@ config BB_CONFIG_MDEV
 	bool "mdev"
 	default n
 	help
-	  mdev is a mini-udev implementation: call it with -s to populate
-	  /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to
-	  have it handle hotplug events afterwards.  Device names are taken
-	  from sysfs.
+	  mdev is a mini-udev implementation for dynamically creating device
+	  nodes in the /dev directory.
+
+	  For more information, please see docs/mdev.txt
 
 config BB_CONFIG_FEATURE_MDEV_CONF
 	bool "Support /etc/mdev.conf"
 	default n
 	depends on BB_CONFIG_MDEV
 	help
-	  The mdev config file contains lines that look like:
-
-	    hd[a-z][0-9]* 0:3 660
+	  Add support for the mdev config file to control ownership and
+	  permissions of the device nodes.
 
-	  That's device name (with regex match), uid:gid, and permissions.
-
-	  Config file parsing stops on the first matching line.  If no config
-	  entry is matched, devices are created with default 0:0 660.  (Make
-	  the last line match .* to override this.)
+	  For more information, please see docs/mdev.txt
 
 config BB_CONFIG_FEATURE_MDEV_EXEC
 	bool "Support command execution at device addition/removal"
 	default n
 	depends on BB_CONFIG_FEATURE_MDEV_CONF
 	help
-	  This adds support for an optional field to /etc/mdev.conf, consisting
-	  of a special character and a command line to run after creating the
-	  corresponding device(s) and before removing, ala:
-
-	    hdc root:cdrom 660  *ln -s $MDEV cdrom
+	  This adds support for an optional field to /etc/mdev.conf for
+	  executing commands when devices are created/removed.
 
-	  The $MDEV environment variable is set to the name of the device.
+	  For more information, please see docs/mdev.txt
 
-	  The special characters and their meanings are:
-	    @ Run after creating the device.
-	    $ Run before removing the device.
-	    * Run both after creating and before removing the device.
+config BB_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
+	bool "Support loading of firmwares"
+	default n
+	depends on BB_CONFIG_MDEV
+	help
+	  Some devices need to load firmware before they can be usable.
 
-	  Commands are executed via system() so you need /bin/sh, meaning you
-	  probably want to select a default shell in the Shells menu.
+	  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 BB_CONFIG_MKSWAP
 	bool "mkswap"
@@ -366,11 +378,21 @@ config BB_CONFIG_MOUNT
 	  NFS filesystems.  Most people using BusyBox will also want to enable
 	  the 'mount' utility.
 
+config BB_CONFIG_FEATURE_MOUNT_HELPERS
+	bool "Support mount helpers"
+	default n
+	depends on BB_CONFIG_MOUNT
+	help
+	  Enable mounting of virtual file systems via external helpers.
+	  E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call
+	  obexfs -b00.11.22.33.44.55 /mnt
+	  The idea is to use such virtual filesystems in /etc/fstab
+
 config BB_CONFIG_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems"
 	default n
 	depends on BB_CONFIG_MOUNT
-	depends on BB_CONFIG_FEATURE_HAVE_RPC
+	select BB_CONFIG_FEATURE_HAVE_RPC
 	select BB_CONFIG_FEATURE_SYSLOG
 	help
 	  Enable mounting of NFS file systems.
@@ -496,7 +518,7 @@ config BB_CONFIG_FEATURE_MOUNT_LOOP
 	  The umount command will also free that loopback device.
 
 	  You can still use the 'losetup' utility (to manually associate files
-          with loop devices) if you need to do something advanced, such as
+	  with loop devices) if you need to do something advanced, such as
 	  specify an offset or cryptographic options to the loopback device.
 	  (If you don't want umount to free the loop device, use "umount -D".)