busyobx-1.14.1 kcconfig symbols integrationembtk-busybox-kconfig-1.14.1

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

23 files changed, 307 insertions, 134 deletions

diff --git a/busybox-archival.kconfig b/busybox-archival.kconfig
index 401fb78..0e9b37c 100644
--- a/busybox-archival.kconfig
+++ b/busybox-archival.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Archival Utilities"
+comment "Archival Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA
@@ -102,6 +102,13 @@ config KEMBTK_BUSYB_FEATURE_CPIO_O
 	  This implementation of cpio can create cpio archives in the "newc"
 	  format only.
 
+config KEMBTK_BUSYB_FEATURE_CPIO_P
+	bool "Support for passthrough mode"
+	depends on KEMBTK_BUSYB_FEATURE_CPIO_O
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Passthrough mode. Rarely used.
+
 config KEMBTK_BUSYB_DPKG
 	bool "dpkg"
 	select KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ
diff --git a/busybox-console-tools.kconfig b/busybox-console-tools.kconfig
index 81aa159..0cd5b99 100644
--- a/busybox-console-tools.kconfig
+++ b/busybox-console-tools.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Console Utilities"
+comment "Console Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_CHVT
diff --git a/busybox-coreutils.kconfig b/busybox-coreutils.kconfig
index aaf16fd..4374662 100644
--- a/busybox-coreutils.kconfig
+++ b/busybox-coreutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Coreutils"
+comment "Coreutils"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_BASENAME
@@ -170,7 +170,7 @@ config KEMBTK_BUSYB_ECHO
 config KEMBTK_BUSYB_FEATURE_FANCY_ECHO
 	bool "Enable echo options (-n and -e)"
 	default y
-	depends on KEMBTK_BUSYB_ECHO || KEMBTK_BUSYB_ASH_BUILTIN_ECHO
+	depends on KEMBTK_BUSYB_ECHO || KEMBTK_BUSYB_ASH_BUILTIN_ECHO || KEMBTK_BUSYB_HUSH
 	help
 	  This adds options (-n and -e) to echo.
 
@@ -450,6 +450,18 @@ config KEMBTK_BUSYB_SHA1SUM
 	help
 	  Compute and check SHA1 message digest
 
+config KEMBTK_BUSYB_SHA256SUM
+	bool "sha256sum"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Compute and check SHA256 message digest
+
+config KEMBTK_BUSYB_SHA512SUM
+	bool "sha512sum"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Compute and check SHA512 message digest
+
 config KEMBTK_BUSYB_SLEEP
 	bool "sleep"
 	help
@@ -663,7 +675,7 @@ config KEMBTK_BUSYB_FEATURE_WC_LARGE
 	bool "Support very large files in wc"
 	depends on KEMBTK_BUSYB_WC
 	help
-	  Use "unsigned long long" in wc for count variables.
+	  Use "unsigned long long" in wc for counter variables.
 
 config KEMBTK_BUSYB_WHO
 	bool "who"
diff --git a/busybox-debianutils.kconfig b/busybox-debianutils.kconfig
index 88179d6..0b0130d 100644
--- a/busybox-debianutils.kconfig
+++ b/busybox-debianutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Debian Utilities"
+comment "Debian Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_MKTEMP
diff --git a/busybox-e2fsprogs-old_e2fsprogs.kconfig b/busybox-e2fsprogs-old_e2fsprogs.kconfig
index aa3c8f1..44ae857 100644
--- a/busybox-e2fsprogs-old_e2fsprogs.kconfig
+++ b/busybox-e2fsprogs-old_e2fsprogs.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Linux Ext2 FS Progs"
+comment "Linux Ext2 FS Progs"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_CHATTR
diff --git a/busybox-e2fsprogs.kconfig b/busybox-e2fsprogs.kconfig
index bae2113..afe5812 100644
--- a/busybox-e2fsprogs.kconfig
+++ b/busybox-e2fsprogs.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Linux Ext2 FS Progs"
+comment "Linux Ext2 FS Progs"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_CHATTR
diff --git a/busybox-editors.kconfig b/busybox-editors.kconfig
index 9ec5610..39a7e64 100644
--- a/busybox-editors.kconfig
+++ b/busybox-editors.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Editors"
+comment "Editors"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_AWK
diff --git a/busybox-findutils.kconfig b/busybox-findutils.kconfig
index ef0112f..c913e31 100644
--- a/busybox-findutils.kconfig
+++ b/busybox-findutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Finding Utilities"
+comment "Finding Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_FIND
diff --git a/busybox-init.kconfig b/busybox-init.kconfig
index d6732e9..fbb50e4 100644
--- a/busybox-init.kconfig
+++ b/busybox-init.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Init Utilities"
+comment "Init Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_INIT
@@ -33,11 +33,12 @@ config KEMBTK_BUSYB_FEATURE_KILL_DELAY
 	int "How long to wait between TERM and KEMBTK_BUSYB_KILL (0 - send TERM only)" if KEMBTK_BUSYB_FEATURE_KILL_REMOVED
 	range 0 1024
 	default 0
