Import busybox-1.15.0 kconfig symbolsembtk-busybox-kconfigs-1.15.0

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

18 files changed, 354 insertions, 147 deletions

diff --git a/busybox-archival.kconfig b/busybox-archival.kconfig
index 0e9b37c..b537e6f 100644
--- a/busybox-archival.kconfig
+++ b/busybox-archival.kconfig
@@ -50,11 +50,11 @@ config KEMBTK_BUSYB_AR
 	  probably say N here.
 
 config KEMBTK_BUSYB_FEATURE_AR_LONG_FILENAMES
-	bool "Support for long filenames (not need for debs)"
+	bool "Support for long filenames (not needed for debs)"
 	depends on KEMBTK_BUSYB_AR
 	help
-	  By default the ar format can only store the first 15 characters of
-	  the filename, this option removes that limitation.
+	  By default the ar format can only store the first 15 characters
+	  of the filename, this option removes that limitation.
 	  It supports the GNU ar long filename method which moves multiple long
 	  filenames into a the data section of a new ar entry.
 
@@ -105,7 +105,7 @@ config KEMBTK_BUSYB_FEATURE_CPIO_O
 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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Passthrough mode. Rarely used.
 
@@ -152,6 +152,21 @@ config KEMBTK_BUSYB_GZIP
 	  gzip is used to compress files.
 	  It's probably the most widely used UNIX compression program.
 
+config KEMBTK_BUSYB_LZOP
+	bool "lzop"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Lzop compression/decompresion.
+
+config KEMBTK_BUSYB_LZOP_COMPR_HIGH
+	bool "lzop complession levels 7,8,9 (not very useful)"
+	depends on KEMBTK_BUSYB_LZOP
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  High levels (7,8,9) of lzop compression. These levels
+	  are actually slower than gzip at equivalent compression ratios
+	  and take up 3.2K of code.
+
 config KEMBTK_BUSYB_RPM2CPIO
 	bool "rpm2cpio"
 	help
