# HG changeset patch # User David Demelier # Date 1635491170 -7200 # Node ID 9be1651dcfafd33dd95a354508ecf72632f5c009 # Parent 325631424c650758d1b2fc71b04ab59e634d9a53 core/busybox: upgrade to 1.34.1 diff -r 325631424c65 -r 9be1651dcfaf core/busybox/busybox.sh --- a/core/busybox/busybox.sh Wed Oct 27 11:32:16 2021 +0200 +++ b/core/busybox/busybox.sh Fri Oct 29 09:06:10 2021 +0200 @@ -16,9 +16,9 @@ # PKGNAME=busybox -PKGVERSION=1.30.1 +PKGVERSION=1.34.1 PKGREVISION=1 -PKGLICENSE="GPLv2" +PKGLICENSE="GPL-2.0-only" PKGSUMMARY="swiss army knife for embedded" PKGWWW="https://busybox.net" PKGDOWNLOAD="https://busybox.net/downloads/$PKGNAME-$PKGVERSION.tar.bz2" @@ -44,7 +44,7 @@ build() { rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.bz2 + tar -xvf $PKGNAME-$PKGVERSION.tar.bz2 cd $PKGNAME-$PKGVERSION # @@ -92,30 +92,13 @@ # sed -i -e 's|/etc/init.d/rcS|/etc/rc.init|' init/init.c - # - # Change the redirection limit which is too small for vpk download. - # Upstream: yes in Git. - # - sed -i -e "/redir_limit = 5/ s/5/16/" networking/wget.c - - # - # TODO: this is temporary, to build under clang. - # - # CFLAGS="": fix build under clang by removing all non-standard - # options. - # - # -O0: disable optimizations for the same reasons. - # - # See http://lists.busybox.net/pipermail/busybox/2019-October/087558.html - # make \ AR="$AR" \ AS="$AS" \ CC="$CC" \ - CFLAGS="-DBB_GLOBAL_CONST=''" \ HOSTCC="$CC" \ HOSTCFLAGS="" \ - EXTRA_CFLAGS="$CFLAGS -O0" \ + EXTRA_CFLAGS="$CFLAGS" \ EXTRA_LDFLAGS="$LDFLAGS" \ NM="$NM" \ OBJCOPY="$OBJCOPY" \ diff -r 325631424c65 -r 9be1651dcfaf core/busybox/busybox.sha1 --- a/core/busybox/busybox.sha1 Wed Oct 27 11:32:16 2021 +0200 +++ b/core/busybox/busybox.sha1 Fri Oct 29 09:06:10 2021 +0200 @@ -1,1 +1,1 @@ -5d9a78fa2789cd22cdac78058296e195e67faf59 busybox-1.30.1.tar.bz2 +e3b90f07467bddc63d24d1c6387c4ef17f20fccb busybox-1.34.1.tar.bz2 diff -r 325631424c65 -r 9be1651dcfaf core/busybox/config --- a/core/busybox/config Wed Oct 27 11:32:16 2021 +0200 +++ b/core/busybox/config Fri Oct 29 09:06:10 2021 +0200 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.1 -# Mon Jul 8 11:45:49 2019 +# Busybox version: 1.34.1 +# Fri Oct 29 08:25:52 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,13 +34,13 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y -CONFIG_PLATFORM_LINUX=y # # Build Options # -# CONFIG_STATIC is not set +CONFIG_STATIC=y # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set @@ -54,6 +54,7 @@ CONFIG_EXTRA_LDLIBS="" CONFIG_USE_PORTABLE_CODE=y CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STATIC_LIBGCC is not set # # Installation Options ("make install" behavior) @@ -75,6 +76,7 @@ # 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 @@ -205,11 +207,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 is not set @@ -236,7 +240,6 @@ CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -303,6 +306,7 @@ CONFIG_SUM=y CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +CONFIG_FSYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -314,7 +318,6 @@ 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 @@ -323,12 +326,13 @@ CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y -CONFIG_UNAME_OSNAME="Vanilla Linux" +CONFIG_UNAME_OSNAME="vanilla" CONFIG_BB_ARCH=y CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE32=y CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y @@ -421,6 +425,7 @@ CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set 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 @@ -434,6 +439,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 # @@ -461,6 +467,7 @@ 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_CONTEXT is not set @@ -491,7 +498,7 @@ # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y -CONFIG_LINUXRC=n +# CONFIG_LINUXRC is not set CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -604,11 +611,11 @@ CONFIG_FDISK=y # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set +CONFIG_FEATURE_AIX_LABEL=y +CONFIG_FEATURE_SGI_LABEL=y +CONFIG_FEATURE_SUN_LABEL=y +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y @@ -620,7 +627,6 @@ 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 @@ -639,6 +645,7 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_FEATURE_MDEV_DAEMON=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y @@ -690,6 +697,7 @@ CONFIG_SWITCH_ROOT=y CONFIG_TASKSET=y CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_FEATURE_TASKSET_CPULIST=y CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -710,6 +718,7 @@ 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 @@ -737,6 +746,7 @@ # Miscellaneous Utilities # CONFIG_ADJTIMEX=y +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set CONFIG_BC=y @@ -786,6 +796,7 @@ CONFIG_I2CSET=y CONFIG_I2CDUMP=y CONFIG_I2CDETECT=y +CONFIG_I2CTRANSFER=y # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -806,6 +817,7 @@ CONFIG_FEATURE_MAKEDEVS_TABLE=y CONFIG_MAN=y CONFIG_MICROCOM=y +CONFIG_MIM=y CONFIG_MT=y CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y @@ -819,6 +831,7 @@ CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TS=y CONFIG_TTYSIZE=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y @@ -829,6 +842,7 @@ CONFIG_UBIRENAME=y CONFIG_VOLNAME=y CONFIG_WATCHDOG=y +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -866,6 +880,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 @@ -946,6 +964,7 @@ CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_FEATURE_TFTP_HPA_COMPAT=y CONFIG_TFTPD=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y @@ -962,6 +981,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 @@ -987,6 +1007,7 @@ # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -1094,6 +1115,7 @@ # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1114,10 +1136,11 @@ CONFIG_ASH_CMDCMD=y CONFIG_CTTYHACK=y CONFIG_HUSH=y +CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set CONFIG_HUSH_LINENO_VAR=y -# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y @@ -1155,6 +1178,7 @@ # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set @@ -1179,6 +1203,7 @@ CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_SYSLOGD_CFG=y +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16