busybox: update to 1.33

Remove stime backport.

Remove static libgcc patch as upstream fixed it with
BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off.

Remove date -k patch as it no longer applies. It's also pointless as
busybox' hwclock utility can do the same thing.

Remove ntpd patch as that seems to have been applied upstream.

Add smalll patch fixing compilation with SELinux. Upstream commit
2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without
renaming it in the SELinux path.

Refresh config and patches.

Config refresh:

Refresh commands, run after busybox is first built once:

  cd package/utils/busybox/config/
  ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0
  cd ..
  ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in

Manual edits needed afterward:

* Config-defaults.in:  OpenWrt config symbol IPV6 logic applied to
  BUSYBOX_DEFAULT_FEATURE_IPV6
* Config-defaults.in:  OpenWrt configTARGET_bcm53xx logic applied to
  BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec)
* editors/Config.in: Add USE_GLIBC dependency to
  BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090)
* shell/Config.in : change at "Options common to all shells"  the symbol
  SHELL_ASH  -->  BUSYBOX_CONFIG_SHELL_ASH
   (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html
     Apparently our script does not see the hidden option while
     prepending config options with "BUSYBOX_CONFIG_" which leads to a
     missed dependency when the options are later evaluated.)
* Edit Config.in files by adding quotes to sourced items in
  config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f)

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[Added comments from Hannu Nyman to commit message]
Signed-off-by: Rosen Penev <rosenp@gmail.com>

1 files changed, 44 insertions, 24 deletions

diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index f07a2d46e5..6608f5899d 100644
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -61,19 +61,16 @@ config BUSYBOX_CONFIG_FEATURE_TLS_SHA1
 config BUSYBOX_CONFIG_ARP
 	bool "arp (10 kb)"
 	default BUSYBOX_DEFAULT_ARP
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Manipulate the system ARP cache.
 config BUSYBOX_CONFIG_ARPING
 	bool "arping (9 kb)"
 	default BUSYBOX_DEFAULT_ARPING
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Ping hosts by ARP packets.
 config BUSYBOX_CONFIG_BRCTL
 	bool "brctl (4.7 kb)"
 	default BUSYBOX_DEFAULT_BRCTL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Manage ethernet bridges.
 	Supports addbr/delbr and addif/delif.
@@ -104,7 +101,6 @@ config BUSYBOX_CONFIG_DNSD
 config BUSYBOX_CONFIG_ETHER_WAKE
 	bool "ether-wake (4.9 kb)"
 	default BUSYBOX_DEFAULT_ETHER_WAKE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Send a magic packet to wake up sleeping machines.
 config BUSYBOX_CONFIG_FTPD
@@ -289,10 +285,47 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP
 	help
 	Makes httpd send files using GZIP content encoding if the
 	client supports it and a pre-compressed <file>.gz exists.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_ETAG
+	bool "Support caching via ETag header"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_ETAG
+	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_HTTPD_LAST_MODIFIED
+	bool "Add Last-Modified header to response"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_LAST_MODIFIED
+	depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_HTTPD_DATE
+	bool "Add Date header to response"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_DATE
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	RFC2616 says that server MUST add Date header to response.
+	But it is almost useless and can be omitted.
+
+config BUSYBOX_CONFIG_FEATURE_HTTPD_ACL_IP
+	bool "ACL IP"
+	default BUSYBOX_DEFAULT_FEATURE_HTTPD_ACL_IP
+	depends on BUSYBOX_CONFIG_HTTPD
+	help
+	Support IP deny/allow rules
 config BUSYBOX_CONFIG_IFCONFIG
 	bool "ifconfig (12 kb)"
 	default BUSYBOX_DEFAULT_IFCONFIG
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Ifconfig is used to configure the kernel-resident network interfaces.
 
@@ -339,14 +372,12 @@ config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
 config BUSYBOX_CONFIG_IFENSLAVE
 	bool "ifenslave (13 kb)"
 	default BUSYBOX_DEFAULT_IFENSLAVE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Userspace application to bind several interfaces
 	to a logical interface (use with kernel bonding driver).
 config BUSYBOX_CONFIG_IFPLUGD
 	bool "ifplugd (10 kb)"
 	default BUSYBOX_DEFAULT_IFPLUGD
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Network interface plug detection daemon.
 config BUSYBOX_CONFIG_IFUP
@@ -498,7 +529,6 @@ config BUSYBOX_CONFIG_FEATURE_INETD_RPC
 config BUSYBOX_CONFIG_IP
 	bool "ip (35 kb)"
 	default BUSYBOX_DEFAULT_IP
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	The "ip" applet is a TCP/IP interface configuration and routing
 	utility.
@@ -510,7 +540,6 @@ config BUSYBOX_CONFIG_IPADDR
 	bool "ipaddr (14 kb)"
 	default BUSYBOX_DEFAULT_IPADDR
 	select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip addr"
 
@@ -518,7 +547,6 @@ config BUSYBOX_CONFIG_IPLINK
 	bool "iplink (17 kb)"
 	default BUSYBOX_DEFAULT_IPLINK
 	select BUSYBOX_CONFIG_FEATURE_IP_LINK
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip link"
 
