busybox: sync Config.in files

The change was made with the following commands

	cd package/utils/busybox/config
	../convert_menuconfig.pl ~/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/busybox-1.30.1

convert_defaults.pl has no changes other than overwriting defaults for
BUSYBOX_DEFAULT_FEATURE_IPV6

Resolves FS#2146

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

1 files changed, 55 insertions, 20 deletions

diff --git a/package/utils/busybox/config/libbb/Config.in b/package/utils/busybox/config/libbb/Config.in
index 5be8aedc88..f476e86073 100644
--- a/package/utils/busybox/config/libbb/Config.in
+++ b/package/utils/busybox/config/libbb/Config.in
@@ -1,10 +1,10 @@
 # DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
-menu "Busybox Library Tuning"
+comment "Library Tuning"
 
 config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 	bool "Use the end of BSS page"
@@ -19,6 +19,7 @@ config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 
 	At link time, "text" is padded to a full page. At runtime, all "text"
 	pages are mapped RO and executable.
+
 	"Data" starts on the next page boundary, but is not padded
 	to a full page at the end. "Bss" starts wherever "data" ends.
 	At runtime, "data" pages are mapped RW and they are file-backed
@@ -36,8 +37,13 @@ config BUSYBOX_CONFIG_FEATURE_USE_BSS_TAIL
 	is known only after final link.
 
 	If you are getting a build error like this:
-	        appletlib.c:(.text.main+0xd): undefined reference to '_end'
+		appletlib.c:(.text.main+0xd): undefined reference to '_end'
 	disable this option.
+config BUSYBOX_CONFIG_FLOAT_DURATION
+	bool "Enable fractional duration arguments"
+	default BUSYBOX_DEFAULT_FLOAT_DURATION
+	help
+	Allow sleep N.NNN, top -d N.NNN etc.
 config BUSYBOX_CONFIG_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default BUSYBOX_DEFAULT_FEATURE_RTMINMAX
@@ -45,18 +51,29 @@ config BUSYBOX_CONFIG_FEATURE_RTMINMAX
 	Support RTMIN[+n] and RTMAX[-n] signal names
 	in kill, killall etc. This costs ~250 bytes.
 
+config BUSYBOX_CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+	bool "Use the definitions of SIGRTMIN/SIGRTMAX provided by libc"
+	default BUSYBOX_DEFAULT_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS
+	depends on BUSYBOX_CONFIG_FEATURE_RTMINMAX
+	help
+	Some C libraries reserve a few real-time signals for internal
+	use, and adjust the values of SIGRTMIN/SIGRTMAX seen by
+	applications accordingly. Saying yes here means that a signal
+	name RTMIN+n will be interpreted according to the libc definition
+	of SIGRTMIN, and not the raw definition provided by the kernel.
+	This behavior matches "kill -l RTMIN+n" from bash.
+
 choice
 	prompt "Buffer allocation policy"
 	default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK
 	help
-	There are 3 ways BusyBox can handle buffer allocations:
+	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.
+	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.
+	MMU (and OS support), but wastes runtime RAM for uCLinux. This
+	behavior was the only one available for versions 0.48 and earlier.
 
 config BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC
 	bool "Allocate with Malloc"
@@ -84,7 +101,7 @@ config BUSYBOX_CONFIG_MD5_SMALL
 	Trade binary size versus speed for the md5sum algorithm.
 	Approximate values running uClibc and hashing
 	linux-2.4.4.tar.bz2 were:
-	                    user times (sec)  text size (386)
+	value               user times (sec)  text size (386)
 	0 (fastest)         1.1                6144
 	1                   1.4                5392
 	2                   3.0                5088
@@ -104,7 +121,7 @@ config BUSYBOX_CONFIG_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default BUSYBOX_DEFAULT_FEATURE_FAST_TOP  # all "fast or small" options default to small
 	help
-	This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
+	This option makes top and ps ~20% faster (or 20% less CPU hungry),
 	but code size is slightly bigger.
 
 config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
@@ -115,6 +132,18 @@ config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS
 	a rarely used feature which allows you to use names
 	instead of IP/mask pairs in route command.
 
+config BUSYBOX_CONFIG_FEATURE_ETC_SERVICES
+	bool "Consult /etc/services even for well-known ports"
+	default BUSYBOX_DEFAULT_FEATURE_ETC_SERVICES
+	help
+	Look up e.g. "telnet" and "http" in /etc/services file
+	instead of assuming ports 23 and 80.
+	This is almost never necessary (everybody uses standard ports),
+	and it makes sense to avoid reading this file.
+	If you disable this option, in the cases where port is explicitly
+	specified as a service name (e.g. "telnet HOST PORTNAME"),
+	it will still be looked up in /etc/services.
+
 config BUSYBOX_CONFIG_FEATURE_EDITING
 	bool "Command line editing"
 	default BUSYBOX_DEFAULT_FEATURE_EDITING
@@ -188,6 +217,11 @@ config BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT
 	Setting this option allows for prompts to use things like \w and
 	\$ and escape codes.
 
+config BUSYBOX_CONFIG_FEATURE_EDITING_WINCH
+	bool "Enable automatic tracking of window size changes"
+	default BUSYBOX_DEFAULT_FEATURE_EDITING_WINCH
+	depends on BUSYBOX_CONFIG_FEATURE_EDITING
+
 config BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL
 	bool "Query cursor position from terminal"
 	default BUSYBOX_DEFAULT_FEATURE_EDITING_ASK_TERMINAL
@@ -340,13 +374,17 @@ config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE
 	default BUSYBOX_DEFAULT_FEATURE_VERBOSE_CP_MESSAGE
 	help
 	Error messages with this feature enabled:
-	    $ cp file /does_not_exist/file
-	    cp: cannot create '/does_not_exist/file': Path does not exist
-	    $ cp file /vmlinuz/file
-	    cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
+	$ cp file /does_not_exist/file
+	cp: cannot create '/does_not_exist/file': Path does not exist
+	$ cp file /vmlinuz/file
+	cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
 	If this feature is not enabled, they will be, respectively:
-	    cp: cannot create '/does_not_exist/file': No such file or directory
-	    cp: cannot stat '/vmlinuz/file': Not a directory
+
+	cp: cannot create '/does_not_exist/file': No such file or directory
+	cp: cannot stat '/vmlinuz/file': Not a directory
+
 	This will cost you ~60 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_USE_SENDFILE
@@ -414,7 +452,4 @@ config BUSYBOX_CONFIG_FEATURE_HWIB
 	bool "Support infiniband HW"
 	default BUSYBOX_DEFAULT_FEATURE_HWIB
 	help
-	Support for printing infiniband addresses in
-	network applets.
-
-endmenu
+	Support for printing infiniband addresses in network applets.