+	depends on KEMBTK_BUSYB_FEATURE_KILL_REMOVED
 	help
 	  With nonzero setting, init sends TERM, forks, child waits N
 	  seconds, sends KEMBTK_BUSYB_KILL and exits. Setting it too high is unwise
-	  (child will hang around for too long and can actually kill
-	  wrong process!)
+	  (child will hang around for too long and could actually kill
+	  the wrong process!)
 
 config KEMBTK_BUSYB_FEATURE_INIT_SCTTY
 	bool "Run commands with leading dash with controlling tty"
diff --git a/busybox-libbb.kconfig b/busybox-libbb.kconfig
index 339e525..1427ac2 100644
--- a/busybox-libbb.kconfig
+++ b/busybox-libbb.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Busybox Library Tuning"
+comment "Busybox Library Tuning"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_PASSWORD_MINLEN
diff --git a/busybox-loginutils.kconfig b/busybox-loginutils.kconfig
index c99e66e..24ce02f 100644
--- a/busybox-loginutils.kconfig
+++ b/busybox-loginutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Login/Password Management Utilities"
+comment "Login/Password Management Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS
@@ -58,7 +58,7 @@ config KEMBTK_BUSYB_USE_BB_SHADOW
 	  password servers and whatnot.
 
 config KEMBTK_BUSYB_USE_BB_CRYPT
-	bool "Use internal DES and MD5 crypt functions"
+	bool "Use internal crypt functions"
 	default y
 	help
 	  Busybox has internal DES and MD5 crypt functions.
@@ -79,6 +79,18 @@ config KEMBTK_BUSYB_USE_BB_CRYPT
 	  In static build, it makes code _smaller_ by about 1.2k,
 	  and likely many kilobytes less of bss.
 
+config KEMBTK_BUSYB_USE_BB_CRYPT_SHA
+	bool "Enable SHA256/512 crypt functions"
+	depends on KEMBTK_BUSYB_USE_BB_CRYPT
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable this if you have passwords starting with "$5$" or "$6$"
+	  in your /etc/passwd or /etc/shadow files. These passwords
+	  are hashed using SHA256 and SHA512 algorithms. Support for them
+	  was added to glibc in 2008.
+	  With this option off, login will fail password check for any
+	  user which has password encrypted with these algorithms.
+
 config KEMBTK_BUSYB_ADDGROUP
 	bool "addgroup"
 	help
@@ -214,14 +226,15 @@ config KEMBTK_BUSYB_FEATURE_PASSWD_WEAK_CHECK
 config KEMBTK_BUSYB_CRYPTPW
 	bool "cryptpw"
 	help
-	  Applet for crypting a string.
+	  Encrypts the given password with the crypt(3) libc function
+	  using the given salt. Debian has this utility under mkpasswd
+	  name. Busybox provides mkpasswd as an alias for cryptpw.
 
 config KEMBTK_BUSYB_CHPASSWD
 	bool "chpasswd"
 	help
-	  chpasswd reads a file of user name and password pairs from
-	  standard input and uses this information to update a group of
-	  existing users.
+	  Reads a file of user name and password pairs from standard input
+	  and uses this information to update a group of existing users.
 
 config KEMBTK_BUSYB_SU
 	bool "su"
diff --git a/busybox-mailutils.kconfig b/busybox-mailutils.kconfig
index d27ba76..90bf254 100644
--- a/busybox-mailutils.kconfig
+++ b/busybox-mailutils.kconfig
@@ -1,5 +1,5 @@
 comment "-------------------------------------------------"
-comment "----- Mail Utilities"
+comment "Mail Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_MAKEMIME
@@ -48,17 +48,18 @@ config KEMBTK_BUSYB_SENDMAIL
 	  Barebones sendmail.
 
 config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
