package/busybox: Update stored config files

When updating busybox, these files must be updated - otherwise the
config written to busybox source tree when building may be incomplete,
causing the build to hang.

Fixes: e4800c73e63e5 ("busybox: update to latest")
Signed-off-by: Phil Sutter <phil@nwl.cc>

25 files changed, 5146 insertions, 5740 deletions

diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 69029adae..36b047540 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -1,34 +1,41 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
-# mainmenu "BusyBox Configuration"
+# mainmenu "Configuration"
 
 config BUSYBOX_HAVE_DOT_CONFIG
 	bool
 	default y
 
-menu "Busybox Settings"
-
-menu "General Configuration"
+menu "Settings"
 
 config BUSYBOX_DESKTOP
-	bool "Enable options for full-blown desktop systems"
-	default n
+	bool "Enable compatibility for full-blown desktop systems (8kb)"
+	default y
 	help
-	  Enable options and features which are not essential.
-	  Select this only if you plan to use busybox on full-blown
-	  desktop machine with common Linux distro, not on an embedded box.
+	Enable applet options and features which are not essential.
+	Many applet options have dedicated config options to (de)select them
+	under that applet; this options enables those options which have no
+	individual config item for them.
+
+	Select this if you plan to use busybox on full-blown desktop machine
+	with common Linux distro, which needs higher level of command-line
+	compatibility.
+
+	If you are preparing your build to be used on an embedded box
+	where you have tighter control over the entire set of userspace
+	tools, you can unselect this option for smaller code size.
 
 config BUSYBOX_EXTRA_COMPAT
 	bool "Provide compatible behavior for rare corner cases (bigger code)"
 	default n
 	help
-	  This option makes grep, sed etc handle rare corner cases
-	  (embedded NUL bytes and such). This makes code bigger and uses
-	  some GNU extensions in libc. You probably only need this option
-	  if you plan to run busybox on desktop.
+	This option makes grep, sed etc handle rare corner cases
+	(embedded NUL bytes and such). This makes code bigger and uses
+	some GNU extensions in libc. You probably only need this option
+	if you plan to run busybox on desktop.
 
 config BUSYBOX_FEDORA_COMPAT
 	bool "Building for Fedora distribution"
@@ -45,476 +52,302 @@ config BUSYBOX_FEDORA_COMPAT
 
 config BUSYBOX_INCLUDE_SUSv2
 	bool "Enable obsolete features removed before SUSv3"
-	default n
-	help
-	  This option will enable backwards compatibility with SuSv2,
-	  specifically, old-style numeric options ('command -1 <file>')
-	  will be supported in head, tail, and fold. (Note: should
-	  affect renice too.)
-
-config BUSYBOX_USE_PORTABLE_CODE
-	bool "Avoid using GCC-specific code constructs"
-	default n
-	help
-	  Use this option if you are trying to compile busybox with
-	  compiler other than gcc.
-	  If you do use gcc, this option may needlessly increase code size.
-
-config BUSYBOX_STACK_OPTIMIZATION_386
-	bool "Use -mpreferred-stack-boundary=2 on i386 arch"
-	default n
-	help
-	This option makes for smaller code, but some libc versions
-	do not work with it (they use SSE instructions without
-	ensuring stack alignment).
-
-config BUSYBOX_INSTALL_NO_USR
-        bool "Don't use /usr"
-        default n
-        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.
-
-config BUSYBOX_PLATFORM_LINUX
-	bool "Enable Linux-specific applets and features"
 	default y
 	help
-	  For the most part, busybox requires only POSIX compatibility
-	  from the target system, but some applets and features use
-	  Linux-specific interfaces.
-
-	  Answering 'N' here will disable such applets and hide the
-	  corresponding configuration options.
+	This option will enable backwards compatibility with SuSv2,
+	specifically, old-style numeric options ('command -1 <file>')
+	will be supported in head, tail, and fold. (Note: should
+	affect renice too.)
 
-choice
-	prompt "Buffer allocation policy"
-	default FEATURE_BUFFERS_USE_MALLOC
+config BUSYBOX_LONG_OPTS
+	bool "Support --long-options"
+	default y
 	help
