* busybox: version bump from 1.1.0 to 1.1.3

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

22 files changed, 459 insertions, 322 deletions

diff --git a/config/busybox-1.1.0/Extract b/config/busybox-1.1.0/Extract
deleted file mode 100755
index 56688f9f9..000000000
--- a/config/busybox-1.1.0/Extract
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl
-
-# find out which version of busybox we have; this is taken from the name
-# of this directory
-$bb_version = `basename \`pwd\``;
-chomp $bb_version;
-$bb_version =~ s/busybox-//;
-
-#
-# first extract all configuration files from the original source tree
-#
-
-@configfiles = `find ../../build-target/busybox* -name "Config.in"`;
-
-while($_ = shift @configfiles) {
-	chomp $_;
-	my $filename = $_;   $filename =~ s/(.*\/busybox.*?)\/(.*$)/$2/;
-	my $dir = $filename; $dir      =~ s/(.*\/)(.*$)/$1/;
-	system("mkdir -p $dir");
-	system("../../scripts/mkprefix -v -p BB_ < $_ > $filename");
-}
-
-
-#
-# fix some entries 
-# 
-
-print "---------------------------------------------------------------------\n";
-print "Fixing some stuff...\n";
-print "---------------------------------------------------------------------\n";
-
-@fixfiles = `find . -name "Config.in"`;
-
-while($file = shift @fixfiles) {
-
-	open (FILE, "$file");
-	@file = <FILE>;
-	close FILE;
-
-	for (@file) { $_ =~ s/^source (.*)/source config\/busybox-$bb_version\/$1/g; }
-	for (@file) { $_ =~ s/^mainmenu (.*$)/# mainmenu $1/g;           }
-	for (@file) { $_ =~ s/^(menu .*)$/$1\n	depends on BUSYBOX/g;    }
-
-	open (FILE, ">$file");
-	print FILE @file;
-	close FILE;
-
-}
diff --git a/config/busybox-1.1.0/sysdeps/linux/Config.in b/config/busybox-1.1.3/Config.in
index 7e3d20a46..f0114cbf4 100644
--- a/config/busybox-1.1.0/sysdeps/linux/Config.in
+++ b/config/busybox-1.1.3/Config.in
@@ -9,8 +9,11 @@ config BB_HAVE_DOT_CONFIG
 	bool
 	default y
 
+menu "Busybox Settings"
+  depends on BUSYBOX
+
 menu "General Configuration"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 choice
 	prompt "Buffer allocation policy"
@@ -81,10 +84,12 @@ config BB_CONFIG_FEATURE_CLEAN_UP
 	bool "Clean up all memory before exiting (usually not needed)"
 	default n
 	help
-	  As a size optimization, busybox by default does not cleanup memory
-	  that is dynamically allocated or close files before exiting. This
-	  saves space and is usually not needed since the OS will clean up for
-	  us.  Don't enable this unless you have a really good reason to clean
+	  As a size optimization, busybox normally exits without explicitly
+	  freeing dynamically allocated memory or closing files.  This saves
+	  space since the OS will clean up for us, but it can confuse debuggers
+	  like valgrind, which report tons of memory and resource leaks.
+
+	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
 config BB_CONFIG_FEATURE_SUID
@@ -150,7 +155,7 @@ config BB_CONFIG_SELINUX
 endmenu
 
 menu 'Build Options'
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_STATIC
 	bool "Build BusyBox as a static binary (no shared libs)"
@@ -166,6 +171,48 @@ config BB_CONFIG_STATIC
 
 	  Most people will leave this set to 'N'.
 
+# The busybox shared library feature is there so make standalone can produce
+# smaller applets.  Since make standalone isn't in yet, there's nothing using
+# this yet, and so it's disabled.
+config BB_CONFIG_DISABLE_SHARED
+	bool
+	default n
+
+config BB_CONFIG_BUILD_LIBBUSYBOX
+	bool "Build shared libbusybox"
+	default n
+	depends on BB_CONFIG_DISABLE_SHARED
+	help
+	  Build a shared library libbusybox.so which contains all
+	  libraries used inside busybox.
+
+config BB_CONFIG_FEATURE_FULL_LIBBUSYBOX
+	bool "Feature-complete libbusybox"
+	default n if !BB_CONFIG_FEATURE_SHARED_BUSYBOX
+	depends on BB_CONFIG_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_SHARED_BUSYBOX
+	bool "Use shared libbusybox for busybox"
+	default y if BB_CONFIG_BUILD_LIBBUSYBOX
+	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.
+
 config BB_CONFIG_LFS
 	bool "Build with Large File Support (for accessing files > 2 GB)"
 	default n
@@ -205,91 +252,29 @@ config BB_EXTRA_CFLAGS_OPTIONS
 	  if you want to add some simple compiler switches (like -march=iBB_686),
 	  or check for warnings using -Werror, just those options here.
 
-config BB_CONFIG_FEATURE_SUSv2
-	bool "Enable features that are in SuSv2 but not SuSv3?"
-	default y
-	help
-	  This option will enable backwards compatability with SuSv2,
-	  specifically, numeric options such as 'head -1 <file>' will be
-	  supported.
-
-config BB_CONFIG_FEATURE_SUSv2_OBSOLETE
-	bool "Enable features that are obsolete in SuSv2"
-	depends on BB_CONFIG_FEATURE_SUSvBB_2
-	default y
-	help
-	  Disables support for numeric arguments in fold.
-
-endmenu
-
-menu 'Installation Options'
-	depends on BUSYBOX
-
-config BB_CONFIG_INSTALL_NO_USR
-	bool "Don't use /usr"
+config BB_CONFIG_BUILD_AT_ONCE
+	bool "Compile all sources at once"
 	default n
 	help
-	  Disable use of /usr. Don't activate this option if you don't know
-	  that you really want this behaviour.
-
-choice
-       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.
-
-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.
-
-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 applets links. Usefull when using the -install feature
-         or a standalone shell for rescue pruposes.
-
-endchoice
+	  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.
 
-config BB_PREFIX
-	string "BusyBox installation prefix"
-	default "./_install"
-	help
-	  Define your directory to install BusyBox files/subdirs in.
+	  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
 
-source config/busybox-1.1.0/archival/Config.in
-source config/busybox-1.1.0/coreutils/Config.in
-source config/busybox-1.1.0/console-tools/Config.in
-source config/busybox-1.1.0/debianutils/Config.in
-source config/busybox-1.1.0/e2fsprogs/Config.in
-source config/busybox-1.1.0/editors/Config.in
-source config/busybox-1.1.0/findutils/Config.in
-source config/busybox-1.1.0/init/Config.in
-source config/busybox-1.1.0/loginutils/Config.in
-source config/busybox-1.1.0/miscutils/Config.in
-source config/busybox-1.1.0/modutils/Config.in
-source config/busybox-1.1.0/networking/Config.in
-source config/busybox-1.1.0/procps/Config.in
-source config/busybox-1.1.0/shell/Config.in
-source config/busybox-1.1.0/sysklogd/Config.in
-source config/busybox-1.1.0/util-linux/Config.in
-
 menu 'Debugging Options'
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_DEBUG
 	bool "Build BusyBox with Debugging symbols"
@@ -345,5 +330,83 @@ config BB_CONFIG_EFENCE
 
 endchoice
 
+config BB_CONFIG_DEBUG_YANK_SUSv2
+	bool "Disable obsolete features removed before SUSv3?"
+	default y
+	help
+	  This option will disable backwards compatability with SuSv2,
+	  specifically, old-style numeric options ('command -1 <file>')
+	  will not be supported in head, tail, and fold.  (Note: should
+	  yank from renice too.)
+
+endmenu
+
+menu 'Installation Options'
+  depends on BUSYBOX
+
+config BB_CONFIG_INSTALL_NO_USR
+	bool "Don't use /usr"
+	default n
+	help
+	  Disable use of /usr. Don't activate this option if you don't know
+	  that you really want this behaviour.
+
+choice
+       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.
+
+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.
+
+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 applets links. Usefull when using the -install feature
+         or a standalone shell for rescue pruposes.
+
+endchoice
+
+config BB_PREFIX
+	string "BusyBox installation prefix"
+	default "./_install"
+	help
+	  Define your directory to install BusyBox files/subdirs in.
+
+endmenu
+
+source config/busybox-1.1.3/libbb/Config.in
 
 endmenu
+
+comment "Applets"
+
+source config/busybox-1.1.3/archival/Config.in
+source config/busybox-1.1.3/coreutils/Config.in
+source config/busybox-1.1.3/console-tools/Config.in
+source config/busybox-1.1.3/debianutils/Config.in
+source config/busybox-1.1.3/editors/Config.in
+source config/busybox-1.1.3/findutils/Config.in
+source config/busybox-1.1.3/init/Config.in
+source config/busybox-1.1.3/loginutils/Config.in
+source config/busybox-1.1.3/e2fsprogs/Config.in
+source config/busybox-1.1.3/modutils/Config.in
+source config/busybox-1.1.3/util-linux/Config.in
+source config/busybox-1.1.3/miscutils/Config.in
+source config/busybox-1.1.3/networking/Config.in
+source config/busybox-1.1.3/procps/Config.in
+source config/busybox-1.1.3/shell/Config.in
+source config/busybox-1.1.3/sysklogd/Config.in
diff --git a/config/busybox-1.1.3/Extract b/config/busybox-1.1.3/Extract
new file mode 100755
index 000000000..1c042546a
--- /dev/null
+++ b/config/busybox-1.1.3/Extract
@@ -0,0 +1,34 @@
+#!/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")
+
+#
+# first extract all configuration files from the original source tree
+#
+
+for cfgfile in $(find ../../build-target/busybox*/ -name "Config.in"); do 
+	new_cfgfile=$(echo $cfgfile | sed -e "s~../../build-target/busybox-${bb_version}~\.~g")
+	dir=$(echo $new_cfgfile | sed -e "s~Config\.in~~g")
+	mkdir -p $dir
+	../../scripts/mkprefix -v -p BB_ < $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.1.0/Remove b/config/busybox-1.1.3/Remove
index d7740740d..d7740740d 100755
--- a/config/busybox-1.1.0/Remove
+++ b/config/busybox-1.1.3/Remove
diff --git a/config/busybox-1.1.0/archival/Config.in b/config/busybox-1.1.3/archival/Config.in
index 261ee2fee..b1022d9ef 100644
--- a/config/busybox-1.1.0/archival/Config.in
+++ b/config/busybox-1.1.3/archival/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Archival Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_AR
 	bool "ar"
@@ -48,10 +48,10 @@ config BB_CONFIG_BUNZIP2
 	  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.
-	
+
 	  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.
 
@@ -74,7 +74,7 @@ config BB_CONFIG_DPKG
 	default n
 	help
 	  dpkg is a medium-level tool to install, build, remove and manage Debian packages.
-	
+
 	  This implementation of dpkg has a number of limitations, you should use the
 	  official dpkg if possible.
 
@@ -83,9 +83,9 @@ config BB_CONFIG_DPKG_DEB
 	default n
 	help
 	  dpkg-deb packs, unpacks and provides information about Debian archives.
-	
+
 	  This implementation of dpkg-deb cannot pack archives.
-	
+
 	  Unless you have a specific application which requires dpkg-deb, you should
 	  probably say N here.
 
@@ -158,6 +158,14 @@ config BB_CONFIG_FEATURE_TAR_BZIP2
 	  If you enable this option you'll be able to extract
 	  archives compressed with bzip2.
 
+config BB_CONFIG_FEATURE_TAR_LZMA
+	bool "  Enable -a option to handle .tar.lzma files"
+	default n
+	depends on BB_CONFIG_TAR
+	help
+	  If you enable this option you'll be able to extract
+	  archives compressed with lzma.
+
 config BB_CONFIG_FEATURE_TAR_FROM
 	bool "  Enable -X (exclude from) and -T (include from) options)"
 	default n
@@ -213,6 +221,29 @@ config BB_CONFIG_UNCOMPRESS
 	  uncompress is used to decompress archives created by compress.
 	  Not much used anymore, replaced by gzip/gunzip.
 
+config BB_CONFIG_UNLZMA
+	bool "unlzma"
+	default n
+	help
+	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
+	  compression algorithm, and range coding.  Compression
+	  is generally considerably better than that achieved by the bzip2
+	  compressors.
+
+	  The BusyBox unlzma applet is limited to de-compression 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 BB_CONFIG_FEATURE_LZMA_FAST
+	bool "  Optimze unlzma for speed"
+	default n
+	depends on BB_CONFIG_UNLZMA
+	help
+	  This option reduce decompression time by about 33% at the cost of
+	  a 2K bigger binary.
+
 config BB_CONFIG_UNZIP
 	bool "unzip"
 	default n
@@ -242,7 +273,7 @@ config BB_CONFIG_FEATURE_DEB_TAR_GZ
 	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
 	help
 	  This is the default compression method inside the debian ar file.
-	
+
 	  If you want compatibility with standard .deb's you should say yes here.
 
 config BB_CONFIG_FEATURE_DEB_TAR_BZ2
@@ -252,8 +283,19 @@ config BB_CONFIG_FEATURE_DEB_TAR_BZ2
 	help
 	  This allows dpkg and dpkg-deb to extract deb's that are compressed internally
 	  with bzip2 instead of gzip.
-	
+
 	  You only want this if you are creating your own custom debian packages that
 	  use an internal control.tar.bz2 or data.tar.bz2.
 
+config BB_CONFIG_FEATURE_DEB_TAR_LZMA
+	bool "  lzma debian packages"
+	default n
+	depends on BB_CONFIG_DPKG || BB_CONFIG_DPKG_DEB
+	help
+	  This allows dpkg and dpkg-deb to extract deb's that are compressed
+          internally with lzma instead of gzip.
+
+	  You only want this if you are creating your own custom debian
+          packages that use an internal control.tar.lzma or data.tar.lzma.
+
 endmenu
diff --git a/config/busybox-1.1.0/console-tools/Config.in b/config/busybox-1.1.3/console-tools/Config.in
index dd3ea63be..79169b6f2 100644
--- a/config/busybox-1.1.0/console-tools/Config.in
+++ b/config/busybox-1.1.3/console-tools/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Console Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_CHVT
 	bool "chvt"
diff --git a/config/busybox-1.1.0/coreutils/Config.in b/config/busybox-1.1.3/coreutils/Config.in
index 44c5d8e6b..ab4b4cf5f 100644
--- a/config/busybox-1.1.0/coreutils/Config.in
+++ b/config/busybox-1.1.3/coreutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Coreutils"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_BASENAME
 	bool "basename"
@@ -80,20 +80,12 @@ config BB_CONFIG_CUT
 	  cut is used to print selected parts of lines from
 	  each file to stdout.
 
-if BB_CONFIG_WATCH
-	config BB_CONFIG_DATE
-		default y
-	comment "date (forced enabled for use with watch)"
-endif
-
-if !BB_CONFIG_WATCH
-    config BB_CONFIG_DATE
-	    bool "date"
-	    default n
-	    help
-	      date is used to set the system date or display the
-	      current time in the given format.
-endif
+config BB_CONFIG_DATE
+	bool "date"
+	default n
+	help
+	  date is used to set the system date or display the
+	  current time in the given format.
 
 config BB_CONFIG_FEATURE_DATE_ISOFMT
 	bool "  Enable ISO date format output (-I)"
@@ -180,19 +172,20 @@ config BB_CONFIG_EXPR
 	  expr is used to calculate numbers and print the result
 	  to standard output.
 
-if BB_CONFIG_HUSH || BB_CONFIG_LASH || BB_CONFIG_MSH
-	config BB_CONFIG_FALSE
-		default y
-	comment "false (forced enabled for use with shell)"
-endif
+config BB_CONFIG_EXPR_MATH_SUPPORT_64
+	bool "    Extend Posix numbers support to 64 bit"
+	default n
+	depends on BB_CONFIG_EXPR
+	help
+	  Enable 64-bit math support in the expr applet.  This will make
+	  the applet slightly larger, but will allow computation with very
+	  large numbers.
 
-if !BB_CONFIG_HUSH && !BB_CONFIG_LASH && !BB_CONFIG_MSH
-    config BB_CONFIG_FALSE
-	    bool "false"
-	    default n
-	    help
-	      false returns an exit code of FALSE (1).
-endif
+config BB_CONFIG_FALSE
+	bool "false"
+	default n
+	help
+	  false returns an exit code of FALSE (1).
 
 config BB_CONFIG_FOLD
 	bool "fold"
@@ -306,17 +299,16 @@ config BB_CONFIG_FEATURE_LS_COLOR
 	help
 	  This enables the --color option to ls.
 
-if BB_CONFIG_FEATURE_LS_COLOR
-    config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
-	    bool "  Produce colored ls output by default"
-	    default n
-	    help
-	      Saying yes here will turn coloring on by default,
-	      even if no "--color" option is given to the ls command.
-	      This is not recommended, since the colors are not
-	      configurable, and the output may not be legible on
-	      many output screens.
-endif
+config BB_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
+	bool "  Produce colored ls output by default"
+	default n
+	depends on BB_CONFIG_FEATURE_LS_COLOR
+	help
+	  Saying yes here will turn coloring on by default,
+	  even if no "--color" option is given to the ls command.
+	  This is not recommended, since the colors are not
+	  configurable, and the output may not be legible on
+	  many output screens.
 
 config BB_CONFIG_MD5SUM
 	bool "md5sum"
@@ -460,8 +452,8 @@ config BB_CONFIG_FEATURE_STAT_FORMAT
 	default n
 	depends on BB_CONFIG_STAT
 	help
-	  Without this, stat will not support the '-c format' option where 
-	  users can pass a custom format string for output.  This adds about 
+	  Without this, stat will not support the '-c format' option where
+	  users can pass a custom format string for output.  This adds about
 	  7k to a nonstatic build on amd64.
 
 config BB_CONFIG_STTY
@@ -511,21 +503,13 @@ config BB_CONFIG_FEATURE_TEE_USE_BLOCK_IO
 	help
 	  Enable this option for a faster tee, at expense of size.
 
-if BB_CONFIG_ASH || BB_CONFIG_HUSH || BB_CONFIG_LASH || BB_CONFIG_MSH
-	config BB_CONFIG_TEST
-		default y
-	comment "test (forced enabled for use with shell)"
-endif
-
-if !BB_CONFIG_ASH && !BB_CONFIG_HUSH && !BB_CONFIG_LASH && !BB_CONFIG_MSH
-    config BB_CONFIG_TEST
-	    bool "test"
-	    default n
-	    help
-	      test is used to check file types and compare values,
-	      returning an appropriate exit code. The shells (ash
-	      and bash) have test builtin.
-endif
+config BB_CONFIG_TEST
+	bool "test"
+	default n
+	help
+	  test is used to check file types and compare values,
+	  returning an appropriate exit code. The shells (ash
+	  and bash) have test builtin.
 
 config BB_CONFIG_FEATURE_TEST_64
 	bool "  Extend test to 64 bit"
@@ -567,20 +551,11 @@ config BB_CONFIG_FEATURE_TR_EQUIV
 	  useful for cases when no other way of expressing a character
 	  is possible.
 
-if BB_CONFIG_HUSH || BB_CONFIG_LASH || BB_CONFIG_MSH
-	config BB_CONFIG_TRUE
-		default y
-	comment "true (forced enabled for use with shell)"
-endif
-
-if !BB_CONFIG_HUSH && !BB_CONFIG_LASH && !BB_CONFIG_MSH
-    config BB_CONFIG_TRUE
-	    bool "true"
-	    default n
-	    help
-	      true returns an exit code of TRUE (0).
-
-endif
+config BB_CONFIG_TRUE
+	bool "true"
+	default n
+	help
+	  true returns an exit code of TRUE (0).
 
 config BB_CONFIG_TTY
 	bool "tty"
@@ -622,6 +597,7 @@ config BB_CONFIG_UUENCODE
 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.
@@ -655,7 +631,7 @@ config BB_CONFIG_YES
 	  the default string `y'.
 
 comment "Common options for cp and mv"
-    depends on BB_CONFIG_CP || BB_CONFIG_MV
+	depends on BB_CONFIG_CP || BB_CONFIG_MV
 
 config BB_CONFIG_FEATURE_PRESERVE_HARDLINKS
 	bool "  Preserve hard links"
@@ -664,22 +640,22 @@ config BB_CONFIG_FEATURE_PRESERVE_HARDLINKS
 	help
 	  Allow cp and mv to preserve hard links.
 
-comment "Common options for ls and more"
-	depends on BB_CONFIG_LS || BB_CONFIG_MORE
+comment "Common options for ls, more and telnet"
+	depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET
 
 config BB_CONFIG_FEATURE_AUTOWIDTH
 	bool "  Calculate terminal & column widths"
 	default y
-	depends on BB_CONFIG_LS || BB_CONFIG_MORE
+	depends on BB_CONFIG_LS || BB_CONFIG_MORE || BB_CONFIG_TELNET
 	help
-	  This option allows utilities such as 'ls' and 'more' to determine the
-	  width of the screen, which can allow them to display additional text
-	  or avoid wrapping text onto the next line.  If you leave this
-	  disabled, your utilities will be especially primitive and will be
-	  unable to determine the current screen width.
+	  This option allows utilities such as 'ls', 'more' and 'telnet'
+	  to determine the width of the screen, which can allow them to 
+	  display additional text or avoid wrapping text onto the next line.
+	  If you leave this disabled, your utilities will be especially 
+	  primitive and will be unable to determine the current screen width.
 
 comment "Common options for df, du, ls"
-    depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS
+	depends on BB_CONFIG_DF || BB_CONFIG_DU || BB_CONFIG_LS
 
 config BB_CONFIG_FEATURE_HUMAN_READABLE
 	bool "  Support for human readable output (example 13k, 23M, 235G)"
@@ -689,7 +665,7 @@ config BB_CONFIG_FEATURE_HUMAN_READABLE
 	  Allow df, du, and ls to have human readable output.
 
 comment "Common options for md5sum, sha1sum"
-    depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM
+	depends on BB_CONFIG_MD5SUM || BB_CONFIG_SHA1SUM
 
 config BB_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
 	bool "  Enable -c, -s and -w options"
diff --git a/config/busybox-1.1.0/debianutils/Config.in b/config/busybox-1.1.3/debianutils/Config.in
index 81f1d5f23..d20e3138d 100644
--- a/config/busybox-1.1.0/debianutils/Config.in
+++ b/config/busybox-1.1.3/debianutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Debian Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_MKTEMP
 	bool "mktemp"
diff --git a/config/busybox-1.1.0/e2fsprogs/Config.in b/config/busybox-1.1.3/e2fsprogs/Config.in
index eed2e5a62..2b5e3698c 100644
--- a/config/busybox-1.1.0/e2fsprogs/Config.in
+++ b/config/busybox-1.1.3/e2fsprogs/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux Ext2 FS Progs"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_CHATTR
 	bool "chattr"
@@ -18,7 +18,7 @@ config BB_CONFIG_E2FSCK
 	help
 	  e2fsck is used to check Linux second extended file systems (ext2fs).
 	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
-	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also 
+	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
 	  provided.
 
 config BB_CONFIG_FSCK
@@ -26,7 +26,7 @@ config BB_CONFIG_FSCK
 	default n
 	help
 	  fsck is used to check and optionally repair one or more filesystems.
-	  In actuality, fsck is simply a front-end for the various file system 
+	  In actuality, fsck is simply a front-end for the various file system
 	  checkers (fsck.fstype) available under Linux.
 
 config BB_CONFIG_LSATTR
@@ -39,14 +39,14 @@ config BB_CONFIG_MKE2FS
 	bool "mke2fs"
 	default n
 	help
-	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat 
+	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
 	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
 config BB_CONFIG_TUNE2FS
 	bool "tune2fs"
 	default n
 	help
-	  tune2fs allows the system administrator to adjust various tunable 
+	  tune2fs allows the system administrator to adjust various tunable
 	  filesystem parameters on Linux ext2/ext3 filesystems.
 
 config BB_CONFIG_E2LABEL
@@ -54,7 +54,7 @@ config BB_CONFIG_E2LABEL
 	default n
 	depends on BB_CONFIG_TUNE2FS
 	help
-	  e2label will display or change the filesystem label on the ext2 
+	  e2label will display or change the filesystem label on the ext2
 	  filesystem located on device.
 
 config BB_CONFIG_FINDFS
@@ -62,7 +62,7 @@ config BB_CONFIG_FINDFS
 	default n
 	depends on BB_CONFIG_TUNE2FS
 	help
-	  findfs will search the disks in the system looking for a filesystem 
+	  findfs will search the disks in the system looking for a filesystem
 	  which has a label matching label or a UUID equal to uuid.
 
 endmenu
diff --git a/config/busybox-1.1.0/editors/Config.in b/config/busybox-1.1.3/editors/Config.in
index 33a4ae77f..08087b602 100644
--- a/config/busybox-1.1.0/editors/Config.in
+++ b/config/busybox-1.1.3/editors/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Editors"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_AWK
 	bool "awk"
diff --git a/config/busybox-1.1.0/findutils/Config.in b/config/busybox-1.1.3/findutils/Config.in
index 4145a5320..9d9e28e0e 100644
--- a/config/busybox-1.1.0/findutils/Config.in
+++ b/config/busybox-1.1.3/findutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Finding Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_FIND
 	bool "find"
@@ -18,7 +18,15 @@ config BB_CONFIG_FEATURE_FIND_MTIME
 	depends on BB_CONFIG_FIND
 	help
 	  Allow searching based on the modification time of
-	  files.
+	  files, in days.
+
+config BB_CONFIG_FEATURE_FIND_MMIN
+	bool "  Enable modified time matching (-min) option"
+	default y
+	depends on BB_CONFIG_FIND
+	help
+	  Allow searching based on the modification time of
+	  files, in minutes.
 
 config BB_CONFIG_FEATURE_FIND_PERM
 	bool "  Enable permissions matching (-perm) option"
diff --git a/config/busybox-1.1.0/init/Config.in b/config/busybox-1.1.3/init/Config.in
index cd6890fbd..f4e438890 100644
--- a/config/busybox-1.1.0/init/Config.in
+++ b/config/busybox-1.1.3/init/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Init Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_INIT
 	bool "init"
@@ -13,21 +13,32 @@ config BB_CONFIG_INIT
 	  init is the first program run when the system boots.
 
 config BB_CONFIG_FEATURE_USE_INITTAB
-	bool "  Support reading an inittab file?"
+	bool "  Support reading an inittab file"
 	default y
 	depends on BB_CONFIG_INIT
 	help
 	  Allow init to read an inittab file when the system boot.
 
-config BB_CONFIG_FEATURE_INITRD
-	bool "  Support running init from within an initrd?"
+config BB_CONFIG_FEATURE_INIT_SCTTY
+	bool "  Support running commands with a controlling-tty"
+	default n
+	depends on BB_CONFIG_INIT
+	help
+	  If this option is enabled a command starting with hyphen (-)
+	  is run in its own session (setsid(2)) and possibly with a
+	  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.
+
+config BB_CONFIG_FEATURE_EXTRA_QUIET
+	bool "  Be _extra_ quiet on boot"
 	default y
 	depends on BB_CONFIG_INIT
 	help
-	  Allow init to be called from an initrd as linuxrc.
+	  Prevent init from logging some messages to the console during boot.
 
 config BB_CONFIG_FEATURE_INIT_COREDUMPS
-	bool "  Support dumping core for child processes (debugging only)?"
+	bool "  Support dumping core for child processes (debugging only)"
 	default n
 	depends on BB_CONFIG_INIT
 	help
@@ -36,30 +47,24 @@ config BB_CONFIG_FEATURE_INIT_COREDUMPS
 	  core file sizes.  If this option is disabled, processes
 	  will not generate any core files.
 
-config BB_CONFIG_FEATURE_INIT_SCTTY
-	bool "  Support running commands with a controlling-tty?"
-	default n
-	depends on BB_CONFIG_INIT
-	help
-	  If this option is enabled a command starting with hyphen (-)
-	  is run in its own session (setsid(2)) and possibly with a
-	  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.
 
-config BB_CONFIG_FEATURE_EXTRA_QUIET
-	bool "  Should init be _extra_ quiet on boot?"
+
+config BB_CONFIG_FEATURE_INITRD
+	bool "  Support running init from within an initrd (not initramfs)"
 	default y
 	depends on BB_CONFIG_INIT
 	help
-	  Prevent init from logging some messages to the console
-	  during boot.
+	  Legacy support for running init under the old-style initrd.  Allows
+	  the name linuxrc to act as init, and it doesn't assume init is PID 1.
+
+	  This does not apply to initramfs, which runs /init as PID 1 and
+	  requires no special support.
 
 config BB_CONFIG_HALT
-	bool "halt"
+	bool "poweroff, halt, and reboot"
 	default y
 	help
-	  Stop all processes and halt the system.
+	  Stop all processes and either halt, reboot, or power off the system.
 
 config BB_CONFIG_MESG
 	bool "mesg"
@@ -68,17 +73,9 @@ config BB_CONFIG_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 BB_CONFIG_POWEROFF
-	bool "poweroff"
 	default y
 	help
 	  Stop all processes and (try to) power off the system.
 
-config BB_CONFIG_REBOOT
-	bool "reboot"
-	default y
-	help
-	  Stop all processes and reboot the system.
-
 endmenu
 
diff --git a/config/busybox-1.1.3/libbb/Config.in b/config/busybox-1.1.3/libbb/Config.in
new file mode 100644
index 000000000..f1fa4f9eb
--- /dev/null
+++ b/config/busybox-1.1.3/libbb/Config.in
@@ -0,0 +1,23 @@
+#
+# 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_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.1.0/loginutils/Config.in b/config/busybox-1.1.3/loginutils/Config.in
index 57d63db0f..ffbc6e76c 100644
--- a/config/busybox-1.1.0/loginutils/Config.in
+++ b/config/busybox-1.1.3/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"
@@ -86,7 +86,7 @@ config BB_CONFIG_GETTY
 
 config BB_CONFIG_FEATURE_UTMP
 	bool "  Support utmp file"
-	depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_WHO 
+	depends on BB_CONFIG_GETTY || BB_CONFIG_LOGIN || BB_CONFIG_SU || BB_CONFIG_WHO
 	default n
 	help
 	  The file /var/run/utmp is used to track who is currently logged in.
@@ -97,7 +97,7 @@ config BB_CONFIG_FEATURE_WTMP
 	default n
 	select BB_CONFIG_FEATURE_UTMP
 	help
-	  The file /var/run/wtmp is used to track when user's have logged into 
+	  The file /var/run/wtmp is used to track when user's have logged into
 	  and logged out of the system.
 
 config BB_CONFIG_LOGIN
diff --git a/config/busybox-1.1.0/miscutils/Config.in b/config/busybox-1.1.3/miscutils/Config.in
index 69149ae66..d663e2b2b 100644
--- a/config/busybox-1.1.0/miscutils/Config.in
+++ b/config/busybox-1.1.3/miscutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Miscellaneous Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_ADJTIMEX
 	bool "adjtimex"
@@ -219,14 +219,14 @@ config BB_CONFIG_MAKEDEVS
 	  .
 	  There are two choices for command line behaviour, the interface
 	  as used by LEAF/Linux Router Project, or a device table file.
-	  . 
+	  .
 	  '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.
 	  .
 	  'table' reads device properties from a file or stdin, allowing
-	  a batch of unrelated devices to be makde with one command. 
+	  a batch of unrelated devices to be makde with one command.
           User/group names are allowed as an alternative to uid/gid.
 
 choice
@@ -256,7 +256,7 @@ config BB_CONFIG_MT
 	  to advance or rewind a tape past a specified number of archive
 	  files on the tape.
 
-config BB_BB_APPLET_RUNLEVEL
+config BB_CONFIG_RUNLEVEL
         bool "runlevel"
 	default n
 	help
diff --git a/config/busybox-1.1.0/modutils/Config.in b/config/busybox-1.1.3/modutils/Config.in
index a10245203..c929eed3d 100644
--- a/config/busybox-1.1.0/modutils/Config.in
+++ b/config/busybox-1.1.3/modutils/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux Module Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_INSMOD
 	bool "insmod"
@@ -76,9 +76,9 @@ config BB_CONFIG_LSMOD
 config BB_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool "lsmod pretty output for 2.6.x Linux kernels "
 	default n
-	depends on BB_CONFIG_LSMOD 
+	depends on BB_CONFIG_LSMOD
 	help
-	  This option makes output format of lsmod adjusted to 
+	  This option makes output format of lsmod adjusted to
 	  the format of module-init-tools for Linux kernel 2.6.
 
 config BB_CONFIG_MODPROBE
diff --git a/config/busybox-1.1.0/networking/Config.in b/config/busybox-1.1.3/networking/Config.in
index de01bdf66..112d5e8cc 100644
--- a/config/busybox-1.1.0/networking/Config.in
+++ b/config/busybox-1.1.3/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"
@@ -19,6 +19,12 @@ config BB_CONFIG_ARPING
 	help
 	  Ping hosts by ARP packets
 
+config BB_CONFIG_DNSD
+	bool "dnsd"
+	default n
+	help
+	  Small and static DNS server deamon. 
+
 config BB_CONFIG_ETHER_WAKE
 	bool "ether-wake"
 	default n
@@ -80,7 +86,6 @@ config BB_CONFIG_FEATURE_HTTPD_AUTH_MD5
 	  Enables basic per url authentication from /etc/httpd.conf
 	  using md5 passwords.
 
-
 if !BB_CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
 config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
 	bool "  Support reloading the global config file using hup signal"
@@ -117,6 +122,17 @@ config BB_CONFIG_FEATURE_HTTPD_CGI
 	  This option allows scripts and executables to be invoked
 	  when specific urls are requested.
 
+config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
+	bool "  Enable support for running scripts through an interpreter"
+	default n
+	depends on BB_CONFIG_FEATURE_HTTPD_CGI
+	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 
+	  config file:
+	  *.php:/path/to/your/php
+
 config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 	bool "  Support the REMOTE_PORT environment variable for CGI"
 	default n
@@ -673,7 +689,7 @@ config BB_CONFIG_FEATURE_WGET_IP6_LITERAL
 	help
 	  Support IPv6 address literal notation in URLs.
 
-source config/busybox-1.1.0/networking/udhcp/Config.in
+source config/busybox-1.1.3/networking/udhcp/Config.in
 
 config BB_CONFIG_ZCIP
 	bool "zcip"
diff --git a/config/busybox-1.1.0/networking/udhcp/Config.in b/config/busybox-1.1.3/networking/udhcp/Config.in
index 00a95c29a..b56fc7ac2 100644
--- a/config/busybox-1.1.0/networking/udhcp/Config.in
+++ b/config/busybox-1.1.3/networking/udhcp/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "udhcp Server/Client"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_UDHCPD
 	bool "udhcp Server (udhcpd)"
diff --git a/config/busybox-1.1.0/procps/Config.in b/config/busybox-1.1.3/procps/Config.in
index 5fb76a4ae..05238366b 100644
--- a/config/busybox-1.1.0/procps/Config.in
+++ b/config/busybox-1.1.3/procps/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Process Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_FREE
 	bool "free"
@@ -18,7 +18,7 @@ config BB_CONFIG_FUSER
 	bool "fuser"
 	default n
 	help
-	  fuser lists all PIDs (Process IDs) that currently have a given 
+	  fuser lists all PIDs (Process IDs) that currently have a given
 	  file open.  fuser can also list all PIDs that have a given network
 	  (TCP or UDP) port open.
 
diff --git a/config/busybox-1.1.0/shell/Config.in b/config/busybox-1.1.3/shell/Config.in
index 650abe0d9..2ffca7d60 100644
--- a/config/busybox-1.1.0/shell/Config.in
+++ b/config/busybox-1.1.3/shell/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Shells"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 choice
 	prompt "Choose your default shell"
@@ -36,7 +36,8 @@ endchoice
 
 config BB_CONFIG_ASH
 	bool "ash"
-	default y
+	default n
+	select BB_CONFIG_TEST
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
 	  the most complete and most pedantically correct shell included with
@@ -137,7 +138,7 @@ config BB_CONFIG_ASH_OPTIMIZE_FOR_SIZE
 	default y
 	depends on BB_CONFIG_ASH
 	help
-	  Compile ash for reduced size at price of speed.
+	  Compile ash for reduced size at the price of speed.
 
 config BB_CONFIG_ASH_RANDOM_SUPPORT
 	bool "  Enable pseudorandom generator and variable $RANDOM"
@@ -151,17 +152,20 @@ config BB_CONFIG_ASH_RANDOM_SUPPORT
 	  variable will no longer have special treatment.
 
 config BB_CONFIG_ASH_EXPAND_PRMT
-	bool "  Support expand PS#"
+	bool "  Expand prompt string"
 	default n
 	depends on BB_CONFIG_ASH
 	help
-	  "PS#" may be have commands. It option enable expand string
-	  from prompt before each show.
-
+	  "PS#" may be contain volatile content, such as backquote commands.
+	  This option recreates the prompt string from the environment
+	  variable each time it is displayed.
 
 config BB_CONFIG_HUSH
 	bool "hush"
 	default n
+	select BB_CONFIG_TRUE
+	select BB_CONFIG_FALSE
+	select BB_CONFIG_TEST
 	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
@@ -176,6 +180,9 @@ config BB_CONFIG_HUSH
 config BB_CONFIG_LASH
 	bool "lash"
 	default n
+	select BB_CONFIG_TRUE
+	select BB_CONFIG_FALSE
+	select BB_CONFIG_TEST
 	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
@@ -188,6 +195,9 @@ config BB_CONFIG_LASH
 config BB_CONFIG_MSH
 	bool "msh"
 	default n
+	select BB_CONFIG_TRUE
+	select BB_CONFIG_FALSE
+	select BB_CONFIG_TEST
 	help
 	  The minix shell (adds just 30k) is quite complete and handles things
 	  like for/do/done, case/esac and all the things you expect a Bourne
@@ -217,7 +227,7 @@ config BB_CONFIG_FEATURE_SH_STANDALONE_SHELL
 	  busybox to use the ifconfig busybox applet.  Specifying the fully
 	  qualified executable name, such as '/sbin/ifconfig' will still
 	  execute the /sbin/ifconfig executable on the filesystem.  This option
-	  is generally used when creating a staticly linked version of busybox
+	  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 when using this option, the shell will attempt to directly
diff --git a/config/busybox-1.1.0/sysklogd/Config.in b/config/busybox-1.1.3/sysklogd/Config.in
index 7c643ef90..38fc7f7c0 100644
--- a/config/busybox-1.1.0/sysklogd/Config.in
+++ b/config/busybox-1.1.3/sysklogd/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "System Logging Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_SYSLOGD
 	bool "syslogd"
diff --git a/config/busybox-1.1.0/util-linux/Config.in b/config/busybox-1.1.3/util-linux/Config.in
index 316dfe0b7..c42d115ef 100644
--- a/config/busybox-1.1.0/util-linux/Config.in
+++ b/config/busybox-1.1.3/util-linux/Config.in
@@ -4,7 +4,7 @@
 #
 
 menu "Linux System Utilities"
-	depends on BUSYBOX
+  depends on BUSYBOX
 
 config BB_CONFIG_DMESG
 	bool "dmesg"
@@ -215,7 +215,7 @@ config BB_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 	depends on BB_CONFIG_HWCLOCK
 	help
 	  Starting with FHS 2.3, the adjtime state file is supposed to exist
-	  at /var/lib/hwclock/adjtime instead of /etc/adjtime.  If you wish 
+	  at /var/lib/hwclock/adjtime instead of /etc/adjtime.  If you wish
 	  to use the FHS behavior, answer Y here, otherwise answer N for the
 	  classic /etc/adjtime path.
 
@@ -251,7 +251,7 @@ config BB_CONFIG_MDEV
 	default n
 	help
 	  mdev is a mini-udev implementation: call it with -s to populate
-	  /dev from /sys, then "echo /sbin/mdev > /sys/kernel/hotplug" to
+	  /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to
 	  have it handle hotplug events afterwards.  Device names are taken
 	  from sysfs.
 
@@ -310,6 +310,24 @@ config BB_CONFIG_FEATURE_USE_TERMIOS
 	  will be unable to determine the current screen size, and will be
 	  unable to move the cursor.
 
+config BB_CONFIG_MOUNT
+	bool "mount"
+	default n
+	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
+	  particular part of the tree.  A filesystem can either live on a block
+	  device, or it can be accessible over the network, as is the case with
+	  NFS filesystems.  Most people using BusyBox will also want to enable
+	  the 'mount' utility.
+
+config BB_CONFIG_FEATURE_MOUNT_NFS
+	bool "  Support mounting NFS file systems"
+	default n
+	depends on BB_CONFIG_MOUNT
+	help
+	 Enable mounting of NFS file systems.
+
 config BB_CONFIG_PIVOT_ROOT
 	bool "pivot_root"
 	default n
@@ -322,25 +340,6 @@ config BB_CONFIG_PIVOT_ROOT
 	  Note: This is for initrd in linux 2.4.  Under initramfs (introduced
 	  in linux 2.6) use switch_root instead.
 
-config BB_CONFIG_SWITCH_ROOT
-	bool "switch_root"
-	default n
-	help
-	  The switch_root utility is used from initramfs to select a new
-	  root device.  Under initramfs, you have to use this instead of
-	  pivot_root.  (Stop reading here if you don't care why.)
-
-	  Booting with initramfs extracts a gzipped cpio archive into rootfs
-	  (which is a variant of ramfs/tmpfs).  Because rootfs can't be moved
-	  or unmounted*, pivot_root will not work from initramfs.  Instead,
-	  switch_root deletes everything out of rootfs (including itself),
-	  does a mount --move that overmounts rootfs with the new root, and
-	  then execs the specified init program.
-
-	  * Because the Linux kernel uses rootfs internally as the starting
-	  and ending point for searching through the kernel's doubly linked
-	  list of active mount points.  That's why.
-
 config BB_CONFIG_RDATE
 	bool "rdate"
 	default n
@@ -356,6 +355,15 @@ config BB_CONFIG_READPROFILE
 	help
 	  This allows you to parse /proc/profile for basic profiling.
 
+config BB_CONFIG_SETARCH
+	bool "setarch"
+	default n
+	help
+	  The linux32 utility is used to create a 32bit environment for the
+	  specified program (usually a shell).  It only makes sense to have
+	  this util on a system that supports both 64bit and 32bit userland
+	  (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
+
 config BB_CONFIG_SWAPONOFF
 	bool "swaponoff"
 	default n
@@ -367,23 +375,24 @@ config BB_CONFIG_SWAPONOFF
 	  space.  If you are not using any swap space, you can leave this
 	  option disabled.
 
-config BB_CONFIG_MOUNT
-	bool "mount"
+config BB_CONFIG_SWITCH_ROOT
+	bool "switch_root"
 	default n
 	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
-	  particular part of the tree.  A filesystem can either live on a block
-	  device, or it can be accessible over the network, as is the case with
-	  NFS filesystems.  Most people using BusyBox will also want to enable
-	  the 'mount' utility.
+	  The switch_root utility is used from initramfs to select a new
+	  root device.  Under initramfs, you have to use this instead of
+	  pivot_root.  (Stop reading here if you don't care why.)
 
-config BB_CONFIG_FEATURE_MOUNT_NFS
-	bool "  Support mounting NFS file systems"
-	default n
-	depends on BB_CONFIG_MOUNT
-	help
-	 Enable mounting of NFS file systems.
+	  Booting with initramfs extracts a gzipped cpio archive into rootfs
+	  (which is a variant of ramfs/tmpfs).  Because rootfs can't be moved
+	  or unmounted*, pivot_root will not work from initramfs.  Instead,
+	  switch_root deletes everything out of rootfs (including itself),
+	  does a mount --move that overmounts rootfs with the new root, and
+	  then execs the specified init program.
+
+	  * Because the Linux kernel uses rootfs internally as the starting
+	  and ending point for searching through the kernel's doubly linked
+	  list of active mount points.  That's why.
 
 config BB_CONFIG_UMOUNT
 	bool "umount"
@@ -394,6 +403,13 @@ config BB_CONFIG_UMOUNT
 	  the tool to use.  If you enabled the 'mount' utility, you almost certainly
 	  also want to enable 'umount'.
 
+config BB_CONFIG_FEATURE_UMOUNT_ALL
+	bool "  umount -a option"
+	default n
+	depends on BB_CONFIG_UMOUNT
+	help
+	  Support -a option to unmount all currently mounted filesystems.
+
 comment "Common options for mount/umount"
 	depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT
 
@@ -407,7 +423,7 @@ config BB_CONFIG_FEATURE_MOUNT_LOOP
 	  command will detect you are trying to mount a file instead of a block
 	  device, and transparently associate the file with a loopback device.
 	  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
 	  specify an offset or cryptographic options to the loopback device.