-	bool "Allow to specify subject, attachments, their charset etc"
-	default y
-	depends on KEMBTK_BUSYB_SENDMAIL
-	help
-	  Allow to specify subject, attachments and their charset.
-	  Allow to use custom connection helper.
+       bool "Allow to specify subject, attachments, their charset etc"
+       default y
+       depends on KEMBTK_BUSYB_SENDMAIL
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+         Allow to specify subject, attachments and their charset.
+         Allow to use custom connection helper.
 
 config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILXX
-	bool "Allow to specify Cc: addresses and some additional headers"
-	depends on KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
-	help
-	  Allow to specify Cc: addresses and some additional headers:
-	  Errors-To:
-
+       bool "Allow to specify Cc: addresses and some additional headers"
+       depends on KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILX
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+         Allow to specify Cc: addresses and some additional headers:
+         Errors-To:
diff --git a/busybox-miscutils.kconfig b/busybox-miscutils.kconfig
index 249333d..d13a223 100644
--- a/busybox-miscutils.kconfig
+++ b/busybox-miscutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Miscellaneous Utilities"
+comment "Miscellaneous Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_ADJTIMEX
@@ -111,6 +111,14 @@ config KEMBTK_BUSYB_FEATURE_CROND_CALL_SENDMAIL
 	help
 	  Support calling /usr/sbin/sendmail for send cmd outputs.
 
+config KEMBTK_BUSYB_FEATURE_CROND_DIR
+	string "crond spool directory"
+	default "/var/spool/cron"
+	depends on KEMBTK_BUSYB_CROND || KEMBTK_BUSYB_CRONTAB
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Location of crond spool.
+
 config KEMBTK_BUSYB_CRONTAB
 	bool "crontab"
 	select KEMBTK_BUSYB_FEATURE_SUID
@@ -137,7 +145,10 @@ config KEMBTK_BUSYB_DEVFSD
 	bool "devfsd (obsolete)"
 	select KEMBTK_BUSYB_FEATURE_SYSLOG
 	help
-	  This is deprecated, and will be removed at the end of 2008.
+	  This is deprecated and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	  See docs/mdev.txt for detailed instructions on how to use mdev
+	  instead.
 
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
@@ -146,7 +157,7 @@ config KEMBTK_BUSYB_DEVFSD
 	  "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
 	  "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
 
-	   But only if they are written UPPERCASE!!!!!!!!
+	  But only if they are written UPPERCASE!!!!!!!!
 
 config KEMBTK_BUSYB_DEVFSD_MODLOAD
 	bool "Adds support for MODLOAD keyword in devsfd.conf"
@@ -172,9 +183,11 @@ config KEMBTK_BUSYB_DEVFSD_VERBOSE
 config KEMBTK_BUSYB_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	help
-	  This is obsolete and will be going away at the end of 2008..
+	  This is obsolete and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
 
-	  This tells busybox to look for names like /dev/loop/0 instead of
+	  For legacy systems -- if there is no way around devfsd -- this
+	  tells busybox to look for names like /dev/loop/0 instead of
 	  /dev/loop0. If your /dev directory has normal names instead of
 	  devfs names, you don't want this.
 
@@ -216,6 +229,20 @@ config KEMBTK_BUSYB_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 
+config KEMBTK_BUSYB_FLASH_ERASEALL
+	bool "flash_eraseall"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	  This utility is used to erase the whole KEMBTK_BUSYB_MTD device.
+
+config KEMBTK_BUSYB_IONICE
+	bool "ionice"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Set/set program io scheduling class and priority
+	  Requires kernel >= 2.6.13
+
 config KEMBTK_BUSYB_INOTIFYD
 	bool "inotifyd"
 	help
@@ -274,13 +301,6 @@ config KEMBTK_BUSYB_FEATURE_LESS_FLAGS
 	  The -M flag enables a more sophisticated status line.
 	  The -m flag enables a simpler status line with a percentage.
 
-config KEMBTK_BUSYB_FEATURE_LESS_DASHCMD
-	bool "Enable flag changes ('-' command)"
-	depends on KEMBTK_BUSYB_LESS
-	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
-
 config KEMBTK_BUSYB_FEATURE_LESS_MARKS
 	bool "Enable marks"
 	depends on KEMBTK_BUSYB_LESS
@@ -293,18 +313,25 @@ config KEMBTK_BUSYB_FEATURE_LESS_REGEXP
 	help
 	  Enable regular expressions, allowing complex file searches.
 
-config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS
-	bool "Enable dynamic switching of line numbers"
-	depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD
-	help
-	  Enable "-N" command.
-
 config KEMBTK_BUSYB_FEATURE_LESS_WINCH
 	bool "Enable automatic resizing on window size changes"
 	depends on KEMBTK_BUSYB_LESS
 	help
 	  Makes less track window size changes.
 
