busybox: update to 1.34.1

srcpkgs/busybox/files/dotconfig

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.32.1
+# Busybox version: 1.34.1
-# Sat Feb 13 17:25:59 2021
+# Sun Oct  3 22:14:53 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options ("make install" behavior)
@@ -207,11 +207,13 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
+CONFIG_CRC32=y
 CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -316,7 +318,6 @@ CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
 # CONFIG_TIMEOUT is not set
 CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
@@ -331,6 +332,7 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 # CONFIG_USLEEP is not set
 CONFIG_UUDECODE=y
+CONFIG_BASE32=y
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
@@ -419,6 +421,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 CONFIG_FEATURE_VI_REGEX_SEARCH=y
@@ -432,6 +435,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_VI_VERBOSE_STATUS=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -619,7 +623,6 @@ CONFIG_FSTRIM=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 # CONFIG_HD is not set
 CONFIG_XXD=y
 CONFIG_HWCLOCK=y
@@ -711,6 +714,7 @@ CONFIG_VOLUMEID=y
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -738,6 +742,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BC is not set
@@ -833,6 +838,7 @@ CONFIG_TS=y
 # CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -870,6 +876,10 @@ CONFIG_DNSDOMAINNAME=y
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 # CONFIG_FEATURE_HTTPD_GZIP is not set
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -967,6 +977,7 @@ CONFIG_TLS=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
@@ -988,6 +999,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
@@ -1119,8 +1131,8 @@ CONFIG_CTTYHACK=y
 # CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set

srcpkgs/busybox/files/dotconfig.d/httpd.patch

@@ -1,4 +1,4 @@
-@@ -838,18 +838,18 @@
+@@ -864,22 +864,22 @@
  # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
  CONFIG_HOSTNAME=y
  CONFIG_DNSDOMAINNAME=y
@@ -14,6 +14,10 @@
 -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 -# CONFIG_FEATURE_HTTPD_PROXY is not set
 -# CONFIG_FEATURE_HTTPD_GZIP is not set
+-# CONFIG_FEATURE_HTTPD_ETAG is not set
+-# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+-# CONFIG_FEATURE_HTTPD_DATE is not set
+-# CONFIG_FEATURE_HTTPD_ACL_IP is not set
 +CONFIG_HTTPD=y
 +CONFIG_FEATURE_HTTPD_RANGES=y
 +CONFIG_FEATURE_HTTPD_SETUID=y
@@ -26,6 +30,10 @@
 +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 +CONFIG_FEATURE_HTTPD_PROXY=y
 +CONFIG_FEATURE_HTTPD_GZIP=y
++CONFIG_FEATURE_HTTPD_ETAG=y
++CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
++CONFIG_FEATURE_HTTPD_DATE=y
++CONFIG_FEATURE_HTTPD_ACL_IP=y
  CONFIG_IFCONFIG=y
  CONFIG_FEATURE_IFCONFIG_STATUS=y
  CONFIG_FEATURE_IFCONFIG_SLIP=y

srcpkgs/busybox/files/dotconfig.d/huge.patch

@@ -44,9 +44,9 @@
  CONFIG_CHROOT=y
 -# CONFIG_CKSUM is not set
 +CONFIG_CKSUM=y
+ CONFIG_CRC32=y
  CONFIG_COMM=y
  CONFIG_CP=y
- CONFIG_FEATURE_CP_LONG_OPTIONS=y
 @@ -214,11 +214,11 @@
  CONFIG_CUT=y
  CONFIG_DATE=y

srcpkgs/busybox/files/dotconfig.d/udhcpc.patch

@@ -1,4 +1,4 @@
-@@ -979,20 +979,24 @@
+@@ -990,21 +990,25 @@
  CONFIG_DHCPD_LEASES_FILE=""
  # CONFIG_DUMPLEASES is not set
  # CONFIG_DHCPRELAY is not set
@@ -15,16 +15,17 @@
  # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
  # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
  # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
--# CONFIG_FEATURE_UDHCP_PORT is not set
+-CONFIG_UDHCPC_DEFAULT_INTERFACE=""
--CONFIG_UDHCP_DEBUG=0
--CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
--# CONFIG_FEATURE_UDHCP_RFC3397 is not set
--# CONFIG_FEATURE_UDHCP_8021Q is not set
 +
 +#
 +# Common options for DHCP applets
 +#
-+CONFIG_FEATURE_UDHCP_PORT=y
++CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
+ # CONFIG_FEATURE_UDHCP_PORT is not set
+-CONFIG_UDHCP_DEBUG=0
+-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+-# CONFIG_FEATURE_UDHCP_8021Q is not set
 +CONFIG_UDHCP_DEBUG=2
 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 +CONFIG_FEATURE_UDHCP_RFC3397=y

srcpkgs/busybox/patches/decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch

@@ -1,57 +0,0 @@
-From dbd3b883a891f076911d752f56f7a906d5650a17 Mon Sep 17 00:00:00 2001
-From: Samuel Sapalski <samuel.sapalski@nokia.com>
-Date: Wed, 3 Mar 2021 16:31:22 +0100
-Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt
-
-On certain corrupt gzip files, huft_build will set the error bit on
-the result pointer. If afterwards abort_unzip is called huft_free
-might run into a segmentation fault or an invalid pointer to
-free(p).
-
-In order to mitigate this, we check in huft_free if the error bit
-is set and clear it before the linked list is freed.
-
-Signed-off-by: Samuel Sapalski <samuel.sapalski@nokia.com>
-Signed-off-by: Peter Kaestle <peter.kaestle@nokia.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- archival/libarchive/decompress_gunzip.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git archival/libarchive/decompress_gunzip.c archival/libarchive/decompress_gunzip.c
-index 03049cc9b..e0520190a 100644
---- a/archival/libarchive/decompress_gunzip.c
-+++ b/archival/libarchive/decompress_gunzip.c
-@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
-  * each table.
-  * t: table to free
-  */
-+#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
-+#define ERR_RET     ((huft_t*)(uintptr_t)1)
- static void huft_free(huft_t *p)
- {
- 	huft_t *q;
- 
-+	/*
-+	 * If 'p' has the error bit set we have to clear it, otherwise we might run
-+	 * into a segmentation fault or an invalid pointer to free(p)
-+	 */
-+	if (BAD_HUFT(p)) {
-+		p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
-+	}
-+
- 	/* Go through linked list, freeing from the malloced (t[-1]) address. */
- 	while (p) {
- 		q = (--p)->v.t;
-@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
-  * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
-  * is given: "fixed inflate" decoder feeds us such data.
-  */
--#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
--#define ERR_RET     ((huft_t*)(uintptr_t)1)
- static huft_t* huft_build(const unsigned *b, const unsigned n,
- 			const unsigned s, const struct cp_ext *cp_ext,
- 			unsigned *m)
--- 
-2.31.1
-

srcpkgs/busybox/template

@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
-version=1.32.1
+version=1.34.1
-revision=3
+revision=1
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
-checksum=9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
+checksum=415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549
 
 _alternatives_core="
  ash:ash:/usr/bin/busybox