[package] update busybox to 1.18.4, patch from Peter Wagner

[openwrt.git] / package / busybox / config / networking / Config.in

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 481567c..82d3603 100644 (file)
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -5,6 +5,12 @@
 
 menu "Networking Utilities"
 
+config BUSYBOX_CONFIG_NBDCLIENT
+       bool "nbd-client"
+       default n
+       help
+         Network block device client
+
 config BUSYBOX_CONFIG_NC
        bool "nc"
        default y
@@ -82,18 +88,21 @@ config BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS
 config BUSYBOX_CONFIG_ARP
        bool "arp"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Manipulate the system ARP cache.
 
 config BUSYBOX_CONFIG_ARPING
        bool "arping"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Ping hosts by ARP packets.
 
 config BUSYBOX_CONFIG_BRCTL
        bool "brctl"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Manage ethernet bridges.
          Supports addbr/delbr and addif/delif.
@@ -126,6 +135,7 @@ config BUSYBOX_CONFIG_DNSD
 config BUSYBOX_CONFIG_ETHER_WAKE
        bool "ether-wake"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Send a magic packet to wake up sleeping machines.
 
@@ -297,9 +307,18 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
          Then a request to /url/myfile will be forwarded to
          http://hostname[:port]/new/path/myfile.
 
+config BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP
+       bool "Support for GZIP content encoding"
+       default n
+       depends on BUSYBOX_CONFIG_HTTPD
+       help
+         Makes httpd send files using GZIP content encoding if the
+         client supports it and a pre-compressed <file>.gz exists.
+
 config BUSYBOX_CONFIG_IFCONFIG
        bool "ifconfig"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Ifconfig is used to configure the kernel-resident network interfaces.
 
@@ -347,6 +366,7 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
 config BUSYBOX_CONFIG_IFENSLAVE
        bool "ifenslave"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Userspace application to bind several interfaces
          to a logical interface (use with kernel bonding driver).
@@ -354,6 +374,7 @@ config BUSYBOX_CONFIG_IFENSLAVE
 config BUSYBOX_CONFIG_IFPLUGD
        bool "ifplugd"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Network interface plug detection daemon.
 
@@ -395,7 +416,7 @@ config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
        bool "Use busybox ip applet"
        default n
-       depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
+       depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP && BUSYBOX_CONFIG_PLATFORM_LINUX
        select BUSYBOX_CONFIG_IP
        select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
        select BUSYBOX_CONFIG_FEATURE_IP_LINK
@@ -514,6 +535,7 @@ config BUSYBOX_CONFIG_FEATURE_INETD_RPC
 config BUSYBOX_CONFIG_IP
        bool "ip"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          The "ip" applet is a TCP/IP interface configuration and routing
          utility. You generally don't need "ip" to use busybox with
@@ -629,6 +651,7 @@ config BUSYBOX_CONFIG_FEATURE_IPCALC_LONG_OPTIONS
 config BUSYBOX_CONFIG_NAMEIF
        bool "nameif"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          nameif is used to rename network interface by its MAC address.
@@ -663,6 +686,7 @@ config BUSYBOX_CONFIG_NETMSG
 config BUSYBOX_CONFIG_NETSTAT
        bool "netstat"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          netstat prints information about the Linux networking subsystem.
 
@@ -691,6 +715,7 @@ config BUSYBOX_CONFIG_NSLOOKUP
 config BUSYBOX_CONFIG_NTPD
        bool "ntpd"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          The NTP client/server daemon.
 
@@ -705,6 +730,7 @@ config BUSYBOX_CONFIG_FEATURE_NTPD_SERVER
 config BUSYBOX_CONFIG_PING
        bool "ping"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
          elicit an ICMP ECHO_RESPONSE from a host or gateway.
@@ -733,12 +759,14 @@ config BUSYBOX_CONFIG_PSCAN
 config BUSYBOX_CONFIG_ROUTE
        bool "route"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Route displays or manipulates the kernel's IP routing tables.
 
 config BUSYBOX_CONFIG_SLATTACH
        bool "slattach"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          slattach is a small utility to attach network interfaces to serial
          lines.
@@ -819,7 +847,7 @@ config BUSYBOX_CONFIG_TELNETD
 
                  mount -t devpts devpts /dev/pts
 
-         You need to be sure that Busybox has LOGIN and
+         You need to be sure that busybox has LOGIN and
          FEATURE_SUID enabled. And finally, you should make
          certain that Busybox has been installed setuid root:
 
@@ -925,6 +953,7 @@ config BUSYBOX_CONFIG_TFTP_DEBUG
 config BUSYBOX_CONFIG_TRACEROUTE
        bool "traceroute"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Utility to trace the route of IP packets.
 
@@ -961,6 +990,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 config BUSYBOX_CONFIG_TUNCTL
        bool "tunctl"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          tunctl creates or deletes tun devices.
 
@@ -993,6 +1023,7 @@ config BUSYBOX_CONFIG_UDPSVD
 config BUSYBOX_CONFIG_VCONFIG
        bool "vconfig"
        default y
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        help
          Creates, removes, and configures VLAN interfaces
 
@@ -1024,9 +1055,22 @@ config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
        help
          Support long options for the wget applet.
 
+config BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
+       bool "Enable read timeout option -T SEC"
+       default n
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Supports network read timeout for wget, so that wget will give
+         up and timeout when reading network data, through the -T command
+         line option.  Currently only network data read timeout is
+         supported (i.e., timeout is not applied to the DNS nor TCP
+         connection initialization).  When FEATURE_WGET_LONG_OPTIONS is
+         also enabled, the --timeout option will work in addition to -T.
+
 config BUSYBOX_CONFIG_ZCIP
        bool "zcip"
        default n
+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.