Up to 1.34.1 but fails to link

diff --git a/busybox-fix_64_archs.patch b/busybox-fix_64_archs.patch
index c7c8a07eed0766fdb1a281b3a9c26020bd3232ff..d9b5e211b2748e544744d0e0c24f45b0ddcd66e6 100644 (file)
--- a/busybox-fix_64_archs.patch
+++ b/busybox-fix_64_archs.patch
@@ -1,10 +1,9 @@
-diff -ur busybox-1.00-rc3/editors/awk.c busybox-1.00-rc3-/editors/awk.c
---- busybox-1.00-rc3/editors/awk.c     2004-07-31 01:52:08.000000000 +0200
-+++ busybox-1.00-rc3-/editors/awk.c    2005-01-16 18:53:12.217614216 +0100
-@@ -1890,7 +1891,7 @@
-       int i, l, ll, n;
- 
-       tv = nvalloc(4);
+--- busybox-1.34.1/editors/awk.c~      2021-09-30 00:15:44.000000000 +0200
++++ busybox-1.34.1/editors/awk.c       2021-10-21 11:14:38.813147922 +0200
+@@ -2606,7 +2606,7 @@ static NOINLINE var *exec_builtin(node *
+ #define TMPVAR2 (tmpvars + 2)
+ #define TMPVAR3 (tmpvars + 3)
+ #define TMPVAR(i) (tmpvars + (i))
 -      isr = info = op->info;
 +      isr = info = (unsigned int) op->info;
        op = op->l.n;

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 365d3c9a122dadfe17f228b3f4cb15256ed44065..05e391afb80e9dff0299611d52213888dad72d0d 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -69,6 +69,7 @@ CONFIG_EXTRA_LDFLAGS=""
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -76,6 +77,7 @@ CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_PLATFORM_LINUX=y
 CONFIG_STACK_OPTIMIZATION_386=y
+CONFIG_STATIC_LIBGCC=y
 
 #
 # Installation Options
@@ -185,6 +187,7 @@ CONFIG_CHOWN=y
 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
@@ -299,6 +302,7 @@ CONFIG_TRUE=y
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
+# CONFIG_BASE32 is not set
 # CONFIG_WC is not set
 # CONFIG_FEATURE_WC_LARGE is not set
 # CONFIG_WHO is not set
@@ -391,6 +395,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
@@ -398,6 +403,7 @@ CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 # CONFIG_FEATURE_VI_UNDO is not set
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 # CONFIG_FEATURE_VI_READONLY is not set
 # CONFIG_FEATURE_VI_SETOPTS is not set
 # CONFIG_FEATURE_VI_SET is not set
@@ -604,6 +610,7 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 # CONFIG_FEATURE_VOLUMEID_LUKS is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
@@ -658,6 +665,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_BC is not set
 # CONFIG_BEEP is not set
@@ -880,12 +888,14 @@ CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_FEATURE_UDHCP_8021Q=y
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_HTTPS=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
@@ -975,6 +985,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set

diff --git a/busybox.config b/busybox.config
index da42d3f9cef50629ee8646c6f985bdc70c4a0e69..290c057380bc582e73267f7d39625299737201de 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -75,12 +75,14 @@ CONFIG_EXTRA_LDFLAGS=""
 # CONFIG_UNIT_TEST is not set
 # CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_STACK_OPTIMIZATION_386=y
+# CONFIG_STACK_OPTIMIZATION_386 is not set
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options
@@ -208,12 +210,14 @@ CONFIG_CHOWN=y
 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_FEATURE_DATE_COMPAT=y
 CONFIG_CUT=y
+CONFIG_FEATURE_CUT_REGEX=y
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_FEATURE_DATE_NANO=y
@@ -333,6 +337,7 @@ CONFIG_UNIQ=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
 CONFIG_UUENCODE=y
+CONFIG_BASE32=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
 CONFIG_W=y
@@ -434,6 +439,7 @@ CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
 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
@@ -447,6 +453,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
 
 #
@@ -474,6 +481,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 CONFIG_FEATURE_FIND_LINKS=y
@@ -692,6 +700,7 @@ CONFIG_FEATURE_VOLUMEID_UDF=y
 CONFIG_FEATURE_VOLUMEID_LUKS=y
 CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_ROMFS=y
 CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_FEATURE_VOLUMEID_SYSV=y
@@ -747,6 +756,7 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
 # Miscellaneous Utilities
 #
 CONFIG_ADJTIMEX=y
+CONFIG_ASCII=y
 # CONFIG_BBCONFIG is not set
 CONFIG_BC=y
 CONFIG_FEATURE_BC_INTERACTIVE=y
@@ -823,6 +833,7 @@ CONFIG_MAKEDEVS=y
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
 CONFIG_MAN=y
 CONFIG_MICROCOM=y
+CONFIG_MIM=y
 CONFIG_MOUNTPOINT=y
 CONFIG_NOLOGIN=y
 CONFIG_NOLOGIN_DEPENDENCIES=y
@@ -837,6 +848,7 @@ CONFIG_SETSID=y
 CONFIG_STRINGS=y
 CONFIG_TASKSET=y
 CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_FEATURE_TASKSET_CPULIST=y
 CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TS=y
@@ -850,6 +862,7 @@ CONFIG_TTYSIZE=y
 # CONFIG_UBIRENAME is not set
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -890,6 +903,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 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
@@ -995,12 +1012,14 @@ CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_FEATURE_UDHCP_PORT=y
 CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
@@ -1146,6 +1165,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_SHELL_HUSH is not set
 CONFIG_HUSH=y
 CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_BRACE_EXPANSION=y
@@ -1209,6 +1229,7 @@ CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=y
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y

diff --git a/busybox.spec b/busybox.spec
index 30bae8ce725a855f9f7d723903f983751282ff2e..d114b836010744bfab74e3047d86245aae0d095a 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,12 +41,12 @@ Summary(pl.UTF-8):  Zestaw narzędzi uniksowych dla systemów wbudowanych
 Summary(pt_BR.UTF-8):  BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:          busybox
 # stable line only
-Version:       1.31.1
-Release:       2
+Version:       1.34.1
+Release:       0.1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 70913edaf2263a157393af07565c17f0
+# Source0-md5: 5ad7368a73d12b8c4f8881bf7afb3d82
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}