-	  There are 3 ways BusyBox can handle buffer allocations:
-	  - Use malloc. This costs code size for the call to xmalloc.
-	  - Put them on stack. For some very small machines with limited stack
-	    space, this can be deadly. For most folks, this works just fine.
-	  - Put them in BSS. This works beautifully for computers with a real
-	    MMU (and OS support), but wastes runtime RAM for uCLinux. This
-	    behavior was the only one available for BusyBox versions 0.48 and
-	    earlier.
-
-config BUSYBOX_FEATURE_BUFFERS_USE_MALLOC
-	bool "Allocate with Malloc"
-
-config BUSYBOX_FEATURE_BUFFERS_GO_ON_STACK
-	bool "Allocate on the Stack"
-
-config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS
-	bool "Allocate in the .bss section"
-
-endchoice
+	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 BUSYBOX_SHOW_USAGE
 	bool "Show applet usage messages"
 	default y
 	help
-	  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.
+	Enabling this option, 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
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  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.
+	All applets will show verbose help messages when invoked with --help.
+	This will add a lot of text to the binary.
 
 config BUSYBOX_FEATURE_COMPRESS_USAGE
 	bool "Store applet usage messages in compressed form"
 	default y
 	depends on BUSYBOX_SHOW_USAGE
 	help
-	  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
-	  be noticeable. Also, if you run executables directly from ROM
-	  and have very little memory, this might not be a win. Otherwise,
-	  you probably want this.
-
-config BUSYBOX_BUSYBOX
-	bool "Include busybox applet"
-	default y
-	help
-	  The busybox applet provides general help regarding busybox and
-	  allows the included applets to be listed.  It's also required
-	  if applet links are to be installed at runtime.
-
-	  If you can live without these features disabling this will save
-	  some space.
-
-config BUSYBOX_FEATURE_SHOW_SCRIPT
-	bool "Support --show SCRIPT"
-	default n
-	depends on BUSYBOX_BUSYBOX
-
-config BUSYBOX_FEATURE_INSTALLER
-	bool "Support --install [-s] to install applet links at runtime"
-	default n
-	help
-	  Enable 'busybox --install [-s]' support. This will allow you to use
-	  busybox at runtime to create hard links or symlinks for all the
-	  applets that are compiled into busybox.
+	Store usage messages in .bz2 compressed form, uncompress them
+	on-the-fly when "APPLET --help" is run.
 