+config KEMBTK_BUSYB_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	depends on KEMBTK_BUSYB_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
+config KEMBTK_BUSYB_FEATURE_LESS_LINENUMS
+	bool "Enable dynamic switching of line numbers"
+	depends on KEMBTK_BUSYB_FEATURE_LESS_DASHCMD
+	help
+	  Enable "-N" command.
+
 config KEMBTK_BUSYB_HDPARM
 	bool "hdparm"
 	help
@@ -352,11 +379,10 @@ config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
 	  stuff, so you should probably say N.
 
 config KEMBTK_BUSYB_FEATURE_HDPARM_HDIO_GETSET_DMA
-	bool "Get/set using_dma flag (DANGEROUS)"
+	bool "Get/set using_dma flag"
 	depends on KEMBTK_BUSYB_HDPARM
 	help
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
-	  This is dangerous stuff, so you should probably say N.
 
 config KEMBTK_BUSYB_MAKEDEVS
 	bool "makedevs"
@@ -478,6 +504,13 @@ config KEMBTK_BUSYB_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
+config KEMBTK_BUSYB_TIMEOUT
+	bool "timeout"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Runs a program and watches it. If it does not terminate in
+	  specified number of seconds, it is sent a signal.
+
 config KEMBTK_BUSYB_TTYSIZE
 	bool "ttysize"
 	help
diff --git a/busybox-modutils.kconfig b/busybox-modutils.kconfig
index 3502200..397063a 100644
--- a/busybox-modutils.kconfig
+++ b/busybox-modutils.kconfig
@@ -4,23 +4,9 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Linux Module Utilities"
+comment "Linux Module Utilities"
 comment "-------------------------------------------------"
 
-config KEMBTK_BUSYB_DEFAULT_MODULES_DIR
-	string "Default directory containing modules"
-	default "/lib/modules"
-	help
-	  Directory that contains kernel modules.
-	  Defaults to "/lib/modules"
-
-config KEMBTK_BUSYB_DEFAULT_DEPMOD_FILE
-	string "Default name of modules.dep"
-	default "modules.dep"
-	help
-	  Filename that contains kernel modules dependencies.
-	  Defaults to "modules.dep"
-
 config KEMBTK_BUSYB_MODPROBE_SMALL
 	bool "Simplified modutils"
 	help
@@ -58,14 +44,12 @@ config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 	depends on KEMBTK_BUSYB_MODPROBE_SMALL
 	help
 	  Allow insmod and modprobe take module options from command line.
-	  N.B. Very bloaty.
 
 config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	bool "Skip loading of already loaded modules"
 	depends on KEMBTK_BUSYB_MODPROBE_SMALL
 	help
 	  Check if the module is already loaded.
-	  N.B. It's racy.
 
 config KEMBTK_BUSYB_INSMOD
 	bool "insmod"
@@ -100,9 +84,6 @@ config KEMBTK_BUSYB_MODPROBE
 	  Handle the loading of modules, and their dependencies on a high
 	  level.
 
-	  Note that in the state, modprobe does not understand multiple
-	  module options from the configuration file. See option below.
-
 config KEMBTK_BUSYB_FEATURE_MODPROBE_BLACKLIST
 	bool
 	prompt "Blacklist support"
@@ -146,7 +127,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	  By adding module symbols to the kernel symbol table, Oops messages
 	  occuring within kernel modules can be properly debugged. By enabling
 	  this feature, module symbols will always be added to the kernel symbol
-	  table for properly debugging support. If you are not interested in
+	  table for proper debugging support. If you are not interested in
 	  Oops messages from kernel modules, say N.
 
 config KEMBTK_BUSYB_FEATURE_INSMOD_LOADINKMEM
@@ -180,7 +161,6 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP_FULL
 config KEMBTK_BUSYB_FEATURE_CHECK_TAINTED_MODULE
 	bool "Support tainted module checking with new kernels"
 	default y
-	depends on !KEMBTK_BUSYB_MODPROBE_SMALL
 	help
 	  Support checking for tainted modules. These are usually binary
 	  only modules that will make the linux-kernel list ignore your
@@ -214,3 +194,17 @@ config KEMBTK_BUSYB_FEATURE_MODUTILS_SYMBOLS
 
 	  Say Y if unsure.
 
