busybox: bump to 1.36.0.

3 files changed, 65 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index cf8e3fa..df5f638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ devel branch:
 	  case of embeddeding initramfs into kernel image.
 	- Version bumps since last release:
 		sysroot Alpine Linux 3.11.5 -> 3.17.2
-		busybox 1.31.1 -> 1.33.1
+		busybox 1.31.1 -> 1.36.0
 		lvm2 2.02.186 -> 2.02.188
 		dropbear 2019.78 -> 2022.83
 		libuuid (util-linux ) 2.35.1 -> 2.37
diff --git a/bootstrap/lebuilds/busybox.lebuild b/bootstrap/lebuilds/busybox.lebuild
index d179160..8fb3db8 100755
--- a/bootstrap/lebuilds/busybox.lebuild
+++ b/bootstrap/lebuilds/busybox.lebuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 name='busybox'
-version='1.33.1'
+version='1.36.0'
 sources=( "https://bitbucket.org/piotrkarbowski/better-initramfs/downloads/${name}-${version}.tar.bz2" )
 homepage='http://busybox.net/'
 license='GPLv2'
diff --git a/bootstrap/patches/busybox/busybox_config.patch b/bootstrap/patches/busybox/busybox_config.patch
index f65198e..9855383 100644
--- a/bootstrap/patches/busybox/busybox_config.patch
+++ b/bootstrap/patches/busybox/busybox_config.patch
@@ -1,10 +1,10 @@
---- /dev/null	2021-08-28 11:05:27.476666803 +0200
-+++ ./.config	2021-08-28 20:11:55.936435692 +0200
-@@ -0,0 +1,1203 @@
+--- /dev/null	2023-03-25 08:25:21.945352832 +0100
++++ ./.config	2023-03-25 13:01:36.032326450 +0100
+@@ -0,0 +1,1231 @@
 +#
 +# Automatically generated make config: don't edit
-+# Busybox version: 1.33.1
-+# Sat Aug 28 18:11:55 2021
++# Busybox version: 1.36.0
++# Sat Mar 25 13:01:36 2023
 +#
 +CONFIG_HAVE_DOT_CONFIG=y
 +
@@ -96,10 +96,16 @@
 +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 +CONFIG_PASSWORD_MINLEN=6
 +CONFIG_MD5_SMALL=1
++CONFIG_SHA1_SMALL=3
++CONFIG_SHA1_HWACCEL=y
++CONFIG_SHA256_HWACCEL=y
 +CONFIG_SHA3_SMALL=1
-+CONFIG_FEATURE_FAST_TOP=y
-+CONFIG_FEATURE_ETC_NETWORKS=y
-+# CONFIG_FEATURE_ETC_SERVICES is not set
++CONFIG_FEATURE_NON_POSIX_CP=y
++CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
++CONFIG_FEATURE_USE_SENDFILE=y
++CONFIG_FEATURE_COPYBUF_KB=4
++# CONFIG_MONOTONIC_SYSCALL is not set
++CONFIG_IOCTL_HEX2STR_ERROR=y
 +CONFIG_FEATURE_EDITING=y
 +CONFIG_FEATURE_EDITING_MAX_LEN=1024
 +CONFIG_FEATURE_EDITING_VI=y
@@ -123,14 +129,9 @@
 +# CONFIG_UNICODE_BIDI_SUPPORT is not set
 +# CONFIG_UNICODE_NEUTRAL_TABLE is not set
 +CONFIG_UNICODE_PRESERVE_BROKEN=y
-+CONFIG_FEATURE_NON_POSIX_CP=y
-+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-+CONFIG_FEATURE_USE_SENDFILE=y
-+CONFIG_FEATURE_COPYBUF_KB=4
-+CONFIG_FEATURE_SKIP_ROOTFS=y
-+# CONFIG_MONOTONIC_SYSCALL is not set
-+CONFIG_IOCTL_HEX2STR_ERROR=y
-+CONFIG_FEATURE_HWIB=y
++# CONFIG_LOOP_CONFIGURE is not set
++# CONFIG_NO_LOOP_CONFIGURE is not set
++CONFIG_TRY_LOOP_CONFIGURE=y
 +
 +#
 +# Applets
