From 045dae618763ae15d426057817373b1ebf37a3bc Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 12 Jun 2011 11:13:58 +0200 Subject: Packages: Busybox: Add busybox-1.18.4 and update kconfig symbols Signed-off-by: Abdoulaye Walsimou Gaye --- .../busybox-kconfigs/busybox-networking.kconfig | 69 ++++++++++++++++++---- 1 file changed, 57 insertions(+), 12 deletions(-) (limited to 'packages/busybox/busybox-kconfigs/busybox-networking.kconfig') diff --git a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig index f6a2a1b..7319af4 100644 --- a/packages/busybox/busybox-kconfigs/busybox-networking.kconfig +++ b/packages/busybox/busybox-kconfigs/busybox-networking.kconfig @@ -7,6 +7,11 @@ comment "-------------------------------------------------" comment "Networking Utilities" comment "-------------------------------------------------" +config KEMBTK_BUSYB_NBDCLIENT + bool "nbd-client" + default y + help + Network block device client config KEMBTK_BUSYB_NC bool "nc" default y @@ -48,7 +53,7 @@ config KEMBTK_BUSYB_FEATURE_IPV6 config KEMBTK_BUSYB_FEATURE_UNIX_LOCAL bool "Enable Unix domain socket support (usually not needed)" - depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Enable Unix domain socket support in all busybox networking applets. Address of the form local:/path/to/unix/socket @@ -82,18 +87,21 @@ config KEMBTK_BUSYB_VERBOSE_RESOLUTION_ERRORS config KEMBTK_BUSYB_ARP bool "arp" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Manipulate the system KEMBTK_BUSYB_ARP cache. config KEMBTK_BUSYB_ARPING bool "arping" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Ping hosts by KEMBTK_BUSYB_ARP packets. config KEMBTK_BUSYB_BRCTL bool "brctl" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. @@ -126,6 +134,7 @@ config KEMBTK_BUSYB_DNSD config KEMBTK_BUSYB_ETHER_WAKE bool "ether-wake" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. @@ -139,7 +148,7 @@ config KEMBTK_BUSYB_FAKEIDENTD config KEMBTK_BUSYB_FTPD bool "ftpd" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X default y help simple FTP daemon. You have to run it via inetd. @@ -155,7 +164,7 @@ config KEMBTK_BUSYB_FEATURE_FTPD_ACCEPT_BROKEN_LIST bool "Enable workaround for RFC-violating clients" default y depends on KEMBTK_BUSYB_FTPD - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Some ftp clients (among them KDE's Konqueror) issue illegal "LIST -l" requests. This option works around such problems. @@ -314,9 +323,19 @@ config KEMBTK_BUSYB_FEATURE_HTTPD_PROXY Then a request to /url/myfile will be forwarded to http://hostname[:port]/new/path/myfile. +config KEMBTK_BUSYB_FEATURE_HTTPD_GZIP + bool "Support for KEMBTK_BUSYB_GZIP content encoding" + default y + depends on KEMBTK_BUSYB_HTTPD + depends on EMBTK_BB_VERSION_1_18_X + help + Makes httpd send files using KEMBTK_BUSYB_GZIP content encoding if the + client supports it and a pre-compressed .gz exists. + config KEMBTK_BUSYB_IFCONFIG bool "ifconfig" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -364,14 +383,16 @@ config KEMBTK_BUSYB_FEATURE_IFCONFIG_BROADCAST_PLUS config KEMBTK_BUSYB_IFENSLAVE bool "ifenslave" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help 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 || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Network interface plug detection daemon. @@ -413,7 +434,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y - depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP + depends on KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP && KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_IP select KEMBTK_BUSYB_FEATURE_IP_ADDRESS select KEMBTK_BUSYB_FEATURE_IP_LINK @@ -530,6 +551,7 @@ config KEMBTK_BUSYB_FEATURE_INETD_RPC config KEMBTK_BUSYB_IP bool "ip" default y + depends on KEMBTK_BUSYB_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 @@ -644,6 +666,7 @@ config KEMBTK_BUSYB_FEATURE_IPCALC_LONG_OPTIONS config KEMBTK_BUSYB_NAMEIF bool "nameif" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. @@ -672,6 +695,7 @@ config KEMBTK_BUSYB_FEATURE_NAMEIF_EXTENDED config KEMBTK_BUSYB_NETSTAT bool "netstat" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. @@ -699,8 +723,9 @@ config KEMBTK_BUSYB_NSLOOKUP config KEMBTK_BUSYB_NTPD bool "ntpd" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help The NTP client/server daemon. @@ -715,6 +740,7 @@ config KEMBTK_BUSYB_FEATURE_NTPD_SERVER config KEMBTK_BUSYB_PING bool "ping" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help ping uses the ICMP protocol's mandatory KEMBTK_BUSYB_ECHO_REQUEST datagram to elicit an ICMP KEMBTK_BUSYB_ECHO_RESPONSE from a host or gateway. @@ -743,12 +769,14 @@ config KEMBTK_BUSYB_PSCAN config KEMBTK_BUSYB_ROUTE bool "route" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Route displays or manipulates the kernel's KEMBTK_BUSYB_IP routing tables. config KEMBTK_BUSYB_SLATTACH bool "slattach" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help slattach is a small utility to attach network interfaces to serial lines. @@ -829,7 +857,7 @@ config KEMBTK_BUSYB_TELNETD mount -t devpts devpts /dev/pts - You need to be sure that Busybox has KEMBTK_BUSYB_LOGIN and + You need to be sure that busybox has KEMBTK_BUSYB_LOGIN and KEMBTK_BUSYB_FEATURE_SUID enabled. And finally, you should make certain that Busybox has been installed setuid root: @@ -850,7 +878,7 @@ config KEMBTK_BUSYB_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" default y depends on KEMBTK_BUSYB_FEATURE_TELNETD_STANDALONE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help This option allows you to run telnetd in "inet wait" mode. Example inetd.conf line (note "wait", not usual "nowait"): @@ -920,9 +948,9 @@ config KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE config KEMBTK_BUSYB_FEATURE_TFTP_PROGRESS_BAR bool "Enable tftp progress meter" - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y depends on KEMBTK_BUSYB_TFTP && KEMBTK_BUSYB_FEATURE_TFTP_BLOCKSIZE + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Show progress bar. @@ -936,6 +964,7 @@ config KEMBTK_BUSYB_TFTP_DEBUG config KEMBTK_BUSYB_TRACEROUTE bool "traceroute" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Utility to trace the route of KEMBTK_BUSYB_IP packets. @@ -943,7 +972,7 @@ config KEMBTK_BUSYB_TRACEROUTE6 bool "traceroute6" default y depends on KEMBTK_BUSYB_FEATURE_IPV6 && KEMBTK_BUSYB_TRACEROUTE - depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Utility to trace the route of KEMBTK_BUSYB_IPv6 packets. @@ -970,8 +999,9 @@ config KEMBTK_BUSYB_FEATURE_TRACEROUTE_USE_ICMP config KEMBTK_BUSYB_TUNCTL bool "tunctl" - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help tunctl creates or deletes tun devices. @@ -989,7 +1019,7 @@ config KEMBTK_BUSYB_IFUPDOWN_UDHCPC_CMD_OPTIONS string "ifup udhcpc command line options" default "-R -n" depends on KEMBTK_BUSYB_IFUPDOWN && KEMBTK_BUSYB_UDHCPC - depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X + depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X help Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. @@ -1005,6 +1035,7 @@ config KEMBTK_BUSYB_UDPSVD config KEMBTK_BUSYB_VCONFIG bool "vconfig" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces @@ -1036,9 +1067,23 @@ config KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS help Support long options for the wget applet. +config KEMBTK_BUSYB_FEATURE_WGET_TIMEOUT + bool "Enable read timeout option -T SEC" + default y + depends on KEMBTK_BUSYB_WGET + depends on EMBTK_BB_VERSION_1_18_X + 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 KEMBTK_BUSYB_FEATURE_WGET_LONG_OPTIONS is + also enabled, the --timeout option will work in addition to -T. + config KEMBTK_BUSYB_ZCIP bool "zcip" default y + depends on KEMBTK_BUSYB_PLATFORM_LINUX select KEMBTK_BUSYB_FEATURE_SYSLOG help KEMBTK_BUSYB_ZCIP provides ZeroConf KEMBTK_BUSYB_IPv4 address selection, according to RFC 3927. -- cgit v1.2.3