From cc2191d76da8bb84bd4f52727b24a6b5bd94ec6b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 9 Apr 2021 22:39:49 +0200 Subject: update busybox/hush to latest --- package/busybox/config/networking/Config.in | 62 ++++++++++++++--------- package/busybox/config/networking/udhcp/Config.in | 2 - 2 files changed, 38 insertions(+), 26 deletions(-) (limited to 'package/busybox/config/networking') diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 85171edcb..4832a82d0 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -61,19 +61,16 @@ config BUSYBOX_FEATURE_TLS_SHA1 config BUSYBOX_ARP bool "arp (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Manipulate the system ARP cache. config BUSYBOX_ARPING bool "arping (9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Ping hosts by ARP packets. config BUSYBOX_BRCTL bool "brctl (4.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. @@ -104,7 +101,6 @@ config BUSYBOX_DNSD config BUSYBOX_ETHER_WAKE bool "ether-wake (4.9 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. config BUSYBOX_FTPD @@ -289,10 +285,47 @@ config BUSYBOX_FEATURE_HTTPD_GZIP help Makes httpd send files using GZIP content encoding if the client supports it and a pre-compressed .gz exists. + +config BUSYBOX_FEATURE_HTTPD_ETAG + bool "Support caching via ETag header" + default y + depends on BUSYBOX_HTTPD + help + If server responds with ETag then next time client (browser) + resend it via If-None-Match header. + Then httpd will check if file wasn't modified and if not, + return 304 Not Modified status code. + The ETag value is constructed from last modification date + in unix epoch, and size: "hex(last_mod)-hex(file_size)". + It's not completely reliable as hash functions but fair enough. + +config BUSYBOX_FEATURE_HTTPD_LAST_MODIFIED + bool "Add Last-Modified header to response" + default y + depends on BUSYBOX_HTTPD + help + The Last-Modified header is used for cache validation. + The client sends last seen mtime to server in If-Modified-Since. + Both headers MUST be an RFC 1123 formatted, which is hard to parse. + Use ETag header instead. + +config BUSYBOX_FEATURE_HTTPD_DATE + bool "Add Date header to response" + default y + depends on BUSYBOX_HTTPD + help + RFC2616 says that server MUST add Date header to response. + But it is almost useless and can be omitted. + +config BUSYBOX_FEATURE_HTTPD_ACL_IP + bool "ACL IP" + default y + depends on BUSYBOX_HTTPD + help + Support IP deny/allow rules config BUSYBOX_IFCONFIG bool "ifconfig (12 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -339,14 +372,12 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS config BUSYBOX_IFENSLAVE bool "ifenslave (13 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). config BUSYBOX_IFPLUGD bool "ifplugd (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Network interface plug detection daemon. config BUSYBOX_IFUP @@ -498,7 +529,6 @@ config BUSYBOX_FEATURE_INETD_RPC config BUSYBOX_IP bool "ip (35 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The "ip" applet is a TCP/BUSYBOX_IP interface configuration and routing utility. @@ -510,7 +540,6 @@ config BUSYBOX_IPADDR bool "ipaddr (14 kb)" default y select BUSYBOX_FEATURE_IP_ADDRESS - select BUSYBOX_PLATFORM_LINUX help Short form of "ip addr" @@ -518,7 +547,6 @@ config BUSYBOX_IPLINK bool "iplink (17 kb)" default y select BUSYBOX_FEATURE_IP_LINK - select BUSYBOX_PLATFORM_LINUX help Short form of "ip link" @@ -526,7 +554,6 @@ config BUSYBOX_IPROUTE bool "iproute (15 kb)" default y select BUSYBOX_FEATURE_IP_ROUTE - select BUSYBOX_PLATFORM_LINUX help Short form of "ip route" @@ -534,7 +561,6 @@ config BUSYBOX_IPTUNNEL bool "iptunnel (9.6 kb)" default y select BUSYBOX_FEATURE_IP_TUNNEL - select BUSYBOX_PLATFORM_LINUX help Short form of "ip tunnel" @@ -542,7 +568,6 @@ config BUSYBOX_IPRULE bool "iprule (10 kb)" default y select BUSYBOX_FEATURE_IP_RULE - select BUSYBOX_PLATFORM_LINUX help Short form of "ip rule" @@ -550,7 +575,6 @@ config BUSYBOX_IPNEIGH bool "ipneigh (8.3 kb)" default y select BUSYBOX_FEATURE_IP_NEIGH - select BUSYBOX_PLATFORM_LINUX help Short form of "ip neigh" @@ -641,7 +665,6 @@ config BUSYBOX_FAKEIDENTD config BUSYBOX_NAMEIF bool "nameif (6.6 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help nameif is used to rename network interface by its MAC address. @@ -713,7 +736,6 @@ config BUSYBOX_NC_110_COMPAT config BUSYBOX_NETSTAT bool "netstat (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. @@ -750,7 +772,6 @@ config BUSYBOX_FEATURE_NSLOOKUP_LONG_OPTIONS config BUSYBOX_NTPD bool "ntpd (22 kb)" default y - select BUSYBOX_PLATFORM_LINUX help The NTP client/server daemon. @@ -777,7 +798,6 @@ config BUSYBOX_FEATURE_NTP_AUTH config BUSYBOX_PING bool "ping (10 kb)" default y - select BUSYBOX_PLATFORM_LINUX help ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway. @@ -805,13 +825,11 @@ config BUSYBOX_PSCAN config BUSYBOX_ROUTE bool "route (8.7 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Route displays or manipulates the kernel's IP routing tables. config BUSYBOX_SLATTACH bool "slattach (6.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help slattach configures serial line as SLIP network interface. config BUSYBOX_SSL_CLIENT @@ -1011,7 +1029,6 @@ config BUSYBOX_TLS config BUSYBOX_TRACEROUTE bool "traceroute (11 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Utility to trace the route of IP packets. @@ -1037,7 +1054,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP config BUSYBOX_TUNCTL bool "tunctl (6.2 kb)" default y - select BUSYBOX_PLATFORM_LINUX help tunctl creates or deletes tun devices. @@ -1051,7 +1067,6 @@ config BUSYBOX_FEATURE_TUNCTL_UG config BUSYBOX_VCONFIG bool "vconfig (2.3 kb)" default y - select BUSYBOX_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces config BUSYBOX_WGET @@ -1174,7 +1189,6 @@ config BUSYBOX_WHOIS config BUSYBOX_ZCIP bool "zcip (8.4 kb)" default y - select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help BUSYBOX_ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 9edb9a214..52f1ef5b2 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -7,7 +7,6 @@ config BUSYBOX_UDHCPD bool "udhcpd (21 kb)" default y - select BUSYBOX_PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -63,7 +62,6 @@ config BUSYBOX_DHCPRELAY config BUSYBOX_UDHCPC bool "udhcpc (24 kb)" default y - select BUSYBOX_PLATFORM_LINUX help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. -- cgit v1.2.3