-config BUSYBOX_LOCALE_SUPPORT
-	bool "Enable locale support (system needs locale for this to work)"
-	default n
-	help
-	  Enable this if your system has locale support and you would like
-	  busybox to support locale settings.
+	If you have a really tiny busybox with few applets enabled (and
+	bunzip2 isn't one of them), the overhead of the decompressor might
+	be noticeable. Also, if you run executables directly from ROM
+	and have very little memory, this might not be a win. Otherwise,
+	you probably want this.
 
-config BUSYBOX_UNICODE_SUPPORT
-	bool "Support Unicode"
+config BUSYBOX_LFS
+	bool "Support files > 2 GB"
 	default y
 	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 BUSYBOX_UNICODE_USING_LOCALE
-	bool "Use libc routines for Unicode (else uses internal ones)"
-	default n
-	depends on BUSYBOX_UNICODE_SUPPORT && BUSYBOX_LOCALE_SUPPORT
-	help
-	  With this option on, Unicode support is implemented using libc
-	  routines. Otherwise, internal implementation is used.
-	  Internal implementation is smaller.
-
-config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV
-	bool "Check $LANG environment variable"
-	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"
-
-	  Otherwise, Unicode support will be always enabled and active.
-
-config BUSYBOX_SUBST_WCHAR
-	int "Character code to substitute unprintable characters with"
-	depends on BUSYBOX_UNICODE_SUPPORT
-	default 63
-	help
-	  Typical values are 63 for '?' (works with any output device),
-	  30 for ASCII substitute control code,
-	  65533 (0xfffd) for Unicode replacement character.
-
-config BUSYBOX_LAST_SUPPORTED_WCHAR
-	int "Range of supported Unicode characters"
-	depends on BUSYBOX_UNICODE_SUPPORT
-	default 767
-	help
-	  Any character with Unicode value bigger than this is assumed
-	  to be non-printable on output device. Many applets replace
-	  such chars with substitution character.
-
-	  The idea is that many valid printable Unicode chars are
-	  nevertheless are not displayed correctly. Think about
-	  combining charachers, double-wide hieroglyphs, obscure
-	  characters in dozens of ancient scripts...
-	  Many terminals, terminal emulators, xterms etc will fail
-	  to handle them correctly. Choose the smallest value
-	  which suits your needs.
-
-	  Typical values are:
-	  126 - ASCII only
-	  767 (0x2ff) - there are no combining chars in [0..767] range
-			(the range includes Latin 1, Latin Ext. A and B),
-			code is ~700 bytes smaller for this case.
-	  4351 (0x10ff) - there are no double-wide chars in [0..4351] range,
-			code is ~300 bytes smaller for this case.
-	  12799 (0x31ff) - nearly all non-ideographic characters are
-			available in [0..12799] range, including
-			East Asian scripts like katakana, hiragana, hangul,
-			bopomofo...
-	  0 - off, any valid printable Unicode character will be printed.
-
-config BUSYBOX_UNICODE_COMBINING_WCHARS
-	bool "Allow zero-width Unicode characters on output"
-	default n
-	depends on BUSYBOX_UNICODE_SUPPORT
-	help
-	  With this option off, any Unicode char with width of 0
-	  is substituted on output.
-
-config BUSYBOX_UNICODE_WIDE_WCHARS
-	bool "Allow wide Unicode characters on output"
-	default n
-	depends on BUSYBOX_UNICODE_SUPPORT
-	help
-	  With this option off, any Unicode char with width > 1
-	  is substituted on output.
-
-config BUSYBOX_UNICODE_BIDI_SUPPORT
-	bool "Bidirectional character-aware line input"
-	default n
-	depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE
-	help
-	  With this option on, right-to-left Unicode characters
-	  are treated differently on input (e.g. cursor movement).
-
-config BUSYBOX_UNICODE_NEUTRAL_TABLE
-	bool "In bidi input, support non-ASCII neutral chars too"
-	default n
-	depends on BUSYBOX_UNICODE_BIDI_SUPPORT
-	help
-	  In most cases it's enough to treat only ASCII non-letters
-	  (i.e. punctuation, numbers and space) as characters
-	  with neutral directionality.
-	  With this option on, more extensive (and bigger) table
-	  of neutral chars will be used.
-
-config BUSYBOX_UNICODE_PRESERVE_BROKEN
-	bool "Make it possible to enter sequences of chars which are not Unicode"
-	default n
-	depends on BUSYBOX_UNICODE_SUPPORT
-	help
-	  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 '?'.
+	If you need to work with large files, enable this option.
+	This will have no effect if your kernel or your C
+	library lacks large file support for large files. Some of the
+	programs that can benefit from large file support include dd, gzip,
+	cp, mount, tar.
 
 config BUSYBOX_PAM
-	bool "Support for PAM (Pluggable Authentication Modules)"
+	bool "Support PAM (Pluggable Authentication Modules)"
 	default n
 	help
-	  Use PAM in some busybox applets (currently login and httpd) instead
-	  of direct access to password database.
-
-config BUSYBOX_FEATURE_USE_SENDFILE
-	bool "Use sendfile system call"
-	default y
-	select BUSYBOX_PLATFORM_LINUX
-	help
-	  When enabled, busybox will use the kernel sendfile() function
-	  instead of read/write loops to copy data between file descriptors
-	  (for example, cp command does this a lot).
-	  If sendfile() doesn't work, copying code falls back to read/write
-	  loop. sendfile() was originally implemented for faster I/O
-	  from files to sockets, but since Linux 2.6.33 it was extended
-	  to work for many more file types.
-
-config BUSYBOX_LONG_OPTS
-	bool "Support for --long-options"
-	default y
-	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.
+	Use PAM in some applets (currently login and httpd) instead
+	of direct access to password database.
 
 config BUSYBOX_FEATURE_DEVPTS
 	bool "Use the devpts filesystem for Unix98 PTYs"
 	default y
 	help
-	  Enable if you want BusyBox to use Unix98 PTY support. If enabled,
-	  busybox will use /dev/ptmx for the master side of the pseudoterminal
-	  and /dev/pts/<number> for the slave side. Otherwise, BSD style
-	  /dev/ttyp<number> will be used. To use this option, you should have
-	  devpts mounted.
-
-config BUSYBOX_FEATURE_CLEAN_UP
-	bool "Clean up all memory before exiting (usually not needed)"
-	default n
-	help
-	  As a size optimization, busybox normally exits without explicitly
-	  freeing dynamically allocated memory or closing files. This saves
-	  space since the OS will clean up for us, but it can confuse debuggers
-	  like valgrind, which report tons of memory and resource leaks.
-
-	  Don't enable this unless you have a really good reason to clean
-	  things up manually.
-
-config BUSYBOX_FEATURE_SYSLOG_INFO
-	bool "Support LOG_INFO level syslog messages"
-	default y
-	depends on BUSYBOX_FEATURE_SYSLOG
-	help
-	Applets which send their output to syslog use either LOG_INFO or
-	LOG_ERR log levels, but by disabling this option all messages will
-	be logged at the LOG_ERR level, saving just under 200 bytes.
+	Enable if you want to use Unix98 PTY support. If enabled,
+	busybox will use /dev/ptmx for the master side of the pseudoterminal
+	and /dev/pts/<number> for the slave side. Otherwise, BSD style
+	/dev/ttyp<number> will be used. To use this option, you should have
+	devpts mounted.
 
 config BUSYBOX_FEATURE_UTMP
 	bool "Support utmp file"
-	default n
+	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.
+	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 n
+	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.
+	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
 	help
-	  This option makes some applets (e.g. crond, syslogd, inetd) write
-	  a pidfile in /var/run. Some applications rely on them.
+	This option makes some applets (e.g. crond, syslogd, inetd) write
+	a pidfile at the configured BUSYBOX_PID_FILE_PATH.  It has no effect
+	on applets which require pidfiles to run.
 
 config BUSYBOX_PID_FILE_PATH
-        string "Path to directory for pidfile"
-        default "/var/run"
-        depends on BUSYBOX_FEATURE_PIDFILE
-        help
-          This is the default path where pidfiles are created.  Applets which
-          allow you to set the pidfile path on the command line will override
-          this value.  The option has no effect on applets that require you to
-          specify a pidfile path.
+	string "Directory for pidfiles"
+	default "/var/run"
+	depends on BUSYBOX_FEATURE_PIDFILE || BUSYBOX_FEATURE_CROND_SPECIAL_TIMES
+	help
+	This is the default path where pidfiles are created.  Applets which
+	allow you to set the pidfile path on the command line will override
+	this value.  The option has no effect on applets that require you to
+	specify a pidfile path.  When crond has the 'Support special times'
+	option enabled, the 'crond.reboot' file is also stored here.
 
-config BUSYBOX_FEATURE_SUID
-	bool "Support for SUID/SGID handling"
+config BUSYBOX_BUSYBOX
+	bool "Include busybox applet"
 	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
-	  root-level operations even when run by ordinary users
-	  (for example, mounting of user mounts in fstab needs this).
-
-	  Busybox will automatically drop priviledges for applets
-	  that don't need root access.
+	The busybox applet provides general help message and allows
+	the included applets to be listed.  It also provides
+	optional --install command to create applet links. If you unselect
+	this option, running busybox without any arguments will give
+	just a cryptic error message:
 
-	  If you are really paranoid and don't want to do this, build two
-	  busybox binaries with different applets in them (and the appropriate
-	  symlinks pointing to each binary), and only set the suid bit on the
-	  one that needs it.
+	$ busybox
+	busybox: applet not found
 
-	  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.
+	Running "busybox APPLET [ARGS...]" will still work, of course.
 
-	  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.
-
-	  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_SHOW_SCRIPT
+	bool "Support --show SCRIPT"
+	default y
+	depends on BUSYBOX_BUSYBOX
 
-config BUSYBOX_FEATURE_SUID_CONFIG
-	bool "Runtime SUID/SGID configuration via /etc/busybox.conf"
+config BUSYBOX_FEATURE_INSTALLER
+	bool "Support --install [-s] to install applet links at runtime"
 	default y
-	depends on BUSYBOX_FEATURE_SUID
+	depends on BUSYBOX_BUSYBOX
 	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:
+	Enable 'busybox --install [-s]' support. This will allow you to use
+	busybox at runtime to create hard links or symlinks for all the
+	applets that are compiled into busybox.
 
-	  APPLET = [Ssx-][Ssx-][x-] [USER.GROUP]
+config BUSYBOX_INSTALL_NO_USR
+	bool "Don't use /usr"
+	default n
+	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.
 
-	  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.
+config BUSYBOX_FEATURE_SUID
+	bool "Drop SUID state for most applets"
+	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
+	root-level operations even when run by ordinary users
+	(for example, mounting of user mounts in fstab needs this).
 
-	  An example might help:
+	With this option enabled, busybox drops privileges for applets
+	that don't need root access, before entering their main() function.
 
-	  [SUID]
-	  su = ssx root.0 # applet su can be run by anyone and runs with
-	                  # euid=0/egid=0
-	  su = ssx        # exactly the same
+	If you are really paranoid and don't want even initial busybox code
+	to run under root for every applet, build two busybox binaries with
+	different applets in them (and the appropriate symlinks pointing
+	to each binary), and only set the suid bit on the one that needs it.
 
-	  mount = sx- root.disk # applet mount can be run by root and members
-	                        # of group disk (but not anyone else)
-	                        # and runs with euid=0 (egid is not changed)
+	Some applets which require root rights (need suid bit on the binary
+	or to be run by root) and will refuse to execute otherwise:
+	crontab, login, passwd, su, vlock, wall.
 
-	  cp = --- # disable applet cp for everyone
+	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.
 
-	  The file has to be owned by user root, group root and has to be
-	  writeable only by root:
-	        (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
-	  The busybox executable has to be owned by user root, group
-	  root and has to be setuid root for this to work:
-	        (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+	Note that if you DO NOT 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").
 
-	  Robert 'sandman' Griebl has more information here:
-	  <url: http://www.softforge.de/bb/suid.html >.
+config BUSYBOX_FEATURE_SUID_CONFIG
+	bool "Enable SUID configuration via /etc/busybox.conf"
+	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-] [USER.GROUP]
+
+	s: USER or GROUP is allowed to execute APPLET.
+	   APPLET will run under USER or GROUP
+	   (regardless 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:
+
+	|[SUID]
+	|su = ssx root.0 # applet su can be run by anyone and runs with
+	|                # euid=0,egid=0
+	|su = ssx        # exactly the same
+	|
+	|mount = sx- root.disk # applet mount can be run by root and members
+	|                      # of group disk (but not anyone else)
+	|                      # and runs with euid=0 (egid is not changed)
+	|
+	|cp = --- # disable applet cp for everyone
+
+	The file has to be owned by user root, group root and has to be
+	writeable only by root:
+		(chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
+	The busybox executable has to be owned by user root, group
+	root and has to be setuid root for this to work:
+		(chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
+
+	Robert 'sandman' Griebl has more information here:
+	<url: http://www.softforge.de/bb/suid.html >.
 
 config BUSYBOX_FEATURE_SUID_CONFIG_QUIET
 	bool "Suppress warning message if /etc/busybox.conf is not readable"
 	default y
 	depends on BUSYBOX_FEATURE_SUID_CONFIG
 	help
-	  /etc/busybox.conf should be readable by the user needing the SUID,
-	  check this option to avoid users to be notified about missing
-	  permissions.
+	/etc/busybox.conf should be readable by the user needing the SUID,
+	check this option to avoid users to be notified about missing
+	permissions.
+
+config BUSYBOX_FEATURE_PREFER_APPLETS
+	bool "exec prefers applets"
+	default n
+	help
+	This is an experimental option which directs applets about to
+	call 'exec' to try and find an applicable busybox applet before
+	searching the PATH. This is typically done by exec'ing
+	/proc/self/exe.
+
+	This may affect shell, find -exec, xargs and similar applets.
+	They will use applets even if /bin/APPLET -> busybox link
+	is missing (or is not a link to busybox). However, this causes
+	problems in chroot jails without mounted /proc and with ps/top
+	(command name can be shown as 'exe' for applets started this way).
+
+config BUSYBOX_BUSYBOX_EXEC_PATH
+	string "Path to busybox executable"
+	default "/proc/self/exe"
+	help
+	When applets need to run other applets, busybox
+	sometimes needs to exec() itself. When the /proc filesystem is
+	mounted, /proc/self/exe always points to the currently running
+	executable. If you haven't got /proc, set this to wherever you
+	want to run busybox from.
 
 config BUSYBOX_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
-	  Enable support for SELinux in applets ls, ps, and id. Also provide
-	  the option of compiling in SELinux applets.
+	Enable support for SELinux in applets ls, ps, and id. Also provide
+	the option of compiling in SELinux applets.
+
+	If you do not have a complete SELinux userland installed, this stuff
+	will not compile.  Specifially, libselinux 1.28 or better is
+	directly required by busybox. If the installation is located in a
+	non-standard directory, provide it by invoking make as follows:
 
-	  If you do not have a complete SELinux userland installed, this stuff
-	  will not compile. Go visit
-		http://www.nsa.gov/selinux/index.html
-	  to download the necessary stuff to allow busybox to compile with
-	  this option enabled. Specifially, libselinux 1.28 or better is
-	  directly required by busybox. If the installation is located in a
-	  non-standard directory, provide it by invoking make as follows:
 		CFLAGS=-I<libselinux-include-path> \
 		LDFLAGS=-L<libselinux-lib-path> \
 		make
 
-	  Most people will leave this set to 'N'.
+	Most people will leave this set to 'N'.
 
-config BUSYBOX_FEATURE_PREFER_APPLETS
-	bool "exec prefers applets"
+config BUSYBOX_FEATURE_CLEAN_UP
+	bool "Clean up all memory before exiting (usually not needed)"
 	default n
 	help
-	  This is an experimental option which directs applets about to
-	  call 'exec' to try and find an applicable busybox applet before
-	  searching the PATH. This is typically done by exec'ing
-	  /proc/self/exe.
-	  This may affect shell, find -exec, xargs and similar applets.
-	  They will use applets even if /bin/<applet> -> busybox link
-	  is missing (or is not a link to busybox). However, this causes
-	  problems in chroot jails without mounted /proc and with ps/top
-	  (command name can be shown as 'exe' for applets started this way).
+	As a size optimization, busybox normally exits without explicitly
+	freeing dynamically allocated memory or closing files. This saves
+	space since the OS will clean up for us, but it can confuse debuggers
+	like valgrind, which report tons of memory and resource leaks.
 
-config BUSYBOX_BUSYBOX_EXEC_PATH
-	string "Path to BusyBox executable"
-	default "/proc/self/exe"
+	Don't enable this unless you have a really good reason to clean
+	things up manually.
+
+config BUSYBOX_FEATURE_SYSLOG_INFO
+	bool "Support LOG_INFO level syslog messages"
+	default y
+	depends on BUSYBOX_FEATURE_SYSLOG
 	help
-	  When Busybox applets need to run other busybox applets, BusyBox
-	  sometimes needs to exec() itself. When the /proc filesystem is
-	  mounted, /proc/self/exe always points to the currently running
-	  executable. If you haven't got /proc, set this to wherever you
-	  want to run BusyBox from.
+	Applets which send their output to syslog use either LOG_INFO or
+	LOG_ERR log levels, but by disabling this option all messages will
+	be logged at the LOG_ERR level, saving just under 200 bytes.
 
 # These are auto-selected by other options
 
@@ -522,57 +355,53 @@ config BUSYBOX_FEATURE_SYSLOG
 	bool #No description makes it a hidden option
 	default n
 	#help
-	#  This option is auto-selected when you select any applet which may
-	#  send its output to syslog. You do not need to select it manually.
+	#This option is auto-selected when you select any applet which may
+	#send its output to syslog. You do not need to select it manually.
 
-config BUSYBOX_FEATURE_HAVE_RPC
+config BUSYBOX_PLATFORM_LINUX
 	bool #No description makes it a hidden option
 	default n
 	#help
-	#  This is automatically selected if any of enabled applets need it.
-	#  You do not need to select it manually.
+	#For the most part, busybox requires only POSIX compatibility
+	#from the target system, but some applets and features use
+	#Linux-specific interfaces.
+	#
+	#This is automatically selected if any applet or feature requires
+	#Linux-specific interfaces. You do not need to select it manually.
 
-endmenu
-
-menu 'Build Options'