+config KEMBTK_BUSYB_DEFAULT_MODULES_DIR
+	string "Default directory containing modules"
+	default "/lib/modules"
+	help
+	  Directory that contains kernel modules.
+	  Defaults to "/lib/modules"
+
+config KEMBTK_BUSYB_DEFAULT_DEPMOD_FILE
+	string "Default name of modules.dep"
+	default "modules.dep"
+	help
+	  Filename that contains kernel modules dependencies.
+	  Defaults to "modules.dep"
+
diff --git a/busybox-networking.kconfig b/busybox-networking.kconfig
index 1f966e3..c6e5cc4 100644
--- a/busybox-networking.kconfig
+++ b/busybox-networking.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Networking Utilities"
+comment "Networking Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_FEATURE_IPV6
@@ -14,7 +14,7 @@ config KEMBTK_BUSYB_FEATURE_IPV6
 	  This adds KEMBTK_BUSYB_IPv6 support in the networking applets.
 
 config KEMBTK_BUSYB_FEATURE_PREFER_IPV4_ADDRESS
-	bool "Preferentially use KEMBTK_BUSYB_IPv4 addresses from DNS queries"
+	bool "Prefer KEMBTK_BUSYB_IPv4 addresses from DNS queries"
 	default y
 	depends on KEMBTK_BUSYB_FEATURE_IPV6
 	help
@@ -85,6 +85,20 @@ config KEMBTK_BUSYB_FAKEIDENTD
 	  fakeidentd listens on the ident port and returns a predefined
 	  fake value on any query.
 
+config KEMBTK_BUSYB_FTPD
+	bool "ftpd"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  simple FTP daemon. You have to run it via inetd.
+
+config KEMBTK_BUSYB_FEATURE_FTP_WRITE
+	bool "Enable upload commands"
+	default y
+	depends on KEMBTK_BUSYB_FTPD
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable all kinds of FTP upload commands (-w option)
+
 config KEMBTK_BUSYB_FTPGET
 	bool "ftpget"
 	help
@@ -127,11 +141,12 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_USE_SENDFILE
 	  instead of read/write loop.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-	bool "Support reloading of global config file on HUP signal"
-	depends on KEMBTK_BUSYB_HTTPD
-	help
-	  This option enables processing of SIGHUP to reload cached
-	  configuration settings.
+       bool "Support reloading of global config file on HUP signal"
+       depends on KEMBTK_BUSYB_HTTPD
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+         This option enables processing of SIGHUP to reload cached
+         configuration settings.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_SETUID
 	bool "Enable -u <user> option"
@@ -158,11 +173,12 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_AUTH_MD5
 	  using md5 passwords.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-	bool "Support loading additional MIME types at run-time"
-	depends on KEMBTK_BUSYB_HTTPD
-	help
-	  This option enables support for additional MIME types at
-	  run-time to be specified in the configuration file.
+       bool "Support loading additional MIME types at run-time"
+       depends on KEMBTK_BUSYB_HTTPD
+       depends on EMBTK_BB_VERSION_1_13_X
+       help
+         This option enables support for additional MIME types at
+         run-time to be specified in the configuration file.
 
 config KEMBTK_BUSYB_FEATURE_HTTPD_CGI
 	bool "Support Common Gateway Interface (CGI)"
@@ -755,7 +771,7 @@ config KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE
 
 config KEMBTK_BUSYB_TFTP_DEBUG
 	bool "Enable debug"
-	depends on KEMBTK_BUSYB_TFTP
+	depends on KEMBTK_BUSYB_TFTP || KEMBTK_BUSYB_TFTPD
 	help
 	  Enable debug settings for tftp. This is useful if you're running
 	  into problems with tftp as the protocol doesn't help you much when
@@ -770,7 +786,7 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_VERBOSE
 	bool "Enable verbose output"
 	depends on KEMBTK_BUSYB_TRACEROUTE
 	help
-	  Add some verbosity to traceroute. This includes amongst other things
+	  Add some verbosity to traceroute. This includes among other things
 	  hostnames and ICMP response types.
 
 config KEMBTK_BUSYB_FEATURE_TRACEROUTE_SOURCE_ROUTE
@@ -784,10 +800,20 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_USE_ICMP
 	bool "Use ICMP instead of UDP"
 	depends on KEMBTK_BUSYB_TRACEROUTE
 	help
-	  Add feature to allow for ICMP KEMBTK_BUSYB_ECHO instead of UDP datagrams.
+	  Add option -I to use ICMP KEMBTK_BUSYB_ECHO instead of UDP datagrams.
 
 source packages/busybox/busybox-kconfigs/busybox-networking-udhcp.kconfig
 
