busybox: update to 1.26.0

1 files changed, 24 insertions, 12 deletions

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index fece6971b..cedbc4482 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -258,6 +258,12 @@ config BUSYBOX_HOSTNAME
 	help
 	  Show or set the system's host name.
 
+config BUSYBOX_DNSDOMAINNAME
+	bool "dnsdomainname"
+	default n
+	help
+	  Alias to "hostname -d".
+
 config BUSYBOX_HTTPD
 	bool "httpd"
 	default n
@@ -449,12 +455,12 @@ config BUSYBOX_IFPLUGD
 	help
 	  Network interface plug detection daemon.
 
-config BUSYBOX_IFUPDOWN
-	bool "ifupdown"
+config BUSYBOX_IFUP
+	bool "ifup"
 	default y if ADK_TARGET_WITH_NET
 	help
-	  Activate or deactivate the specified interfaces. This applet makes
-	  use of either "ifconfig" and "route" or the "ip" command to actually
+	  Activate the specified interfaces. This applet makes use
+	  of either "ifconfig" and "route" or the "ip" command to actually
 	  configure network interfaces. Therefore, you will probably also want
 	  to enable either IFCONFIG and ROUTE, or enable
 	  FEATURE_IFUPDOWN_IP and the various IP options. Of
@@ -465,10 +471,16 @@ config BUSYBOX_IFUPDOWN
 	  "ifconfig", "route" and "run-parts" or the "ip" command, either
 	  via busybox or via standalone utilities.
 
+config BUSYBOX_IFDOWN
+	bool "ifdown"
+	default y if ADK_TARGET_WITH_NET
+	help
+	  Deactivate the specified interfaces.
+
 config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 	string "Absolute path to ifstate file"
 	default "/var/run/ifstate"
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  ifupdown keeps state information in a file called ifstate.
 	  Typically it is located in /var/run/ifstate, however
@@ -479,7 +491,7 @@ config BUSYBOX_IFUPDOWN_IFSTATE_PATH
 config BUSYBOX_FEATURE_IFUPDOWN_IP
 	bool "Use ip applet"
 	default y
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
 	  than the default of using the older 'ifconfig' and 'route' utilities.
@@ -502,7 +514,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
 config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 	bool "Use busybox ifconfig and route applets"
 	default n
-	depends on BUSYBOX_IFUPDOWN && !BUSYBOX_FEATURE_IFUPDOWN_IP
+	depends on BUSYBOX_IFUP && !BUSYBOX_FEATURE_IFUPDOWN_IP
 	select BUSYBOX_IFCONFIG
 	select BUSYBOX_ROUTE
 	help
@@ -516,14 +528,14 @@ config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 config BUSYBOX_FEATURE_IFUPDOWN_IPV4
 	bool "Support for IPv4"
 	default y
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BUSYBOX_FEATURE_IFUPDOWN_IPV6
 	bool "Support for IPv6"
 	default y
-	depends on BUSYBOX_IFUPDOWN && BUSYBOX_FEATURE_IPV6
+	depends on BUSYBOX_IFUP && BUSYBOX_FEATURE_IPV6
 	help
 	  If you need support for IPv6, turn this option on.
 
@@ -539,7 +551,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV6
 config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 	bool "Enable mapping support"
 	default n
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  This enables support for the "mapping" stanza, unless you have
 	  a weird network setup you don't need it.
@@ -547,7 +559,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
 config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
 	bool "Support for external dhcp clients"
 	default n
-	depends on BUSYBOX_IFUPDOWN
+	depends on BUSYBOX_IFUP
 	help
 	  This enables support for the external dhcp clients. Clients are
 	  tried in the following order: dhcpcd, dhclient, pump and udhcpc.
@@ -1047,7 +1059,7 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string "ifup udhcpc command line options"
 	default "-R" if BUSYBOX_NOMMU
 	default "-R -b"
-	depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
+	depends on BUSYBOX_IFUP && BUSYBOX_UDHCPC
 	help
 	  Command line options to pass to udhcpc from ifup.
 	  Intended to alter options not available in /etc/network/interfaces.