@@ -526,7 +554,6 @@ config BUSYBOX_CONFIG_IPROUTE
 	bool "iproute (15 kb)"
 	default BUSYBOX_DEFAULT_IPROUTE
 	select BUSYBOX_CONFIG_FEATURE_IP_ROUTE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip route"
 
@@ -534,7 +561,6 @@ config BUSYBOX_CONFIG_IPTUNNEL
 	bool "iptunnel (9.6 kb)"
 	default BUSYBOX_DEFAULT_IPTUNNEL
 	select BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip tunnel"
 
@@ -542,7 +568,6 @@ config BUSYBOX_CONFIG_IPRULE
 	bool "iprule (10 kb)"
 	default BUSYBOX_DEFAULT_IPRULE
 	select BUSYBOX_CONFIG_FEATURE_IP_RULE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip rule"
 
@@ -550,7 +575,6 @@ config BUSYBOX_CONFIG_IPNEIGH
 	bool "ipneigh (8.3 kb)"
 	default BUSYBOX_DEFAULT_IPNEIGH
 	select BUSYBOX_CONFIG_FEATURE_IP_NEIGH
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Short form of "ip neigh"
 
@@ -641,7 +665,6 @@ config BUSYBOX_CONFIG_FAKEIDENTD
 config BUSYBOX_CONFIG_NAMEIF
 	bool "nameif (6.6 kb)"
 	default BUSYBOX_DEFAULT_NAMEIF
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	nameif is used to rename network interface by its MAC address.
@@ -718,7 +741,6 @@ config BUSYBOX_CONFIG_NETMSG
 config BUSYBOX_CONFIG_NETSTAT
 	bool "netstat (10 kb)"
 	default BUSYBOX_DEFAULT_NETSTAT
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	netstat prints information about the Linux networking subsystem.
 
@@ -768,7 +790,6 @@ config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
 config BUSYBOX_CONFIG_NTPD
 	bool "ntpd (22 kb)"
 	default BUSYBOX_DEFAULT_NTPD
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	The NTP client/server daemon.
 
@@ -795,7 +816,6 @@ config BUSYBOX_CONFIG_FEATURE_NTP_AUTH
 config BUSYBOX_CONFIG_PING
 	bool "ping (10 kb)"
 	default BUSYBOX_DEFAULT_PING
-	select 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.
@@ -823,13 +843,11 @@ config BUSYBOX_CONFIG_PSCAN
 config BUSYBOX_CONFIG_ROUTE
 	bool "route (8.7 kb)"
 	default BUSYBOX_DEFAULT_ROUTE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Route displays or manipulates the kernel's IP routing tables.
 config BUSYBOX_CONFIG_SLATTACH
 	bool "slattach (6.2 kb)"
 	default BUSYBOX_DEFAULT_SLATTACH
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	slattach configures serial line as SLIP network interface.
 config BUSYBOX_CONFIG_SSL_CLIENT
@@ -1029,7 +1047,6 @@ config BUSYBOX_CONFIG_TLS
 config BUSYBOX_CONFIG_TRACEROUTE
 	bool "traceroute (11 kb)"
 	default BUSYBOX_DEFAULT_TRACEROUTE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to trace the route of IP packets.
 
@@ -1055,7 +1072,6 @@ config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 config BUSYBOX_CONFIG_TUNCTL
 	bool "tunctl (6.2 kb)"
 	default BUSYBOX_DEFAULT_TUNCTL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	tunctl creates or deletes tun devices.
 
@@ -1069,7 +1085,6 @@ config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
 config BUSYBOX_CONFIG_VCONFIG
 	bool "vconfig (2.3 kb)"
 	default BUSYBOX_DEFAULT_VCONFIG
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Creates, removes, and configures VLAN interfaces
 config BUSYBOX_CONFIG_WGET
@@ -1154,6 +1169,9 @@ config BUSYBOX_CONFIG_FEATURE_WGET_HTTPS
 	patches, but do want to waste bandwidth expaining how wrong
 	it is, you will be ignored.
 
+	FEATURE_WGET_OPENSSL does implement TLS verification
+	using the certificates available to OpenSSL.
+
 config BUSYBOX_CONFIG_FEATURE_WGET_OPENSSL
 	bool "Try to connect to HTTPS using openssl"
 	default BUSYBOX_DEFAULT_FEATURE_WGET_OPENSSL
@@ -1178,6 +1196,9 @@ config BUSYBOX_CONFIG_FEATURE_WGET_OPENSSL
 	If openssl can't be executed, internal TLS code will be used
 	(if you enabled it); if openssl can be executed but fails later,
 	wget can't detect this, and download will fail.
+
+	By default TLS verification is performed, unless
+	--no-check-certificate option is passed.
 config BUSYBOX_CONFIG_WHOIS
 	bool "whois (6.3 kb)"
 	default BUSYBOX_DEFAULT_WHOIS
@@ -1186,7 +1207,6 @@ config BUSYBOX_CONFIG_WHOIS
 config BUSYBOX_CONFIG_ZCIP
 	bool "zcip (8.4 kb)"
 	default BUSYBOX_DEFAULT_ZCIP
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.