+config KEMBTK_BUSYB_IFUPDOWN_UDHCPC_CMD_OPTIONS
+	string "ifup udhcpc command line options"
+	default "-R -n"
+	depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_APP_UDHCPC
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Command line options to pass to udhcpc from ifup.
+	  Intended to alter options not available in /etc/network/interfaces.
+	  (IE: --syslog --background etc...)
+
 config KEMBTK_BUSYB_VCONFIG
 	bool "vconfig"
 	help
@@ -836,6 +862,20 @@ config KEMBTK_BUSYB_TCPSVD
 	  tcpsvd listens on a TCP port and runs a program for each new
 	  connection.
 
+config KEMBTK_BUSYB_TUNCTL
+	bool "tunctl"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  tunctl creates or deletes tun devices.
+
+config KEMBTK_BUSYB_FEATURE_TUNCTL_UG
+	bool "Support owner:group assignment"
+	depends on KEMBTK_BUSYB_TUNCTL
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Allow to specify owner and group of newly created interface.
+	  340 bytes of pure bloat. Say no here.
+
 config KEMBTK_BUSYB_UDPSVD
 	bool "udpsvd"
 	help
diff --git a/busybox-printutils.kconfig b/busybox-printutils.kconfig
index e511c9b..ac35a51 100644
--- a/busybox-printutils.kconfig
+++ b/busybox-printutils.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Print Utilities"
+comment "Print Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_LPD
diff --git a/busybox-procps.kconfig b/busybox-procps.kconfig
index 8a5a50e..48c97a9 100644
--- a/busybox-procps.kconfig
+++ b/busybox-procps.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Process Utilities"
+comment "Process Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_FREE
diff --git a/busybox-runit.kconfig b/busybox-runit.kconfig
index 9b4c443..b693bd5 100644
--- a/busybox-runit.kconfig
+++ b/busybox-runit.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Runit Utilities"
+comment "Runit Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_RUNSV
diff --git a/busybox-selinux.kconfig b/busybox-selinux.kconfig
index 92c7b43..5e7a0be 100644
--- a/busybox-selinux.kconfig
+++ b/busybox-selinux.kconfig
@@ -2,12 +2,11 @@
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
 #
-
-
 if KEMBTK_BUSYB_SELINUX
 comment "-------------------------------------------------"
-comment "----- SELinux Utilities"
+comment "SELinux Utilities"
 comment "-------------------------------------------------"
+	depends on KEMBTK_BUSYB_SELINUX
 
 config KEMBTK_BUSYB_CHCON
 	bool "chcon"
diff --git a/busybox-shell.kconfig b/busybox-shell.kconfig
index 73d355d..7a6bbae 100644
--- a/busybox-shell.kconfig
+++ b/busybox-shell.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Shells"
+comment "Shells"
 comment "-------------------------------------------------"
 
 choice
@@ -86,16 +86,18 @@ config KEMBTK_BUSYB_ASH_MATH_SUPPORT
 	bool "Posix math support"
 	default y
 	depends on KEMBTK_BUSYB_ASH
+	depends on EMBTK_BB_VERSION_1_13_X
 	help
-	  Enable math support in the ash shell.
+	 Enable math support in the ash shell.
 
 config KEMBTK_BUSYB_ASH_MATH_SUPPORT_64
 	bool "Extend Posix math support to 64 bit"
 	depends on KEMBTK_BUSYB_ASH_MATH_SUPPORT
+	depends on EMBTK_BB_VERSION_1_13_X
 	help
-	  Enable 64-bit math support in the ash shell. This will make
-	  the shell slightly larger, but will allow computation with very
-	  large numbers.
+	 Enable 64-bit math support in the ash shell. This will make
+	 the shell slightly larger, but will allow computation with very
+	 large numbers.
 
 config KEMBTK_BUSYB_ASH_GETOPTS
 	bool "Builtin getopt to parse positional parameters"
@@ -147,36 +149,35 @@ config KEMBTK_BUSYB_ASH_OPTIMIZE_FOR_SIZE
 	  Compile ash for reduced size at the price of speed.
 
 config KEMBTK_BUSYB_ASH_RANDOM_SUPPORT
-	bool "Pseudorandom generator and variable $RANDOM"
+	bool "Pseudorandom generator and $RANDOM variable"
 	depends on KEMBTK_BUSYB_ASH
 	help
 	  Enable pseudorandom generator and dynamic variable "$RANDOM".
 	  Each read of "$RANDOM" will generate a new pseudorandom value.
 	  You can reset the generator by using a specified start value.