@@ -180,10 +195,10 @@ config KEMBTK_BUSYB_FEATURE_TAR_CREATE
 	  tar archives using the `-c' option.
 
 config KEMBTK_BUSYB_FEATURE_TAR_AUTODETECT
-	bool "Autodetect gz/bz2 compressed tarballs"
+	bool "Autodetect compressed tarballs"
 	depends on KEMBTK_BUSYB_FEATURE_SEAMLESS_Z || KEMBTK_BUSYB_FEATURE_SEAMLESS_GZ || KEMBTK_BUSYB_FEATURE_SEAMLESS_BZ2 || KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA
 	help
-	  With this option tar can automatically detect gzip/bzip2 compressed
+	  With this option tar can automatically detect compressed
 	  tarballs. Currently it works only on files (not pipes etc).
 
 config KEMBTK_BUSYB_FEATURE_TAR_FROM
@@ -220,7 +235,7 @@ config KEMBTK_BUSYB_FEATURE_TAR_GNU_EXTENSIONS
 
 config KEMBTK_BUSYB_FEATURE_TAR_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_TAR && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Enable use of long options, increases size by about 400 Bytes
 
@@ -258,8 +273,8 @@ config KEMBTK_BUSYB_FEATURE_LZMA_FAST
 	bool "Optimize unlzma for speed"
 	depends on KEMBTK_BUSYB_UNLZMA
 	help
-	  This option reduces decompression time by about 33% at the cost of
-	  a 2K bigger binary.
+	  This option reduces decompression time by about 25% at the cost of
+	  a 1K bigger binary.
 
 config KEMBTK_BUSYB_UNZIP
 	bool "unzip"
diff --git a/busybox-console-tools.kconfig b/busybox-console-tools.kconfig
index 0cd5b99..2aa64b6 100644
--- a/busybox-console-tools.kconfig
+++ b/busybox-console-tools.kconfig
@@ -80,7 +80,7 @@ config KEMBTK_BUSYB_SETCONSOLE
 
 config KEMBTK_BUSYB_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_SETCONSOLE && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_SETCONSOLE && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the setconsole applet.
 
diff --git a/busybox-coreutils.kconfig b/busybox-coreutils.kconfig
index 4374662..676847f 100644
--- a/busybox-coreutils.kconfig
+++ b/busybox-coreutils.kconfig
@@ -183,7 +183,7 @@ config KEMBTK_BUSYB_ENV
 
 config KEMBTK_BUSYB_FEATURE_ENV_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_ENV && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_ENV && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the env applet.
 
@@ -194,7 +194,7 @@ config KEMBTK_BUSYB_EXPAND
 
 config KEMBTK_BUSYB_FEATURE_EXPAND_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_EXPAND && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_EXPAND && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the expand applet.
 
@@ -222,6 +222,12 @@ config KEMBTK_BUSYB_FOLD
 	help
 	  Wrap text to fit a specific width.
 
+config KEMBTK_BUSYB_FSYNC
+	bool "fsync"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  fsync is used to flush file-related cached blocks to disk.
+
 config KEMBTK_BUSYB_HEAD
 	bool "head"
 	help
@@ -252,7 +258,7 @@ config KEMBTK_BUSYB_INSTALL
 
 config KEMBTK_BUSYB_FEATURE_INSTALL_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_INSTALL && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_INSTALL && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the install applet.
 
@@ -321,7 +327,7 @@ config KEMBTK_BUSYB_FEATURE_LS_USERNAME
 config KEMBTK_BUSYB_FEATURE_LS_COLOR
 	bool "Allow use of color to identify file types"
 	default y
-	depends on KEMBTK_BUSYB_LS && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_LS && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  This enables the --color option to ls.
 
@@ -347,7 +353,7 @@ config KEMBTK_BUSYB_MKDIR
 
 config KEMBTK_BUSYB_FEATURE_MKDIR_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_MKDIR && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_MKDIR && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the mkdir applet.
 
@@ -370,7 +376,7 @@ config KEMBTK_BUSYB_MV
 
 config KEMBTK_BUSYB_FEATURE_MV_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_MV && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_MV && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the mv applet.
 
@@ -435,7 +441,7 @@ config KEMBTK_BUSYB_RMDIR
 
 config KEMBTK_BUSYB_FEATURE_RMDIR_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_RMDIR && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_RMDIR && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the rmdir applet, including
 	  --ignore-fail-on-non-empty for compatibility with GNU rmdir.
@@ -452,13 +458,13 @@ config KEMBTK_BUSYB_SHA1SUM
 
 config KEMBTK_BUSYB_SHA256SUM
 	bool "sha256sum"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Compute and check SHA256 message digest
 
 config KEMBTK_BUSYB_SHA512SUM
 	bool "sha512sum"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Compute and check SHA512 message digest
 
@@ -557,7 +563,7 @@ config KEMBTK_BUSYB_TAIL
 	  from files.
 
 config KEMBTK_BUSYB_FEATURE_FANCY_TAIL
-	bool "Enable extra tail options (-q, -s, and -v)"
+	bool "Enable extra tail options (-q, -s, -v, and -F)"
 	default y
 	depends on KEMBTK_BUSYB_TAIL
 	help
@@ -585,7 +591,7 @@ config KEMBTK_BUSYB_TEST
 
 config KEMBTK_BUSYB_FEATURE_TEST_64
 	bool "Extend test to 64 bit"
-	depends on KEMBTK_BUSYB_TEST || KEMBTK_BUSYB_ASH_BUILTIN_TEST
+	depends on KEMBTK_BUSYB_TEST || KEMBTK_BUSYB_ASH_BUILTIN_TEST || KEMBTK_BUSYB_HUSH
 	help
 	  Enable 64-bit support in test.
 
@@ -641,7 +647,7 @@ config KEMBTK_BUSYB_UNEXPAND
 
 config KEMBTK_BUSYB_FEATURE_UNEXPAND_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_UNEXPAND && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_UNEXPAND && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the unexpand applet.
 
diff --git a/busybox-debianutils.kconfig b/busybox-debianutils.kconfig
index 0b0130d..ffe99e0 100644
--- a/busybox-debianutils.kconfig
+++ b/busybox-debianutils.kconfig
@@ -33,7 +33,7 @@ config KEMBTK_BUSYB_RUN_PARTS
 
 config KEMBTK_BUSYB_FEATURE_RUN_PARTS_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_RUN_PARTS && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_RUN_PARTS && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the run-parts applet.
 
@@ -63,7 +63,7 @@ config KEMBTK_BUSYB_FEATURE_START_STOP_DAEMON_FANCY
 
 config KEMBTK_BUSYB_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_START_STOP_DAEMON && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_START_STOP_DAEMON && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the start-stop-daemon applet.
 
diff --git a/busybox-findutils.kconfig b/busybox-findutils.kconfig
index c913e31..ad8c629 100644
--- a/busybox-findutils.kconfig
+++ b/busybox-findutils.kconfig
@@ -13,17 +13,17 @@ config KEMBTK_BUSYB_FIND
 	  find is used to search your system to find specified files.
 
 config KEMBTK_BUSYB_FEATURE_FIND_PRINT0
-	bool "Enable -print0 option"
+	bool "Enable -print0: NUL-terminated output"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
-	  Causes output names to be separated by a null character
+	  Causes output names to be separated by a NUL character
 	  rather than a newline. This allows names that contain
 	  newlines and other whitespace to be more easily
 	  interpreted by other programs.
 
 config KEMBTK_BUSYB_FEATURE_FIND_MTIME
-	bool "Enable modified time matching (-mtime option)"
+	bool "Enable -mtime: modified time matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -31,7 +31,7 @@ config KEMBTK_BUSYB_FEATURE_FIND_MTIME
 	  files, in days.
 
 config KEMBTK_BUSYB_FEATURE_FIND_MMIN
-	bool "Enable modified time matching (-mmin option)"
+	bool "Enable -mmin: modified time matching by minutes"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -39,14 +39,14 @@ config KEMBTK_BUSYB_FEATURE_FIND_MMIN
 	  files, in minutes.
 
 config KEMBTK_BUSYB_FEATURE_FIND_PERM
-	bool "Enable permissions matching (-perm option)"
+	bool "Enable -perm: permissions matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  Enable searching based on file permissions.
 
 config KEMBTK_BUSYB_FEATURE_FIND_TYPE
-	bool "Enable filetype matching (-type option)"
+	bool "Enable -type: file type matching (file/dir/link/...)"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -54,21 +54,21 @@ config KEMBTK_BUSYB_FEATURE_FIND_TYPE
 	  directory, socket, device, etc.).
 
 config KEMBTK_BUSYB_FEATURE_FIND_XDEV
-	bool "Enable 'stay in filesystem' option (-xdev)"
+	bool "Enable -xdev: 'stay in filesystem'"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  This option allows find to restrict searches to a single filesystem.
 
 config KEMBTK_BUSYB_FEATURE_FIND_MAXDEPTH
-	bool "Enable -maxdepth N option"
+	bool "Enable -maxdepth N"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  This option enables -maxdepth N option.
 
 config KEMBTK_BUSYB_FEATURE_FIND_NEWER
-	bool "Enable -newer option for comparing file mtimes"
+	bool "Enable -newer: compare file modification times"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -76,14 +76,14 @@ config KEMBTK_BUSYB_FEATURE_FIND_NEWER
 	  a modified time that is more recent than the specified FILE.
 
 config KEMBTK_BUSYB_FEATURE_FIND_INUM
-	bool "Enable inode number matching (-inum option)"
+	bool "Enable -inum: inode number matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  Support the 'find -inum' option for searching by inode number.
 
 config KEMBTK_BUSYB_FEATURE_FIND_EXEC
-	bool "Enable -exec option allowing execution of commands"
+	bool "Enable -exec: execute commands"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -91,14 +91,14 @@ config KEMBTK_BUSYB_FEATURE_FIND_EXEC
 	  the files matched.
 
 config KEMBTK_BUSYB_FEATURE_FIND_USER
-	bool "Enable username/uid matching (-user option)"
+	bool "Enable -user: username/uid matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  Support the 'find -user' option for searching by username or uid.
 
 config KEMBTK_BUSYB_FEATURE_FIND_GROUP
-	bool "Enable group/gid matching (-group option)"
+	bool "Enable -group: group/gid matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -114,7 +114,7 @@ config KEMBTK_BUSYB_FEATURE_FIND_NOT
 	  the non-POSIX notation '-not'.
 
 config KEMBTK_BUSYB_FEATURE_FIND_DEPTH
-	bool "Enable the -depth option"
+	bool "Enable -depth"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -128,14 +128,14 @@ config KEMBTK_BUSYB_FEATURE_FIND_PAREN
 	  Enable usage of parens '(' to specify logical order of arguments.
 
 config KEMBTK_BUSYB_FEATURE_FIND_SIZE
-	bool "Enable -size option allowing matching for file size"
+	bool "Enable -size: file size matching"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  Support the 'find -size' option for searching by file size.
 
 config KEMBTK_BUSYB_FEATURE_FIND_PRUNE
-	bool "Enable -prune option allowing to exclude subdirectories"
+	bool "Enable -prune: exclude subdirectories"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
@@ -143,7 +143,7 @@ config KEMBTK_BUSYB_FEATURE_FIND_PRUNE
 	  exclusion .svn and CVS directories.
 
 config KEMBTK_BUSYB_FEATURE_FIND_DELETE
-	bool "Enable -delete option allowing to delete files"
+	bool "Enable -delete: delete files/dirs"
 	depends on KEMBTK_BUSYB_FIND && KEMBTK_BUSYB_FEATURE_FIND_DEPTH
 	help
 	  Support the 'find -delete' option for deleting files and directories.
@@ -151,21 +151,21 @@ config KEMBTK_BUSYB_FEATURE_FIND_DELETE
 	  try to protect the user from doing stupid things. Use with care.
 
 config KEMBTK_BUSYB_FEATURE_FIND_PATH
-	bool "Enable -path option allowing to match pathname patterns"
+	bool "Enable -path: match pathname with shell pattern"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  The -path option matches whole pathname instead of just filename.
 
 config KEMBTK_BUSYB_FEATURE_FIND_REGEX
-	bool "Enable -regex: match pathname to regex"
+	bool "Enable -regex: match pathname with regex"
 	default y
 	depends on KEMBTK_BUSYB_FIND
 	help
 	  The -regex option matches whole pathname against regular expression.
 
 config KEMBTK_BUSYB_FEATURE_FIND_CONTEXT
-	bool "Enable -context option for matching security context"
+	bool "Enable -context: security context matching"
 	depends on KEMBTK_BUSYB_FIND && KEMBTK_BUSYB_SELINUX
 	help
 	  Support the 'find -context' option for matching security context.
@@ -176,7 +176,7 @@ config KEMBTK_BUSYB_GREP
 	  grep is used to search files for a specified pattern.
 
 config KEMBTK_BUSYB_FEATURE_GREP_EGREP_ALIAS
-	bool "Support extended regular expressions (egrep & grep -E)"
+	bool "Enable extended regular expressions (egrep & grep -E)"
 	default y
 	depends on KEMBTK_BUSYB_GREP
 	help
@@ -191,7 +191,7 @@ config KEMBTK_BUSYB_FEATURE_GREP_FGREP_ALIAS
 	help
 	  fgrep sees the search pattern as a normal string rather than
 	  regular expressions.
-	  grep -F is always builtin, this just creates the fgrep alias.
+	  grep -F always works, this just creates the fgrep alias.
 
 config KEMBTK_BUSYB_FEATURE_GREP_CONTEXT
 	bool "Enable before and after context flags (-A, -B and -C)"
@@ -205,35 +205,34 @@ config KEMBTK_BUSYB_FEATURE_GREP_CONTEXT
 config KEMBTK_BUSYB_XARGS
 	bool "xargs"
 	help
-	  xargs is used to execute a specified command on
+	  xargs is used to execute a specified command for
 	  every item from standard input.
 
 config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_CONFIRMATION
-	bool "Enable prompt and confirmation option -p"
+	bool "Enable -p: prompt and confirmation"
 	depends on KEMBTK_BUSYB_XARGS
 	help
-	  Support prompt the user about whether to run each command
+	  Support -p: prompt the user whether to run each command
 	  line and read a line from the terminal.
 
 config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_QUOTES
-	bool "Enable support single and double quotes and backslash"
+	bool "Enable single and double quotes and backslash"
 	depends on KEMBTK_BUSYB_XARGS
 	help
-	  Default xargs unsupport single and double quotes
-	  and backslash for can use aruments with spaces.
+	  Support quoting in the input.
 
 config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_TERMOPT
-	bool "Enable support options -x"
+	bool "Enable -x: exit if -s or -n is exceeded"
 	depends on KEMBTK_BUSYB_XARGS
 	help
-	  Enable support exit if the size (see the -s or -n option)
+	  Support -x: exit if the command size (see the -s or -n option)
 	  is exceeded.
 
 config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_ZERO_TERM
-	bool "Enable null terminated option -0"
+	bool "Enable -0: NUL-terminated input"
 	depends on KEMBTK_BUSYB_XARGS
 	help
-	  Enable input filenames are terminated by a null character
-	  instead of by whitespace, and the quotes and backslash
+	  Support -0: input items are terminated by a NUL character
+	  instead of whitespace, and the quotes and backslash
 	  are not special.
 
diff --git a/busybox-init.kconfig b/busybox-init.kconfig
index fbb50e4..4e70011 100644
--- a/busybox-init.kconfig
+++ b/busybox-init.kconfig
@@ -90,6 +90,27 @@ config KEMBTK_BUSYB_HALT
 	help
 	  Stop all processes and either halt, reboot, or power off the system.
 
+config KEMBTK_BUSYB_FEATURE_CALL_TELINIT
+	bool "Call telinit on shutdown and reboot"
+	depends on KEMBTK_BUSYB_HALT && !KEMBTK_BUSYB_INIT
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Call an external program (normally telinit) to facilitate
+	  a switch to a proper runlevel.
+
+	  This option is only available if you selected halt and friends,
+	  but did not select init.
+
+config KEMBTK_BUSYB_TELINIT_PATH
+	string "Path to telinit executable"
+	default "/sbin/telinit"
+	depends on KEMBTK_BUSYB_FEATURE_CALL_TELINIT
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  When busybox halt and friends have to call external telinit
+	  to facilitate proper shutdown, this path is to be used when
+	  locating telinit executable.
+
 config KEMBTK_BUSYB_MESG
 	bool "mesg"
 	help
diff --git a/busybox-libbb.kconfig b/busybox-libbb.kconfig
index 1427ac2..a87e3cf 100644
--- a/busybox-libbb.kconfig
+++ b/busybox-libbb.kconfig
@@ -15,7 +15,7 @@ config KEMBTK_BUSYB_PASSWORD_MINLEN
 	  Minimum allowable password length.
 
 config KEMBTK_BUSYB_MD5_SIZE_VS_SPEED
-	int "MD5: Trade Bytes for Speed"
+	int "MD5: Trade bytes for speed (0:fast, 3:slow)"
 	default 2
 	range 0 3
 	help
@@ -96,6 +96,29 @@ config KEMBTK_BUSYB_FEATURE_EDITING_FANCY_PROMPT
 	  Setting this option allows for prompts to use things like \w and
 	  \$ and escape codes.
 
+config KEMBTK_BUSYB_FEATURE_EDITING_ASK_TERMINAL
+	bool "Query cursor position from terminal"
+	depends on KEMBTK_BUSYB_FEATURE_EDITING
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Allow usage of "ESC [ 6 n" sequence. Terminal answers back with
+	  current cursor position. This information is used to make line
+	  editing more robust in some cases.
+	  If you are not sure whether your terminals respond to this code
+	  correctly, or want to save on code size (about 300 bytes),
+	  then do not turn this option on.
+
+config KEMBTK_BUSYB_FEATURE_NON_POSIX_CP
+	bool "Non-POSIX, but safer, copying to special nodes"
+	depends on EMBTK_BB_VERSION_1_15_X
+	default y
+	help
+	  With this option, "cp file symlink" will delete symlink
+	  and create a regular file. This does not conform to POSIX,
+	  but prevents a symlink attack.
+	  Similarly, "cp file device" will not send file's data
+	  to the device.
+
 config KEMBTK_BUSYB_FEATURE_VERBOSE_CP_MESSAGE
 	bool "Give more precise messages when copy fails (cp, mv etc)"
 	help
@@ -144,3 +167,4 @@ config KEMBTK_BUSYB_FEATURE_HWIB
 	help
 	  Support for printing infiniband addresses in
 	  network applets.
+
diff --git a/busybox-loginutils.kconfig b/busybox-loginutils.kconfig
index 24ce02f..525c08b 100644
--- a/busybox-loginutils.kconfig
+++ b/busybox-loginutils.kconfig
@@ -82,7 +82,7 @@ config KEMBTK_BUSYB_USE_BB_CRYPT
 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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable this if you have passwords starting with "$5$" or "$6$"
 	  in your /etc/passwd or /etc/shadow files. These passwords
@@ -96,6 +96,13 @@ config KEMBTK_BUSYB_ADDGROUP
 	help
 	  Utility for creating a new group account.
 
+config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS
+	bool "Enable long options"
+	depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Support long options for the addgroup applet.
+
 config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_GROUP
 	bool "Support for adding users to groups"
 	depends on KEMBTK_BUSYB_ADDGROUP
@@ -134,10 +141,28 @@ config KEMBTK_BUSYB_ADDUSER
 
 config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the adduser applet.
 
+config KEMBTK_BUSYB_FIRST_SYSTEM_ID
+	int "First valid system uid or gid for adduser and addgroup"
+	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
+	depends on EMBTK_BB_VERSION_1_15_X
+	range 0 64900
+	default 100
+	help
+	  First valid system uid or gid for adduser and addgroup
+
+config KEMBTK_BUSYB_LAST_SYSTEM_ID
+	int "Last valid system uid or gid for adduser and addgroup"
+	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
+	depends on EMBTK_BB_VERSION_1_15_X
+	range 0 64900
+	default 999
+	help
+	  Last valid system uid or gid for adduser and addgroup
+
 config KEMBTK_BUSYB_DELUSER
 	bool "deluser"
 	help
diff --git a/busybox-mailutils.kconfig b/busybox-mailutils.kconfig
index 90bf254..95e354c 100644
--- a/busybox-mailutils.kconfig
+++ b/busybox-mailutils.kconfig
@@ -48,18 +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
-       depends on EMBTK_BB_VERSION_1_13_X
-       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
-       depends on EMBTK_BB_VERSION_1_13_X
-       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 d13a223..e7d7723 100644
--- a/busybox-miscutils.kconfig
+++ b/busybox-miscutils.kconfig
@@ -19,6 +19,28 @@ config KEMBTK_BUSYB_BBCONFIG
 	  The bbconfig applet will print the config file with which
 	  busybox was built.
 
+config KEMBTK_BUSYB_BEEP
+	bool "beep"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  The beep applets beeps in a given freq/Hz.
+
+config KEMBTK_BUSYB_FEATURE_BEEP_FREQ
+	int "default frequency"
+	range 0 2147483647
+	default 4000
+	depends on KEMBTK_BUSYB_BEEP
+	help
+	  Frequency for default beep.
+
+config KEMBTK_BUSYB_FEATURE_BEEP_LENGTH_MS
+	int "default length"
+	range 0 2147483647
+	default 30
+	depends on KEMBTK_BUSYB_BEEP
+	help
+	  Length in ms for default beep.
+
 config KEMBTK_BUSYB_CHAT
 	bool "chat"
 	help
@@ -115,7 +137,7 @@ 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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Location of crond spool.
 
@@ -229,16 +251,30 @@ config KEMBTK_BUSYB_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 
+config KEMBTK_BUSYB_FLASH_LOCK
+	bool "flash_lock"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility locks part or all of the flash device.
+
+config KEMBTK_BUSYB_FLASH_UNLOCK
+	bool "flash_unlock"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility unlocks part or all of the flash device.
+
 config KEMBTK_BUSYB_FLASH_ERASEALL
 	bool "flash_eraseall"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Set/set program io scheduling class and priority
 	  Requires kernel >= 2.6.13
@@ -506,7 +542,7 @@ config KEMBTK_BUSYB_TIME
 
 config KEMBTK_BUSYB_TIMEOUT
 	bool "timeout"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Runs a program and watches it. If it does not terminate in
 	  specified number of seconds, it is sent a signal.
@@ -519,6 +555,12 @@ config KEMBTK_BUSYB_TTYSIZE
 	  error, but returns default 80x24.
 	  Usage in shell scripts: width=`ttysize w`.
 
+config KEMBTK_BUSYB_VOLNAME
+	bool "volname"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Prints a CD-ROM volume name.
+
 config KEMBTK_BUSYB_WATCHDOG
 	bool "watchdog"
 	help
diff --git a/busybox-modutils.kconfig b/busybox-modutils.kconfig
index 397063a..69f0907 100644
--- a/busybox-modutils.kconfig
+++ b/busybox-modutils.kconfig
@@ -85,8 +85,7 @@ config KEMBTK_BUSYB_MODPROBE
 	  level.
 
 config KEMBTK_BUSYB_FEATURE_MODPROBE_BLACKLIST
-	bool
-	prompt "Blacklist support"
+	bool "Blacklist support"
 	depends on KEMBTK_BUSYB_MODPROBE
 	help
 	  Say 'y' here to enable support for the 'blacklist' command in
diff --git a/busybox-networking-udhcp.kconfig b/busybox-networking-udhcp.kconfig
index d6ae8ac..1398e8b 100644
--- a/busybox-networking-udhcp.kconfig
+++ b/busybox-networking-udhcp.kconfig
@@ -69,10 +69,16 @@ config KEMBTK_BUSYB_FEATURE_UDHCP_PORT
 	  This feature is typically not needed.
 
 config KEMBTK_BUSYB_UDHCP_DEBUG
-	bool "Compile udhcp with noisy debugging messages"
-	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC
+	int "Maximum verbosity level for udhcp applets (0..9)"
+	default 0
+	range 0 9
+	depends on KEMBTK_BUSYB_APP_UDHCPD || KEMBTK_BUSYB_APP_UDHCPC || KEMBTK_BUSYB_APP_DHCPRELAY
 	help
-	  If selected, udhcpd will output extra debugging output.
+	  Verbosity can be increased with multiple -v options.
+	  This options controls how high it can be cranked up.
+
+	  Bigger values result in bigger code. Levels above 1
+	  are very verbose and useful for debugging only.
 
 config KEMBTK_BUSYB_FEATURE_UDHCP_RFC3397
 	bool "Support for RFC3397 domain search (experimental)"
diff --git a/busybox-networking.kconfig b/busybox-networking.kconfig
index c6e5cc4..40241c1 100644
--- a/busybox-networking.kconfig
+++ b/busybox-networking.kconfig
@@ -13,6 +13,17 @@ config KEMBTK_BUSYB_FEATURE_IPV6
 	  Enable KEMBTK_BUSYB_IPv6 support in busybox.
 	  This adds KEMBTK_BUSYB_IPv6 support in the networking applets.
 
+config KEMBTK_BUSYB_FEATURE_UNIX_LOCAL
+	bool "Enable Unix domain socket support (usually not needed)"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Enable Unix domain socket support in all busybox networking
+	  applets.  Address of the form local:/path/to/unix/socket
+	  will be recognized.
+
+	  This extension is almost never used in real world usage.
+	  You most likely want to say N.
+
 config KEMBTK_BUSYB_FEATURE_PREFER_IPV4_ADDRESS
 	bool "Prefer KEMBTK_BUSYB_IPv4 addresses from DNS queries"
 	default y
@@ -87,7 +98,7 @@ config KEMBTK_BUSYB_FAKEIDENTD
 
 config KEMBTK_BUSYB_FTPD
 	bool "ftpd"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  simple FTP daemon. You have to run it via inetd.
 
@@ -95,7 +106,6 @@ 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)
 
@@ -111,7 +121,7 @@ config KEMBTK_BUSYB_FTPPUT
 
 config KEMBTK_BUSYB_FEATURE_FTPGETPUT_LONG_OPTIONS
 	bool "Enable long options in ftpget/ftpput"
-	depends on KEMBTK_BUSYB_GETOPT_LONG && (KEMBTK_BUSYB_FTPGET || KEMBTK_BUSYB_FTPPUT)
+	depends on KEMBTK_BUSYB_LONG_OPTS && (KEMBTK_BUSYB_FTPGET || KEMBTK_BUSYB_FTPPUT)
 	help
 	  Support long options for the ftpget/ftpput applet.
 
@@ -141,12 +151,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
-       depends on EMBTK_BB_VERSION_1_13_X
-       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"
@@ -173,12 +183,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
-       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.
+	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)"
@@ -286,6 +296,12 @@ config KEMBTK_BUSYB_IFENSLAVE
 	  Userspace application to bind several interfaces
 	  to a logical interface (use with kernel bonding driver).
 
+config KEMBTK_BUSYB_IFPLUGD
+	bool "ifplugd"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Network interface plug detection daemon.
+
 config KEMBTK_BUSYB_IFUPDOWN
 	bool "ifupdown"
 	help
@@ -536,7 +552,7 @@ config KEMBTK_BUSYB_FEATURE_IPCALC_FANCY
 
 config KEMBTK_BUSYB_FEATURE_IPCALC_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_IPCALC && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_IPCALC && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the ipcalc applet.
 
@@ -773,14 +789,13 @@ config KEMBTK_BUSYB_TFTP_DEBUG
 	bool "Enable debug"
 	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
-	  you run into problems.
+	  Make tftp[d] print debugging messages on stderr.
+	  This is useful if you are diagnosing a bug in tftp[d].
 
 config KEMBTK_BUSYB_TRACEROUTE
 	bool "traceroute"
 	help
-	  Utility to trace the route of KEMBTK_BUSYB_IP packets
+	  Utility to trace the route of KEMBTK_BUSYB_IP packets.
 
 config KEMBTK_BUSYB_FEATURE_TRACEROUTE_VERBOSE
 	bool "Enable verbose output"
@@ -808,7 +823,7 @@ 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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Command line options to pass to udhcpc from ifup.
 	  Intended to alter options not available in /etc/network/interfaces.
@@ -841,7 +856,7 @@ config KEMBTK_BUSYB_FEATURE_WGET_AUTHENTICATION
 
 config KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
-	depends on KEMBTK_BUSYB_WGET && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_WGET && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the wget applet.
 
@@ -864,14 +879,14 @@ config KEMBTK_BUSYB_TCPSVD
 
 config KEMBTK_BUSYB_TUNCTL
 	bool "tunctl"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Allow to specify owner and group of newly created interface.
 	  340 bytes of pure bloat. Say no here.
diff --git a/busybox-procps.kconfig b/busybox-procps.kconfig
index 48c97a9..aefe09b 100644
--- a/busybox-procps.kconfig
+++ b/busybox-procps.kconfig
@@ -81,12 +81,12 @@ config KEMBTK_BUSYB_PS
 	  ps gives a snapshot of the current processes.
 
 config KEMBTK_BUSYB_FEATURE_PS_WIDE
-	bool "Enable argument for wide output (-w)"
+	bool "Enable wide output option (-w)"
 	depends on KEMBTK_BUSYB_PS
 	help
 	  Support argument 'w' for wide output.
-	  If given once, 132 chars are printed and given more than
-	  one, the length is unlimited.
+	  If given once, 132 chars are printed, and if given more
+	  than once, the length is unlimited.
 
 config KEMBTK_BUSYB_FEATURE_PS_TIME
 	bool "Enable time and elapsed time output"
@@ -94,6 +94,13 @@ config KEMBTK_BUSYB_FEATURE_PS_TIME
 	help
 	  Support -o time and -o etime output specifiers.
 
+config KEMBTK_BUSYB_FEATURE_PS_ADDITIONAL_COLUMNS
+	bool "Enable additional ps columns"
+	depends on KEMBTK_BUSYB_PS && KEMBTK_BUSYB_DESKTOP
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Support -o rgroup, -o ruser, -o nice output specifiers.
+
 config KEMBTK_BUSYB_FEATURE_PS_UNUSUAL_SYSTEMS
 	bool "Support Linux prior to 2.4.0 and non-ELF systems"
 	depends on KEMBTK_BUSYB_FEATURE_PS_TIME
diff --git a/busybox-selinux.kconfig b/busybox-selinux.kconfig
index 5e7a0be..7000850 100644
--- a/busybox-selinux.kconfig
+++ b/busybox-selinux.kconfig
@@ -2,6 +2,7 @@
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
 #
+
 if KEMBTK_BUSYB_SELINUX
 comment "-------------------------------------------------"
 comment "SELinux Utilities"
@@ -17,7 +18,7 @@ config KEMBTK_BUSYB_CHCON
 config KEMBTK_BUSYB_FEATURE_CHCON_LONG_OPTIONS
 	bool "Enable long options"
 	default y
-	depends on KEMBTK_BUSYB_CHCON && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_CHCON && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the chcon applet.
 
@@ -62,7 +63,7 @@ config KEMBTK_BUSYB_RUNCON
 config KEMBTK_BUSYB_FEATURE_RUNCON_LONG_OPTIONS
 	bool "Enable long options"
 	default y
-	depends on KEMBTK_BUSYB_RUNCON && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_RUNCON && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  Support long options for the runcon applet.
 
diff --git a/busybox-shell.kconfig b/busybox-shell.kconfig
index 7a6bbae..158a7e4 100644
--- a/busybox-shell.kconfig
+++ b/busybox-shell.kconfig
@@ -20,6 +20,7 @@ config KEMBTK_BUSYB_FEATURE_SH_IS_ASH
 config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH
 	select KEMBTK_BUSYB_HUSH
 	bool "hush"
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
 
 ####config FEATURE_SH_IS_LASH
 ####	select KEMBTK_BUSYB_LASH
@@ -43,9 +44,6 @@ config KEMBTK_BUSYB_ASH
 	  shell (by Herbert Xu), which was created by porting the 'ash' shell
 	  (written by Kenneth Almquist) from NetBSD.
 
-comment "Ash Shell Options"
-	depends on KEMBTK_BUSYB_ASH
-
 config KEMBTK_BUSYB_ASH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
@@ -88,16 +86,16 @@ config KEMBTK_BUSYB_ASH_MATH_SUPPORT
 	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"
@@ -179,6 +177,14 @@ config KEMBTK_BUSYB_HUSH
 	  It does not handle select, aliases, brace expansion,
 	  tilde expansion, &>file and >&file redirection of stdout+stderr.
 
+config KEMBTK_BUSYB_HUSH_BASH_COMPAT
+	bool "bash-compatible extensions"
+	default y
+	depends on KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Enable bash-compatible extensions.
+
 config KEMBTK_BUSYB_HUSH_HELP
 	bool "help builtin"
 	depends on KEMBTK_BUSYB_HUSH
@@ -232,25 +238,32 @@ config KEMBTK_BUSYB_HUSH_CASE
 config KEMBTK_BUSYB_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable support for shell functions in hush. +800 bytes.
 
+config KEMBTK_BUSYB_HUSH_LOCAL
+	bool "Support local builtin"
+	depends on KEMBTK_BUSYB_HUSH_FUNCTIONS
+	help
+	  Enable support for local variables in functions.
+
 config KEMBTK_BUSYB_HUSH_EXPORT_N
 	bool "Support export '-n' option"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable support for export '-n' option in hush. It is a bash extension.
 
 config KEMBTK_BUSYB_LASH
 	bool "lash (deprecated: aliased to hush)"
-	select KEMBTK_BUSYB_HUSH
+	select KEMBTK_BUSYB_HUSH if EMBTK_BB_VERSION_1_15_X
 	help
 	  lash is deprecated and will be removed, please migrate to hush.
 
 config KEMBTK_BUSYB_MSH
 	bool "msh (deprecated: please use hush)"
+	select KEMBTK_BUSYB_HUSH
 	help
 	  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.
@@ -263,21 +276,18 @@ config KEMBTK_BUSYB_MSH
 #	  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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_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
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_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.
diff --git a/busybox-util-linux.kconfig b/busybox-util-linux.kconfig
index 8f4b953..79f5cbc 100644
--- a/busybox-util-linux.kconfig
+++ b/busybox-util-linux.kconfig
@@ -9,7 +9,7 @@ comment "-------------------------------------------------"
 
 config KEMBTK_BUSYB_ACPID
 	bool "acpid"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_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
@@ -25,7 +25,6 @@ config KEMBTK_BUSYB_ACPID
 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.
 
@@ -220,7 +219,7 @@ config KEMBTK_BUSYB_FEATURE_MINIX2
 
 config KEMBTK_BUSYB_MKFS_VFAT
 	bool "mkfs_vfat"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Utility to create FAT32 filesystems.
 
@@ -234,6 +233,14 @@ config KEMBTK_BUSYB_GETOPT
 	  written by others, this utility may be for you. Most people will
 	  wisely leave this disabled.
 
+config KEMBTK_BUSYB_FEATURE_GETOPT_LONG
+	bool "Support option -l"
+	default y if KEMBTK_BUSYB_LONG_OPTS
+	depends on KEMBTK_BUSYB_GETOPT
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Enable support for long options (option -l).
+
 config KEMBTK_BUSYB_HEXDUMP
 	bool "hexdump"
 	help
@@ -265,7 +272,7 @@ config KEMBTK_BUSYB_HWCLOCK
 
 config KEMBTK_BUSYB_FEATURE_HWCLOCK_LONG_OPTIONS
 	bool "Support long options (--hctosys,...)"
-	depends on KEMBTK_BUSYB_HWCLOCK && KEMBTK_BUSYB_GETOPT_LONG
+	depends on KEMBTK_BUSYB_HWCLOCK && KEMBTK_BUSYB_LONG_OPTS
 	help
 	  By default, the hwclock utility only uses short options. If you
 	  are overly fond of its long options, such as --hctosys, --utc, etc)
@@ -370,12 +377,18 @@ config KEMBTK_BUSYB_MKSWAP
 
 config KEMBTK_BUSYB_FEATURE_MKSWAP_V0
 	bool "Version 0 support"
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
+	help
+		Enable support for the old v0 style.
+		If your kernel is older than 2.1.117, then v0 support is the
+		only option.
+
+config KEMBTK_BUSYB_FEATURE_MKSWAP_UUID
+	bool "UUID support"
 	depends on KEMBTK_BUSYB_MKSWAP
-#	depends on KEMBTK_BUSYB_MKSWAP && DEPRECATED
+	depends on EMBTK_BB_VERSION_1_15_X
 	help
-	  Enable support for the old v0 style.
-	  If your kernel is older than 2.1.117, then v0 support is the
-	  only option.
+	  Generate swap spaces with universally unique identifiers.
 
 config KEMBTK_BUSYB_MORE
 	bool "more"
@@ -688,6 +701,13 @@ config KEMBTK_BUSYB_SCRIPT
 	help
 	  The script makes typescript of terminal session.
 
+config KEMBTK_BUSYB_SCRIPTREPLAY
+	bool "scriptreplay"
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  This program replays a typescript, using timing information
+	  given by script -t.
+
 config KEMBTK_BUSYB_SETARCH
 	bool "setarch"
 	help
diff --git a/busybox.kconfig b/busybox.kconfig
index 635bf20..d52ca7c 100644
--- a/busybox.kconfig
+++ b/busybox.kconfig
@@ -31,17 +31,6 @@ config KEMBTK_BUSYB_EXTRA_COMPAT
 	  some GNU extensions in libc. You probably only need this option
 	  if you plan to run busybox on desktop.
 
-config KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE
-	bool "Assume that 1:1 char/glyph correspondence is not true"
-	help
-	  This makes various applets aware that one byte is not
-	  one character on screen.
-
-	  Busybox aims to eventually work correctly with Unicode displays.
-	  Any older encodings are not guaranteed to work.
-	  Probably by the time when busybox will be fully Unicode-clean,
-	  other encodings will be mainly of historic interest.
-
 choice
 	prompt "Buffer allocation policy"
 	help
@@ -110,13 +99,41 @@ config KEMBTK_BUSYB_LOCALE_SUPPORT
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config KEMBTK_BUSYB_GETOPT_LONG
+config KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE
+	bool "Support Unicode"
+	help
+	  This makes various applets aware that one byte is not
+	  one character on screen.
+
+	  Busybox aims to eventually work correctly with Unicode displays.
+	  Any older encodings are not guaranteed to work.
+	  Probably by the time when busybox will be fully Unicode-clean,
+	  other encodings will be mainly of historic interest.
+
+config KEMBTK_BUSYB_FEATURE_CHECK_UNICODE_IN_ENV
+	bool "Check $LANG environment variable"
+	default y
+	depends on KEMBTK_BUSYB_FEATURE_ASSUME_UNICODE && !KEMBTK_BUSYB_LOCALE_SUPPORT
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  With this option on, Unicode support is activated
+	  only if LANG variable has the value of the form "xxxx.utf8"
+
+	  Otherwise, Unicode support will be always enabled and active.
+
+config KEMBTK_BUSYB_LONG_OPTS
 	bool "Support for --long-options"
 	default y
+	select KEMBTK_BUSYB_GETOPT_LONG
 	help
 	  Enable this if you want busybox applets to use the gnu --long-option
 	  style, in addition to single character -a -b -c style options.
 
+config KEMBTK_BUSYB_GETOPT_LONG
+	bool
+	help
+		backward compatibility for busybox-1.{13,14}.x
+
 config KEMBTK_BUSYB_FEATURE_DEVPTS
 	bool "Use the devpts filesystem for Unix98 PTYs"
 	default y
@@ -395,7 +412,7 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX
 
 config KEMBTK_BUSYB_EXTRA_CFLAGS
 	string "Additional CFLAGS"
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	default ""
 	help
 	  Additional CFLAGS to pass to the compiler verbatim.