From c6e6bd17846aa1dc60985f2f4f71246a9c4c2b6b Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 8 Jan 2023 20:23:41 +0900 Subject: [PATCH] busybox: Bump to 1.36.0 --- packages/busybox/0007-miscutils-crontab.patch | 4 ++-- packages/busybox/build.sh | 5 ++--- packages/busybox/busybox.config | 15 +++++++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/packages/busybox/0007-miscutils-crontab.patch b/packages/busybox/0007-miscutils-crontab.patch index 02ad7e1493..0714e4bc46 100644 --- a/packages/busybox/0007-miscutils-crontab.patch +++ b/packages/busybox/0007-miscutils-crontab.patch @@ -10,8 +10,8 @@ diff -uNr busybox-1.33.1/miscutils/crontab.c busybox-1.33.1.mod/miscutils/cronta /* initgroups, setgid, setuid */ change_identity(pas); setup_environment(pas->pw_shell, - SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP, - pas); + SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP | SETUP_ENV_CHDIR, + pas); +#endif ptr = getenv("VISUAL"); if (!ptr) { diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 31c021269a..c1ba5e8ad1 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://busybox.net/ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.35.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=1.36.0 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 +TERMUX_PKG_SHA256=542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_SERVICE_SCRIPT=( diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config index 5311e3b06f..de8dddd859 100644 --- a/packages/busybox/busybox.config +++ b/packages/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.35.0 -# Tue Mar 1 20:15:34 2022 +# Busybox version: 1.36.0 +# Sun Jan 8 20:45:22 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=1 +# CONFIG_SHA1_HWACCEL is not set +# CONFIG_SHA256_HWACCEL is not set CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y @@ -123,6 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ 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="Android" @@ -827,10 +834,12 @@ CONFIG_LSSCSI=y CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set CONFIG_RX=y +# CONFIG_SEEDRNG is not set # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y # CONFIG_TS is not set CONFIG_TTYSIZE=y # CONFIG_UBIATTACH is not set @@ -1003,6 +1012,7 @@ CONFIG_DHCPD_LEASES_FILE="" # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set CONFIG_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 @@ -1133,6 +1143,7 @@ CONFIG_ASH_MAIL=y 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