-	  After "unset RANDOM" then generator will switch off and this
+	  After "unset RANDOM" the generator will switch off and this
 	  variable will no longer have special treatment.
 
 config KEMBTK_BUSYB_ASH_EXPAND_PRMT
 	bool "Expand prompt string"
 	depends on KEMBTK_BUSYB_ASH
 	help
-	  "PS#" may be contain volatile content, such as backquote commands.
+	  "PS#" may contain volatile content, such as backquote commands.
 	  This option recreates the prompt string from the environment
 	  variable each time it is displayed.
 
 config KEMBTK_BUSYB_HUSH
 	bool "hush"
 	help
-	  hush is a very small shell (just 18k) and it has fairly complete
-	  Bourne shell grammar. It even handles all the normal flow control
-	  options such as if/then/elif/else/fi, for/in/do/done, while loops,
-	  case/esac.
+	  hush is a small shell (22k). It handles the normal flow control
+	  constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
+	  case/esac. Redirections, here documents, $((arithmetic))
+	  and functions are supported.
 
-	  It uses only vfork, so it can be used on uClinux systems.
+	  It will compile and work on no-mmu systems.
 
-	  It does not handle select, functions, here documents ( <<
-	  word ), arithmetic expansion, aliases, brace expansion, tilde
-	  expansion, &> and >& redirection of stdout+stderr, etc.
+	  It does not handle select, aliases, brace expansion,
+	  tilde expansion, &>file and >&file redirection of stdout+stderr.
 
 config KEMBTK_BUSYB_HUSH_HELP
 	bool "help builtin"
@@ -221,7 +222,6 @@ config KEMBTK_BUSYB_HUSH_LOOPS
 	depends on KEMBTK_BUSYB_HUSH
 	help
 	  Enable for, while and until loops in hush.
-	  As of 2008-07, break and continue statements are not supported.
 
 config KEMBTK_BUSYB_HUSH_CASE
 	bool "Support case ... esac statement"
@@ -229,25 +229,60 @@ config KEMBTK_BUSYB_HUSH_CASE
 	help
 	  Enable case ... esac statement in hush. +400 bytes.
 
+config KEMBTK_BUSYB_HUSH_FUNCTIONS
+	bool "Support funcname() { commands; } syntax"
+	depends on KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable support for shell functions in hush. +800 bytes.
+
+config KEMBTK_BUSYB_HUSH_EXPORT_N
+	bool "Support export '-n' option"
+	depends on KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable support for export '-n' option in hush. It is a bash extension.
+
 config KEMBTK_BUSYB_LASH
-	bool "lash"
+	bool "lash (deprecated: aliased to hush)"
 	select KEMBTK_BUSYB_HUSH
 	help
 	  lash is deprecated and will be removed, please migrate to hush.
 
 config KEMBTK_BUSYB_MSH
-	bool "msh"
+	bool "msh (deprecated: please use hush)"
 	help
-	  The minix shell (adds just 30k) is quite complete and handles things
-	  like for/do/done, case/esac and all the things you expect a Bourne
-	  shell to do. It is not always pedantically correct about Bourne
-	  shell grammar (try running the shell testscript "tests/sh.testcases"
-	  on it and compare vs bash) but for most things it works quite well.
-	  It uses only vfork, so it can be used on uClinux systems.
+	  msh is deprecated and will be removed, please migrate to hush.
+	  If there is a feature msh has but hush does not, please let us know.
+
+#	  The minix shell (adds just 30k) is quite complete and handles things
+#	  like for/do/done, case/esac and all the things you expect a Bourne
+#	  shell to do. It is not always pedantically correct about Bourne
+#	  shell grammar (try running the shell testscript "tests/sh.testcases"
+#	  on it and compare vs bash) but for most things it works quite well.
+#	  It uses only vfork, so it can be used on uClinux systems.
+
 
 comment "Bourne Shell Options"
 	depends on KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH
 
+config KEMBTK_BUSYB_SH_MATH_SUPPORT
+	bool "POSIX math support"
+	default y
+	depends on KEMBTK_BUSYB_ASH || KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable math support in the shell via $((...)) syntax.
+
+config KEMBTK_BUSYB_SH_MATH_SUPPORT_64
+	bool "Extend POSIX math support to 64 bit"
+	depends on KEMBTK_BUSYB_SH_MATH_SUPPORT
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Enable 64-bit math support in the shell. This will make the shell
+	  slightly larger, but will allow computation with very large numbers.
+	  This is not in POSIX, so do not rely on this in portable code.
+
 config KEMBTK_BUSYB_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	depends on KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH
