update busybox to latest stable version, refresh all Config.in files

27 files changed, 2385 insertions, 2069 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 65f7a95ef..5180e6ede 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.19.4
+PKG_VERSION:=		1.20.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9c0cae5a0379228e7b55e5b29528df8e
+PKG_MD5SUM:=		e025414bc6cd79579cc7a32a45d3ae1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_BUILDDEP:=		libtirpc
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 5a0e5a285..3a5e340ae 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -32,7 +32,7 @@ config BUSYBOX_EXTRA_COMPAT
 
 config BUSYBOX_INCLUDE_SUSv2
 	bool "Enable obsolete features removed before SUSv3"
-	default y
+	default n
 	help
 	  This option will enable backwards compatibility with SuSv2,
 	  specifically, old-style numeric options ('command -1 <file>')
@@ -83,20 +83,21 @@ config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS
 endchoice
 
 config BUSYBOX_SHOW_USAGE
-	bool "Show terse applet usage messages"
+	bool "Show applet usage messages"
 	default y
 	help
-	  All BusyBox applets will show help messages when invoked with
-	  wrong arguments. You can turn off printing these terse usage
-	  messages if you say no here.
-	  This will save you up to 7k.
+	  Enabling this option, BusyBox applets will show terse help messages
+	  when invoked with wrong arguments.
+	  If you do not want to show any (helpful) usage message when
+	  issuing wrong command syntax, you can say 'N' here,
+	  saving approximately 7k.
 
 config BUSYBOX_FEATURE_VERBOSE_USAGE
 	bool "Show verbose applet usage messages"
 	default y
-	select BUSYBOX_SHOW_USAGE
+	depends on BUSYBOX_SHOW_USAGE
 	help
-	  All BusyBox applets will show more verbose help messages when
+	  All BusyBox applets will show verbose help messages when
 	  busybox is invoked with --help. This will add a lot of text to the
 	  busybox binary. In the default configuration, this will add about
 	  13k, but it can add much more depending on your configuration.
@@ -106,8 +107,8 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  Store usage messages in compressed form, uncompress them on-the-fly
-	  when <applet> --help is called.
+	  Store usage messages in .bz compressed form, uncompress them
+	  on-the-fly when <applet> --help is called.
 
 	  If you have a really tiny busybox with few applets enabled (and
 	  bunzip2 isn't one of them), the overhead of the decompressor might
@@ -153,8 +154,8 @@ config BUSYBOX_UNICODE_USING_LOCALE
 
 config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV
 	bool "Check $LANG environment variable"
-	default y
-	depends on BUSYBOX_FEATURE_ASSUME_UNICODE && !BUSYBOX_LOCALE_SUPPORT
+	default n
+	depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE
 	help
 	  With this option on, Unicode support is activated
 	  only if LANG variable has the value of the form "xxxx.utf8"
@@ -240,8 +241,9 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	default n
 	depends on BUSYBOX_UNICODE_SUPPORT
 	help
-	  With this option on, invalid UTF-8 bytes are not substituted
-	  with the selected substitution character.
+	  With this option on, on line-editing input (such as used by shells)
+	  invalid UTF-8 bytes are not substituted with the selected
+	  substitution character.
 	  For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
 	  at shell prompt will list file named 0xff (single char name
 	  with char value 255), not file named '?'.
@@ -275,6 +277,26 @@ config BUSYBOX_FEATURE_CLEAN_UP
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
+config BUSYBOX_FEATURE_UTMP
+	bool "Support utmp file"
+	default y
+	help
+	  The file /var/run/utmp is used to track who is currently logged in.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will create and delete entries there.
+	  "who" applet requires this option.
+
+config BUSYBOX_FEATURE_WTMP
+	bool "Support wtmp file"
+	default y
+	depends on BUSYBOX_FEATURE_UTMP
+	help
+	  The file /var/run/wtmp is used to track when users have logged into
+	  and logged out of the system.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will append new entries there.
+	  "last" applet requires this option.
+
 config BUSYBOX_FEATURE_PIDFILE
 	bool "Support writing pidfiles"
 	default y
@@ -284,7 +306,7 @@ config BUSYBOX_FEATURE_PIDFILE
 
 config BUSYBOX_FEATURE_SUID
 	bool "Support for SUID/SGID handling"
-	default n
+	default y
 	help
 	  With this option you can install the busybox binary belonging
 	  to root with the suid bit set, enabling some applets to perform
@@ -299,21 +321,39 @@ config BUSYBOX_FEATURE_SUID
 	  symlinks pointing to each binary), and only set the suid bit on the
 	  one that needs it.
 
-	  The applets currently marked to need the suid bit are:
+	  The applets which require root rights (need suid bit or
+	  to be run by root) and will refuse to execute otherwise:
+	  crontab, login, passwd, su, vlock, wall.
+
+	  The applets which will use root rights if they have them
+	  (via suid bit, or because run by root), but would try to work
+	  without root right nevertheless:
+	  findfs, ping[6], traceroute[6], mount.
 
-	  crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
-	  traceroute, vlock.
+	  Note that if you DONT select this option, but DO make busybox
+	  suid root, ALL applets will run under root, which is a huge
+	  security hole (think "cp /some/file /etc/passwd").
 
 config BUSYBOX_FEATURE_SUID_CONFIG
 	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
-	default n if BUSYBOX_FEATURE_SUID
+	default y
 	depends on BUSYBOX_FEATURE_SUID
 	help
 	  Allow the SUID / SGID state of an applet to be determined at runtime
 	  by checking /etc/busybox.conf. (This is sort of a poor man's sudo.)
 	  The format of this file is as follows:
 
-	  <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
+	  APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+
+	  s: USER or GROUP is allowed to execute APPLET.
+	     APPLET will run under USER or GROUP
+	     (reagardless of who's running it).
+	  S: USER or GROUP is NOT allowed to execute APPLET.
+	     APPLET will run under USER or GROUP.
+	     This option is not very sensical.
+	  x: USER/GROUP/others are allowed to execute APPLET.
+	     No UID/GID change will be done when it is run.
+	  -: USER/GROUP/others are not allowed to execute APPLET.
 
 	  An example might help:
 
@@ -323,7 +363,8 @@ config BUSYBOX_FEATURE_SUID_CONFIG
 	  su = ssx        # exactly the same
 
 	  mount = sx- root.disk # applet mount can be run by root and members
-	                        # of group disk and runs with euid=0
+	                        # of group disk (but not anyone else)
+	                        # and runs with euid=0 (egid is not changed)
 
 	  cp = --- # disable applet cp for everyone
 
@@ -349,7 +390,7 @@ config BUSYBOX_FEATURE_SUID_CONFIG_QUIET
 config BUSYBOX_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Enable support for SELinux in applets ls, ps, and id. Also provide
 	  the option of compiling in SELinux applets.
@@ -430,7 +471,10 @@ config BUSYBOX_PIE
 	default n
 	depends on !BUSYBOX_STATIC
 	help
-	  (TODO: what is it and why/when is it useful?)
+	  Hardened code option. PIE binaries are loaded at a different
+	  address at each invocation. This has some overhead,
+	  particularly on x86-32 which is short on registers.
+
 	  Most people will leave this set to 'N'.
 
 config BUSYBOX_NOMMU
@@ -480,7 +524,7 @@ config BUSYBOX_BUILD_LIBBUSYBOX
 
 config BUSYBOX_FEATURE_INDIVIDUAL
 	bool "Produce a binary for each applet, linked against libbusybox"
-	default n
+	default y
 	depends on BUSYBOX_BUILD_LIBBUSYBOX
 	help
 	  If your CPU architecture doesn't allow for sharing text/rodata
@@ -498,7 +542,7 @@ config BUSYBOX_FEATURE_INDIVIDUAL
 
 config BUSYBOX_FEATURE_SHARED_BUSYBOX
 	bool "Produce additional busybox binary linked against libbusybox"
-	default n
+	default y
 	depends on BUSYBOX_BUILD_LIBBUSYBOX
 	help
 	  Build busybox, dynamically linked against libbusybox.so.N.N.N.
@@ -527,7 +571,6 @@ config BUSYBOX_FEATURE_SHARED_BUSYBOX
 config BUSYBOX_LFS
 	bool "Build with Large File Support (for accessing files > 2 GB)"
 	default y
-	select BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
 	help
 	  If you want to build BusyBox with large file support, then enable
 	  this option. This will have no effect if your kernel or your C
@@ -549,12 +592,39 @@ config BUSYBOX_CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
+config BUSYBOX_SYSROOT
+	string "Path to sysroot"
+	default ""
+	help
+	  If you want to build BusyBox with a cross compiler, then you
+	  might also need to specify where /usr/include and /usr/lib
+	  will be found.
+
+	  For example, BusyBox can be built against an installed
+	  Android NDK, platform version 9, for ARM ABI with
+
+	  CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm
+
+	  Native builds leave this empty.
+
 config BUSYBOX_EXTRA_CFLAGS
 	string "Additional CFLAGS"
 	default ""
 	help
 	  Additional CFLAGS to pass to the compiler verbatim.
 
+config BUSYBOX_EXTRA_LDFLAGS
+	string "Additional LDFLAGS"
+	default ""
+	help
+	  Additional LDFLAGS to pass to the linker verbatim.
+
+config BUSYBOX_EXTRA_LDLIBS
+	string "Additional LDLIBS"
+	default ""
+	help
+	  Additional LDLIBS to pass to the linker with -l.
+
 endmenu
 
 menu 'Debugging Options'
@@ -631,25 +701,13 @@ config BUSYBOX_EFENCE
 
 endchoice
 
-### config PARSE
-###	bool "Uniform config file parser debugging applet: parse"
-
 endmenu
 
 menu 'Installation Options ("make install" behavior)'
 
-config BUSYBOX_INSTALL_NO_USR
-	bool "Don't use /usr"
-	default n
-	depends on BUSYBOX_FEATURE_INSTALLER
-	help
-	  Disable use of /usr. busybox --install and "make install"
-	  will install applets only to /bin and /sbin,
-	  never to /usr/bin or /usr/sbin.
-
 choice
 	prompt "What kind of applet links to install"
-	default BUSYBOX_INSTALL_APPLET_SYMLINKS
+	default INSTALL_APPLET_SYMLINKS
 	help
 	  Choose what kind of links to applets are created by "make install".
 
@@ -673,7 +731,6 @@ config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS
 
 config BUSYBOX_INSTALL_APPLET_DONT
 	bool "not installed"
-	depends on BUSYBOX_FEATURE_INSTALLER || BUSYBOX_FEATURE_SH_STANDALONE || BUSYBOX_FEATURE_PREFER_APPLETS
 	help
 	  Do not install applet links. Useful when you plan to use
 	  busybox --install for installing links, or plan to use
@@ -701,8 +758,8 @@ config BUSYBOX_INSTALL_SH_APPLET_HARDLINK
 config BUSYBOX_INSTALL_SH_APPLET_SCRIPT_WRAPPER
 	bool "as script wrapper"
 	help
-	  Install /bin/sh applet as script wrapper that call the busybox
-	  binary.
+	  Install /bin/sh applet as script wrapper that calls
+	  the busybox binary.
 
 endchoice
 
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index aac6578f3..eaa576bff 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
@@ -5,6 +6,7 @@
 
 menu "Archival Utilities"
 
+
 config BUSYBOX_FEATURE_SEAMLESS_XZ
 	bool "Make tar, rpm, modprobe etc understand .xz data"
 	default y
@@ -30,15 +32,15 @@ config BUSYBOX_FEATURE_SEAMLESS_GZ
 	  Make tar, rpm, modprobe etc understand .gz data.
 
 config BUSYBOX_FEATURE_SEAMLESS_Z
-	bool "Make tar and gunzip understand .Z data"
+	bool "tar, rpm, modprobe etc understand .Z data"
 	default n
 	help
-	  Make tar and gunzip understand .Z data.
+	  Make tar, rpm, modprobe etc understand .Z data.
 
 config BUSYBOX_AR
 	bool "ar"
-	default y
 	depends on !ADK_PACKAGE_BINUTILS
+	default n  # needs to be improved to be able to replace binutils ar
 	help
 	  ar is an archival utility program used to create, modify, and
 	  extract contents from archives. An archive is a single file holding
@@ -61,7 +63,7 @@ config BUSYBOX_AR
 
 config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 	bool "Support for long filenames (not needed for debs)"
-	default n
+	default y
 	depends on BUSYBOX_AR
 	help
 	  By default the ar format can only store the first 15 characters
@@ -71,7 +73,7 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 
 config BUSYBOX_FEATURE_AR_CREATE
 	bool "Support archive creation"
-	default n
+	default y
 	depends on BUSYBOX_AR
 	help
 	  This enables archive creation (-c and -r) with busybox ar.
@@ -79,7 +81,7 @@ config BUSYBOX_FEATURE_AR_CREATE
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
 	depends on !ADK_PACKAGE_BZIP2
-	default y
+	default n
 	help
 	  bunzip2 is a compression utility using the Burrows-Wheeler block
 	  sorting text compression algorithm, and Huffman coding. Compression
@@ -93,7 +95,7 @@ config BUSYBOX_BUNZIP2
 config BUSYBOX_BZIP2
 	bool "bzip2"
 	depends on !ADK_PACKAGE_BZIP2
-	default y
+	default n
 	help
 	  bzip2 is a compression utility using the Burrows-Wheeler block
 	  sorting text compression algorithm, and Huffman coding. Compression
@@ -121,7 +123,7 @@ config BUSYBOX_CPIO
 
 config BUSYBOX_FEATURE_CPIO_O
 	bool "Support for archive creation"
-	default n
+	default y
 	depends on BUSYBOX_CPIO
 	help
 	  This implementation of cpio can create cpio archives in the "newc"
@@ -129,7 +131,7 @@ config BUSYBOX_FEATURE_CPIO_O
 
 config BUSYBOX_FEATURE_CPIO_P
 	bool "Support for passthrough mode"
-	default n
+	default y
 	depends on BUSYBOX_FEATURE_CPIO_O
 	help
 	  Passthrough mode. Rarely used.
@@ -184,11 +186,23 @@ config BUSYBOX_GZIP
 
 config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS
 	bool "Enable long options"
-	default n
+	default y
 	depends on BUSYBOX_GZIP && BUSYBOX_LONG_OPTS
 	help
 	  Enable use of long options, increases size by about 106 Bytes
 
+config BUSYBOX_GZIP_FAST
+	int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+	default 0
+	range 0 2
+	depends on BUSYBOX_GZIP
+	help
+	  Enable big memory options for gzip.
+	  0: small buffers, small hash-tables
+	  1: larger buffers, larger hash-tables
+	  2: larger buffers, largest hash-tables
+	  Larger models may give slightly better compression
+
 config BUSYBOX_LZOP
 	bool "lzop"
 	default n
@@ -196,7 +210,7 @@ config BUSYBOX_LZOP
 	  Lzop compression/decompresion.
 
 config BUSYBOX_LZOP_COMPR_HIGH
-	bool "lzop complession levels 7,8,9 (not very useful)"
+	bool "lzop compression levels 7,8,9 (not very useful)"
 	default n
 	depends on BUSYBOX_LZOP
 	help
@@ -216,7 +230,7 @@ config BUSYBOX_RPM2CPIO
 	depends on !ADK_PACKAGE_RPM
 	default n
 	help
-	  Converts an RPM file into a CPIO archive.
+	  Converts a RPM file into a CPIO archive.
 
 config BUSYBOX_RPM
 	bool "rpm"
@@ -227,14 +241,13 @@ config BUSYBOX_RPM
 
 config BUSYBOX_TAR
 	bool "tar"
+	depends on !ADK_PACKAGE_TAR
 	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to
 	  create compressed archives. It's probably the most widely used
 	  UNIX archive program.
 
-if BUSYBOX_TAR
-
 config BUSYBOX_FEATURE_TAR_CREATE
 	bool "Enable archive creation"
 	default y
@@ -246,7 +259,7 @@ config BUSYBOX_FEATURE_TAR_CREATE
 config BUSYBOX_FEATURE_TAR_AUTODETECT
 	bool "Autodetect compressed tarballs"
 	default y
-	depends on BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA
+	depends on BUSYBOX_TAR && (BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA || BUSYBOX_FEATURE_SEAMLESS_XZ)
 	help
 	  With this option tar can automatically detect compressed
 	  tarballs. Currently it works only on files (not pipes etc).
@@ -261,8 +274,8 @@ config BUSYBOX_FEATURE_TAR_FROM
 
 config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	bool "Support for old tar header format"
-	default n
-	depends on BUSYBOX_TAR
+	default y
+	depends on BUSYBOX_TAR || BUSYBOX_DPKG
 	help
 	  This option is required to unpack archives created in
 	  the old GNU format; help to kill this old format by
@@ -270,8 +283,8 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 
 config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
-	default n
-	depends on BUSYBOX_TAR
+	default y
+	depends on BUSYBOX_TAR || BUSYBOX_DPKG
 	help
 	  This option is required to unpack archives created by some old
 	  version of Sun's tar (it was calculating checksum using signed
@@ -281,14 +294,14 @@ config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS
 	bool "Support for GNU tar extensions (long filenames)"
 	default y
-	depends on BUSYBOX_TAR
+	depends on BUSYBOX_TAR || BUSYBOX_DPKG
 	help
 	  With this option busybox supports GNU long filenames and
 	  linknames.
 
 config BUSYBOX_FEATURE_TAR_LONG_OPTIONS
 	bool "Enable long options"
-	default n
+	default y
 	depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS
 	help
 	  Enable use of long options, increases size by about 400 Bytes
@@ -313,7 +326,7 @@ config BUSYBOX_FEATURE_TAR_UNAME_GNAME
 
 config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME
 	bool "Enable -m (do not preserve time) option"
-	default n
+	default y
 	depends on BUSYBOX_TAR
 	help
 	  With this option busybox supports GNU tar -m
@@ -327,8 +340,6 @@ config BUSYBOX_FEATURE_TAR_SELINUX
 	  With this option busybox supports restoring SELinux labels
 	  when extracting files from tar archives.
 
-endif #tar
-
 config BUSYBOX_UNCOMPRESS
 	bool "uncompress"
 	default n
@@ -338,20 +349,16 @@ config BUSYBOX_UNCOMPRESS
 
 config BUSYBOX_UNLZMA
 	bool "unlzma"
-	depends on !ADK_PACKAGE_XZ
-	default y
+	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.
+	  The BusyBox unlzma applet is limited to decompression only.
 	  On an x86 system, this applet adds about 4K.
 
-	  Unless you have a specific application which requires unlzma, you
-	  should probably say N here.
-
 config BUSYBOX_FEATURE_LZMA_FAST
 	bool "Optimize unlzma for speed"
 	default n
@@ -371,12 +378,13 @@ config BUSYBOX_LZMA
 config BUSYBOX_UNXZ
 	bool "unxz"
 	depends on !ADK_PACKAGE_XZ
-	default y
+	default n
 	help
 	  unxz is a unlzma successor.
 
 config BUSYBOX_XZ
 	bool "Provide xz alias which supports only unpacking"
+	depends on !ADK_PACKAGE_XZ
 	default n
 	depends on BUSYBOX_UNXZ
 	help
diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in
index 03d277111..5a1dc29c4 100644
--- a/package/busybox/config/console-tools/Config.in
+++ b/package/busybox/config/console-tools/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
@@ -5,10 +6,11 @@
 
 menu "Console Utilities"
 
+
 config BUSYBOX_CHVT
 	bool "chvt"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program is used to change to another terminal.
 	  Example: chvt 4 (change to terminal /dev/tty4)
@@ -16,7 +18,7 @@ config BUSYBOX_CHVT
 config BUSYBOX_FGCONSOLE
 	bool "fgconsole"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program prints active (foreground) console number.
 
@@ -29,30 +31,30 @@ config BUSYBOX_CLEAR
 config BUSYBOX_DEALLOCVT
 	bool "deallocvt"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program deallocates unused virtual consoles.
 
 config BUSYBOX_DUMPKMAP
 	bool "dumpkmap"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program dumps the kernel's keyboard translation table to
 	  stdout, in binary format. You can then use loadkmap to load it.
 
 config BUSYBOX_KBD_MODE
 	bool "kbd_mode"
-	default y if ADK_TARGET_WITH_INPUT
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y if ADK_TARGET_WITH_INPUT
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program reports and sets keyboard mode.
 
 config BUSYBOX_LOADFONT
 	bool "loadfont"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads a console font from standard input.
 
@@ -60,15 +62,15 @@ config BUSYBOX_LOADKMAP
 	bool "loadkmap"
 	default y if ADK_TARGET_WITH_INPUT
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads a keyboard translation table from
 	  standard input.
 
 config BUSYBOX_OPENVT
 	bool "openvt"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program is used to start a command on an unused
 	  virtual terminal.
@@ -82,14 +84,14 @@ config BUSYBOX_RESET
 
 config BUSYBOX_RESIZE
 	bool "resize"
-	default n
+	default y
 	help
 	  This program is used to (re)set the width and height of your current
 	  terminal.
 
 config BUSYBOX_FEATURE_RESIZE_PRINT
 	bool "Print environment variables"
-	default n
+	default y
 	depends on BUSYBOX_RESIZE
 	help
 	  Prints the newly set size (number of columns and rows) of
@@ -99,15 +101,15 @@ config BUSYBOX_FEATURE_RESIZE_PRINT
 
 config BUSYBOX_SETCONSOLE
 	bool "setconsole"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program redirects the system console to another device,
 	  like the current tty while logged in via telnet.
 
 config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool "Enable long options"
-	default n
+	default y
 	depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS
 	help
 	  Support long options for the setconsole applet.
@@ -115,13 +117,13 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
 config BUSYBOX_SETFONT
 	bool "setfont"
 	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Allows to load console screen map. Useful for i18n.
 
 config BUSYBOX_FEATURE_SETFONT_TEXTUAL_MAP
 	bool "Support reading textual screen maps"
-	default n
+	default y
 	depends on BUSYBOX_SETFONT
 	help
 	  Support reading textual screen maps.
@@ -136,23 +138,23 @@ config BUSYBOX_DEFAULT_SETFONT_DIR
 
 config BUSYBOX_SETKEYCODES
 	bool "setkeycodes"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program loads entries into the kernel's scancode-to-keycode
 	  map, allowing unusual keyboards to generate usable keycodes.
 
 config BUSYBOX_SETLOGCONS
 	bool "setlogcons"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This program redirects the output console of kernel messages.
 
 config BUSYBOX_SHOWKEY
 	bool "showkey"
-	default n
-	depends on BUSYBOX_PLATFORM_LINUX
+	default y
+	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Shows keys pressed.
 
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 1b2d9d5fd..6393c1c14 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
@@ -5,12 +6,6 @@
 
 menu "Coreutils"
 
-config BUSYBOX_BASE64
-	bool "base64"
-	default y
-	help
-	  Base64 encode and decode
-
 config BUSYBOX_BASENAME
 	bool "basename"
 	default y
@@ -18,23 +13,146 @@ config BUSYBOX_BASENAME
 	  basename is used to strip the directory and suffix from filenames,
 	  leaving just the filename itself. Enable this option if you wish
 	  to enable the 'basename' utility.
-
-config BUSYBOX_CAL
-	bool "cal"
-	default n
-	help
-	  cal is used to display a monthly calender.
-
 config BUSYBOX_CAT
 	bool "cat"
 	default y
 	help
 	  cat is used to concatenate files and print them to the standard
 	  output. Enable this option if you wish to enable the 'cat' utility.
+config BUSYBOX_DATE
+	bool "date"
+	default y
+	help
+	  date is used to set the system date or display the
+	  current time in the given format.
+
+config BUSYBOX_FEATURE_DATE_ISOFMT
+	bool "Enable ISO date format output (-I)"
+	default y
+	depends on BUSYBOX_DATE
+	help
+	  Enable option (-I) to output an ISO-8601 compliant
+	  date/time string.
+
+# defaults to "no": stat's nanosecond field is a bit non-portable
+config BUSYBOX_FEATURE_DATE_NANO
+	bool "Support %[num]N nanosecond format specifier"
+	default n
+	depends on BUSYBOX_DATE  # syscall(__NR_clock_gettime)
+	select BUSYBOX_PLATFORM_LINUX
+	help
+	  Support %[num]N format specifier. Adds ~250 bytes of code.
+
+config BUSYBOX_FEATURE_DATE_COMPAT
+	bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+	default y
+	depends on BUSYBOX_DATE
+	help
+	  System time can be set by 'date -s DATE' and simply 'date DATE',
+	  but formats of DATE string are different. 'date DATE' accepts
+	  a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+	  unnatural placement of year between minutes and seconds.
+	  date -s (and other commands like touch -d) use more sensible
+	  formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+
+	  With this option off, 'date DATE' is 'date -s DATE' support
+	  the same format. With it on, 'date DATE' additionally supports
+	  MMDDhhmm[[YY]YY][.ss] format.
+config BUSYBOX_HOSTID
+	bool "hostid"
+	default y
+	help
+	  hostid prints the numeric identifier (in hexadecimal) for
+	  the current host.
+config BUSYBOX_ID
+	bool "id"
+	default y
+	help
+	  id displays the current user and group ID names.
+config BUSYBOX_GROUPS
+	bool "groups"
+	default y
+	help
+	  Print the group names associated with current user id.
+config BUSYBOX_TEST
+	bool "test"
+	default y
+	help
+	  test is used to check file types and compare values,
+	  returning an appropriate exit code. The bash shell
+	  has test built in, ash can build it in optionally.
+
+config BUSYBOX_FEATURE_TEST_64
+	bool "Extend test to 64 bit"
+	default y
+	depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH
+	help
+	  Enable 64-bit support in test.
+config BUSYBOX_TOUCH
+	bool "touch"
+	default y
+	help
+	  touch is used to create or change the access and/or
+	  modification timestamp of specified files.
+
+config BUSYBOX_FEATURE_TOUCH_SUSV3
+	bool "Add support for SUSV3 features (-d -t -r)"
+	default y
+	depends on BUSYBOX_TOUCH
+	help
+	  Enable touch to use a reference file or a given date/time argument.
+config BUSYBOX_TR
+	bool "tr"
+	default y
+	help
+	  tr is used to squeeze, and/or delete characters from standard
+	  input, writing to standard output.
+
+config BUSYBOX_FEATURE_TR_CLASSES