@@ -165,6 +166,8 @@
 +CONFIG_CPIO=y
 +CONFIG_FEATURE_CPIO_O=y
 +CONFIG_FEATURE_CPIO_P=y
++CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
++CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
 +# CONFIG_DPKG is not set
 +# CONFIG_DPKG_DEB is not set
 +CONFIG_GZIP=y
@@ -200,6 +203,22 @@
 +#
 +# Coreutils
 +#
++CONFIG_FEATURE_VERBOSE=y
++
++#
++# Common options for date and touch
++#
++CONFIG_FEATURE_TIMEZONE=y
++
++#
++# Common options for cp and mv
++#
++CONFIG_FEATURE_PRESERVE_HARDLINKS=y
++
++#
++# Common options for df, du, ls
++#
++CONFIG_FEATURE_HUMAN_READABLE=y
 +CONFIG_BASENAME=y
 +CONFIG_CAT=y
 +CONFIG_FEATURE_CATN=y
@@ -210,11 +229,13 @@
 +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 +CONFIG_CHROOT=y
 +CONFIG_CKSUM=y
++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=y
@@ -226,6 +247,7 @@
 +CONFIG_FEATURE_DD_STATUS=y
 +CONFIG_DF=y
 +CONFIG_FEATURE_DF_FANCY=y
++CONFIG_FEATURE_SKIP_ROOTFS=y
 +CONFIG_DIRNAME=y
 +CONFIG_DOS2UNIX=y
 +CONFIG_UNIX2DOS=y
@@ -319,13 +341,13 @@
 +CONFIG_FEATURE_TEST_64=y
 +CONFIG_TIMEOUT=y
 +CONFIG_TOUCH=y
-+CONFIG_FEATURE_TOUCH_NODEREF=y
 +CONFIG_FEATURE_TOUCH_SUSV3=y
 +CONFIG_TR=y
 +CONFIG_FEATURE_TR_CLASSES=y
 +CONFIG_FEATURE_TR_EQUIV=y
 +CONFIG_TRUE=y
 +CONFIG_TRUNCATE=y
++CONFIG_TSORT=y
 +CONFIG_TTY=y
 +CONFIG_UNAME=y
 +CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -346,21 +368,6 @@
 +CONFIG_YES=y
 +
 +#
-+# Common options
-+#
-+CONFIG_FEATURE_VERBOSE=y
-+
-+#
-+# Common options for cp and mv
-+#
-+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-+
-+#
-+# Common options for df, du, ls
-+#
-+CONFIG_FEATURE_HUMAN_READABLE=y
-+
-+#
 +# Console Utilities
 +#
 +CONFIG_CHVT=y
@@ -427,6 +434,7 @@
 +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 is not set
@@ -440,6 +448,7 @@
 +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
 +
 +#
@@ -448,7 +457,11 @@
 +CONFIG_FIND=y
 +CONFIG_FEATURE_FIND_PRINT0=y
 +CONFIG_FEATURE_FIND_MTIME=y
++CONFIG_FEATURE_FIND_ATIME=y
++CONFIG_FEATURE_FIND_CTIME=y
 +CONFIG_FEATURE_FIND_MMIN=y
++CONFIG_FEATURE_FIND_AMIN=y
++CONFIG_FEATURE_FIND_CMIN=y
 +CONFIG_FEATURE_FIND_PERM=y
 +CONFIG_FEATURE_FIND_TYPE=y
 +CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -456,6 +469,7 @@
 +CONFIG_FEATURE_FIND_MAXDEPTH=y
 +CONFIG_FEATURE_FIND_NEWER=y
 +CONFIG_FEATURE_FIND_INUM=y
++CONFIG_FEATURE_FIND_SAMEFILE=y
 +CONFIG_FEATURE_FIND_EXEC=y
 +CONFIG_FEATURE_FIND_EXEC_PLUS=y
 +CONFIG_FEATURE_FIND_USER=y