diff --git a/busybox-sysklogd.kconfig b/busybox-sysklogd.kconfig
index ce6a4af..d4ec149 100644
--- a/busybox-sysklogd.kconfig
+++ b/busybox-sysklogd.kconfig
@@ -4,7 +4,7 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- System Logging Utilities"
+comment "System Logging Utilities"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_SYSLOGD
diff --git a/busybox-util-linux.kconfig b/busybox-util-linux.kconfig
index 917f8a5..8f4b953 100644
--- a/busybox-util-linux.kconfig
+++ b/busybox-util-linux.kconfig
@@ -4,9 +4,31 @@
 #
 
 comment "-------------------------------------------------"
-comment "----- Linux System Utilities"
+comment "Linux System Utilities"
 comment "-------------------------------------------------"
 
+config KEMBTK_BUSYB_ACPID
+	bool "acpid"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  acpid listens to ACPI events coming either in textual form from
+	  /proc/acpi/event (though it is marked deprecated it is still widely
+	  used and _is_ a standard) or in binary form from specified evdevs
+	  (just use /dev/input/event*).
+
+	  It parses the event to retrieve ACTION and a possible PARAMETER.
+	  It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts
+	  (if the resulting path is a directory) or directly as an executable.
+
+	  N.B. acpid relies on run-parts so have the latter installed.
+
+config KEMBTK_BUSYB_FEATURE_ACPID_COMPAT
+	bool "Accept and ignore redundant options"
+	depends on KEMBTK_BUSYB_ACPID
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Accept and ignore compatibility options -g -m -s -S -v.
+
 config KEMBTK_BUSYB_BLKID
 	bool "blkid"
 	select KEMBTK_BUSYB_VOLUMEID
@@ -196,6 +218,12 @@ config KEMBTK_BUSYB_FEATURE_MINIX2
 	  this. If you enabled 'mkfs_minix' then you almost certainly want to
 	  be using the version 2 filesystem support.
 
+config KEMBTK_BUSYB_MKFS_VFAT
+	bool "mkfs_vfat"
+	depends on EMBTK_BB_VERSION_1_14_X
+	help
+	  Utility to create FAT32 filesystems.
+
 config KEMBTK_BUSYB_GETOPT
 	bool "getopt"
 	help
diff --git a/busybox.kconfig b/busybox.kconfig
index 1f22ad2..635bf20 100644
--- a/busybox.kconfig
+++ b/busybox.kconfig
@@ -7,12 +7,13 @@
 config KEMBTK_BUSYB_HAVE_DOT_CONFIG
 	bool
 	default y
-comment "----------------------------------------------------------------------"
-comment "------------------------ Busybox Settings ------------------"
-comment "----------------------------------------------------------------------"
-comment ""
+
+comment "-------------------------------------------------"
+comment "Busybox Settings"
+comment "-------------------------------------------------"
+
 comment "-------------------------------------------------"
-comment "----- General Configuration"
+comment "General Configuration"
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_DESKTOP
@@ -256,8 +257,9 @@ config KEMBTK_BUSYB_FEATURE_HAVE_RPC
 	#  This is automatically selected if any of enabled applets need it.
 	#  You do not need to select it manually.
 
+
 comment "-------------------------------------------------"
-comment "----- Build Options"
+comment 'Build Options'
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_STATIC
@@ -391,8 +393,16 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX
 
 	  Native builds leave this empty.
 
+config KEMBTK_BUSYB_EXTRA_CFLAGS
+	string "Additional CFLAGS"
+	depends on EMBTK_BB_VERSION_1_14_X
+	default ""
+	help
+	  Additional CFLAGS to pass to the compiler verbatim.
+
+
 comment "-------------------------------------------------"
-comment "----- Debugging Options"
+comment 'Debugging Options'
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_DEBUG
@@ -475,8 +485,9 @@ config KEMBTK_BUSYB_INCLUDE_SUSv2
 ### config PARSE
 ### 	bool "Uniform config file parser debugging applet: parse"
 
+
 comment "-------------------------------------------------"
-comment "----- Installation Options:"
+comment 'Installation Options'
 comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_INSTALL_NO_USR
@@ -550,9 +561,8 @@ config KEMBTK_BUSYB_PREFIX
 
 source packages/busybox/busybox-kconfigs/busybox-libbb.kconfig
 
-comment "-------------------------------------------------"
-comment "----- Applets"
-comment "-------------------------------------------------"
+
+comment "Applets"
 
 source packages/busybox/busybox-kconfigs/busybox-archival.kconfig
 source packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig