Merge pull request #1319 from danielp96/master

Update busybox 1.32.0 to 1.33.2

Makefile

@@ -245,7 +245,7 @@ define do-copy =
 		if cmp --quiet "$1" "$2" ; then \
 			echo "$(DATE) UNCHANGED $(1:$(pwd)/%=%)" ; \
 		fi ; \
-		cp -a "$1" "$2" ; \
+		cp -a --remove-destination "$1" "$2" ; \
 	)
 	@sha256sum "$(2:$(pwd)/%=%)"
 endef
@@ -426,7 +426,7 @@ $(call map, define_module, $(modules-y))
 #
 define install =
 	@-mkdir -p "$(dir $2)"
-	$(call do,INSTALL,$2,cp -a "$1" "$2")
+	$(call do,INSTALL,$2,cp -a --remove-destination "$1" "$2")
 endef
 
 #
@@ -435,7 +435,7 @@ endef
 #
 define initrd_bin_add =
 $(initrd_bin_dir)/$(notdir $1): $1
-	$(call do,INSTALL-BIN,$$(<:$(pwd)/%=%),cp -a "$$<" "$$@")
+	$(call do,INSTALL-BIN,$$(<:$(pwd)/%=%),cp -a --remove-destination "$$<" "$$@")
 	@$(CROSS)strip --preserve-dates "$$@" 2>&-; true
 initrd_bins += $(initrd_bin_dir)/$(notdir $1)
 endef

config/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.32.0
-# Wed Dec 30 20:23:50 2020
+# Busybox version: 1.33.2
+# Fri Jan  7 12:33:00 2022
 #
 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 is not set
 # CONFIG_FEATURE_SYSLOG is not set
-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)
@@ -331,7 +331,8 @@ CONFIG_UNIQ=y
 # CONFIG_UNLINK is not set
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
-CONFIG_BASE64=y
+CONFIG_BASE32=y
+CONFIG_BASE64=n
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
@@ -619,7 +620,6 @@ CONFIG_FSFREEZE=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
 CONFIG_XXD=y
 CONFIG_HWCLOCK=y
@@ -711,6 +711,7 @@ CONFIG_VOLUMEID=y
 CONFIG_FEATURE_VOLUMEID_BCACHE=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -870,6 +871,10 @@ CONFIG_ARP=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 is not set

modules/busybox

@@ -2,11 +2,11 @@
 CONFIG_BUSYBOX ?= y
 modules-$(CONFIG_BUSYBOX) += busybox
 
-busybox_version := 1.32.0
+busybox_version := 1.33.2
 busybox_dir := busybox-$(busybox_version)
 busybox_tar := busybox-$(busybox_version).tar.bz2
 busybox_url := https://busybox.net/downloads/$(busybox_tar)
-busybox_hash := c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689
+busybox_hash := 6843ba7977081e735fa0fdb05893e3c002c8c5ad7c9c80da206e603cc0ac47e7
 
 busybox_configure := $(MAKE) CC="$(heads_cc)" oldconfig
 busybox_config := config/busybox.config

modules/tpmtotp

@@ -16,7 +16,6 @@ tpmtotp_target := \
 tpmtotp_output := \
 	totp \
 	hotp \
-	base32 \
 	qrenc \
 	util/tpm \
 

patches/busybox-1.33.2.patch

@@ -1,12 +1,12 @@
-diff -u --recursive clean/busybox-1.28.0/libbb/messages.c busybox-1.28.0/libbb/messages.c
---- clean/busybox-1.28.0/libbb/messages.c	2017-10-20 04:36:58.000000000 -0400
-+++ busybox-1.28.0/libbb/messages.c	2018-02-09 12:02:45.918726483 -0500
+diff -u --recursive clean/busybox-1.33.2/libbb/messages.c busybox-1.33.2/libbb/messages.c
+--- clean/busybox-1.33.2/libbb/messages.c	2017-10-20 04:36:58.000000000 -0400
++++ busybox-1.33.2/libbb/messages.c	2018-02-09 12:02:45.918726483 -0500
 @@ -13,7 +13,7 @@
- 
+
  /* allow version to be extended, via CFLAGS */
  #ifndef BB_EXTRA_VERSION
 -#define BB_EXTRA_VERSION " ("AUTOCONF_TIMESTAMP")"
 +#define BB_EXTRA_VERSION " (heads)"
  #endif
- 
+
  const char bb_banner[] ALIGN1 = "BusyBox v" BB_VER BB_EXTRA_VERSION;