@@ -746,6 +760,7 @@
 +# Miscellaneous Utilities
 +#
 +CONFIG_ADJTIMEX=y
++CONFIG_ASCII=y
 +CONFIG_BBCONFIG=y
 +CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 +CONFIG_BC=y
@@ -826,10 +841,12 @@
 +# CONFIG_RFKILL is not set
 +CONFIG_RUNLEVEL=y
 +CONFIG_RX=y
++CONFIG_SEEDRNG=y
 +CONFIG_SETFATTR=y
 +CONFIG_SETSERIAL=y
 +CONFIG_STRINGS=y
 +CONFIG_TIME=y
++CONFIG_TREE=y
 +CONFIG_TS=y
 +CONFIG_TTYSIZE=y
 +CONFIG_UBIATTACH=y
@@ -841,6 +858,7 @@
 +CONFIG_UBIRENAME=y
 +CONFIG_VOLNAME=y
 +CONFIG_WATCHDOG=y
++# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 +
 +#
 +# Networking Utilities
@@ -849,6 +867,9 @@
 +CONFIG_FEATURE_UNIX_LOCAL=y
 +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 +CONFIG_VERBOSE_RESOLUTION_ERRORS=y
++CONFIG_FEATURE_ETC_NETWORKS=y
++# CONFIG_FEATURE_ETC_SERVICES is not set
++CONFIG_FEATURE_HWIB=y
 +# CONFIG_FEATURE_TLS_SHA1 is not set
 +CONFIG_ARP=y
 +CONFIG_ARPING=y
@@ -867,6 +888,7 @@
 +CONFIG_HOSTNAME=y
 +CONFIG_DNSDOMAINNAME=y
 +CONFIG_HTTPD=y
++CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 +CONFIG_FEATURE_HTTPD_RANGES=y
 +CONFIG_FEATURE_HTTPD_SETUID=y
 +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -959,6 +981,7 @@
 +CONFIG_FEATURE_TELNET_WIDTH=y
 +CONFIG_TELNETD=y
 +CONFIG_FEATURE_TELNETD_STANDALONE=y
++CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 +CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 +CONFIG_TFTP=y
 +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
@@ -979,6 +1002,7 @@
 +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
@@ -995,6 +1019,7 @@
 +CONFIG_FEATURE_UDHCPC_ARPING=y
 +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
++CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 +# CONFIG_UDHCPC6 is not set
 +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1004,6 +1029,7 @@
 +#
 +# Common options for DHCP applets
 +#
++CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 +CONFIG_FEATURE_UDHCP_PORT=y
 +CONFIG_UDHCP_DEBUG=9
 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1021,17 +1047,19 @@
 +#
 +# Mail Utilities
 +#
++CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 +# CONFIG_MAKEMIME is not set
 +CONFIG_POPMAILDIR=y
 +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
 +# CONFIG_REFORMIME is not set
 +# CONFIG_FEATURE_REFORMIME_COMPAT is not set
 +CONFIG_SENDMAIL=y
-+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 +
 +#
 +# Process Utilities
 +#
++CONFIG_FEATURE_FAST_TOP=y
++CONFIG_FEATURE_SHOW_THREADS=y
 +CONFIG_FREE=y
 +CONFIG_FUSER=y
 +CONFIG_IOSTAT=y
@@ -1070,7 +1098,6 @@
 +CONFIG_UPTIME=y
 +CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
 +CONFIG_WATCH=y
-+CONFIG_FEATURE_SHOW_THREADS=y
 +
 +#
 +# Runit Utilities
@@ -1127,6 +1154,7 @@
 +CONFIG_ASH_ECHO=y
 +CONFIG_ASH_PRINTF=y
 +CONFIG_ASH_TEST=y
++CONFIG_ASH_SLEEP=y
 +CONFIG_ASH_HELP=y
 +CONFIG_ASH_GETOPTS=y
 +CONFIG_ASH_CMDCMD=y
@@ -1135,8 +1163,8 @@
 +# 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