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

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

1 files changed, 39 insertions, 24 deletions

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.