busybox: update to v1.14.4 (closes: #5619)

[openwrt/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 de7484aa99e316c677bc88794af602164c5b7250..0bde42b14fd3206c228ad8892df56529dc190f7c 100644 (file)
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -13,7 +13,7 @@ config BUSYBOX_CONFIG_FEATURE_IPV6
          This adds IPv6 support in the networking applets.
 
 config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS
-       bool "Preferentially use IPv4 addresses from DNS queries"
+       bool "Prefer IPv4 addresses from DNS queries"
        default y
        depends on BUSYBOX_CONFIG_FEATURE_IPV6
        help
@@ -66,12 +66,12 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
          This adds about 600 bytes.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
-       bool "Support show, showmac and showstp"
+       bool "Support show"
        default y
        depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
        help
          Add support for option which prints the current config:
-           showmacs, showstp, show
+           show
 
 config BUSYBOX_CONFIG_DNSD
        bool "dnsd"
@@ -93,6 +93,19 @@ config BUSYBOX_CONFIG_FAKEIDENTD
          fakeidentd listens on the ident port and returns a predefined
          fake value on any query.
 
+config BUSYBOX_CONFIG_FTPD
+       bool "ftpd"
+       default n
+       help
+         simple FTP daemon. You have to run it via inetd.
+
+config BUSYBOX_CONFIG_FEATURE_FTP_WRITE
+       bool "Enable upload commands"
+       default n
+       depends on BUSYBOX_CONFIG_FTPD
+       help
+         Enable all kinds of FTP upload commands (-w option)
+
 config BUSYBOX_CONFIG_FTPGET
        bool "ftpget"
        default n
@@ -827,7 +840,7 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
 config BUSYBOX_CONFIG_TFTP_DEBUG
        bool "Enable debug"
        default n
-       depends on BUSYBOX_CONFIG_TFTP
+       depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_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
@@ -844,7 +857,7 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
        default y
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help
-         Add some verbosity to traceroute. This includes amongst other things
+         Add some verbosity to traceroute. This includes among other things
          hostnames and ICMP response types.
 
 config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
@@ -860,10 +873,19 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
        default n
        depends on BUSYBOX_CONFIG_TRACEROUTE
        help
-         Add feature to allow for ICMP ECHO instead of UDP datagrams.
+         Add option -I to use ICMP ECHO instead of UDP datagrams.
 
 source package/busybox/config/networking/udhcp/Config.in
 
+config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
+       string "ifup udhcpc command line options"
+       default "-R -n"
+       depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_APP_UDHCPC
+       help
+         Command line options to pass to udhcpc from ifup.
+         Intended to alter options not available in /etc/network/interfaces.
+         (IE: --syslog --background etc...)
+
 config BUSYBOX_CONFIG_VCONFIG
        bool "vconfig"
        default y
@@ -917,6 +939,20 @@ config BUSYBOX_CONFIG_TCPSVD
          tcpsvd listens on a TCP port and runs a program for each new
          connection.
 
+config BUSYBOX_CONFIG_TUNCTL
+       bool "tunctl"
+       default n
+       help
+         tunctl creates or deletes tun devices.
+
+config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
+       bool "Support owner:group assignment"
+       default n
+       depends on BUSYBOX_CONFIG_TUNCTL
+       help
+         Allow to specify owner and group of newly created interface.
+         340 bytes of pure bloat. Say no here.
+
 config BUSYBOX_CONFIG_UDPSVD
        bool "udpsvd"
        default n