From 1e505759d7442a0d2627c9b562a4faeab370f788 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 00:40:02 +0100 Subject: [PATCH] busybox: update to busybox-1.31.0 --- packages/sysutils/busybox/config/busybox-host.conf | 12 +++++++++--- packages/sysutils/busybox/config/busybox-init.conf | 12 +++++++++--- packages/sysutils/busybox/config/busybox-target.conf | 12 +++++++++--- packages/sysutils/busybox/package.mk | 4 ++-- .../busybox-06-prevent-root-weak-passwd.patch | 8 +++++--- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-host.conf b/packages/sysutils/busybox/config/busybox-host.conf index fe917ebea2..2af35c8e6a 100644 --- a/packages/sysutils/busybox/config/busybox-host.conf +++ b/packages/sysutils/busybox/config/busybox-host.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:54:27 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:50:03 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG is not set CONFIG_PLATFORM_LINUX=y @@ -236,7 +237,6 @@ CONFIG_GZIP_FAST=0 # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set # CONFIG_HEAD is not set # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -299,6 +299,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_SUM is not set # CONFIG_SYNC is not set # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set # CONFIG_TAIL is not set # CONFIG_FEATURE_FANCY_TAIL is not set @@ -623,6 +624,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -762,6 +764,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 @@ -795,6 +798,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -922,6 +926,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1127,6 +1132,7 @@ CONFIG_BASH_IS_NONE=y # # CONFIG_FEATURE_SH_MATH is not set # CONFIG_FEATURE_SH_MATH_64 is not set +# CONFIG_FEATURE_SH_MATH_BASE is not set # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index be043295f5..2c39056f81 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:55:59 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:51:44 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG is not set CONFIG_PLATFORM_LINUX=y @@ -236,7 +237,6 @@ CONFIG_FEATURE_FANCY_ECHO=y # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -303,6 +303,7 @@ CONFIG_STAT=y # CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -635,6 +636,7 @@ CONFIG_LOSETUP=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -782,6 +784,7 @@ CONFIG_FLASH_ERASEALL=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -815,6 +818,7 @@ CONFIG_NANDWRITE=y # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -942,6 +946,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1147,6 +1152,7 @@ CONFIG_CTTYHACK=y # 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=y # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 354d2593e9..6be2607bc6 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:56:54 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:53:01 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID=y 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 @@ -236,7 +237,6 @@ CONFIG_ENV=y # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set @@ -303,6 +303,7 @@ CONFIG_STAT=y # CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -635,6 +636,7 @@ CONFIG_IONICE=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -782,6 +784,7 @@ CONFIG_FLASH_ERASEALL=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -815,6 +818,7 @@ CONFIG_NANDWRITE=y CONFIG_SETSERIAL=y # CONFIG_STRINGS is not set CONFIG_TIME=y +# CONFIG_TS is not set CONFIG_TTYSIZE=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -942,6 +946,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1147,6 +1152,7 @@ CONFIG_ASH_CMDCMD=y # 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 diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 68a7ae24b3..8a1e79f42e 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="busybox" -PKG_VERSION="1.30.1" -PKG_SHA256="3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc" +PKG_VERSION="1.31.0" +PKG_SHA256="0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch b/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch index 932848bfbb..a8e5c706cf 100644 --- a/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch +++ b/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch @@ -1,9 +1,11 @@ +diff --git a/loginutils/passwd.c b/loginutils/passwd.c +index 6c643d3..df8859d 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c -@@ -72,7 +72,6 @@ static char* new_password(const struct p - newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */ +@@ -69,7 +69,6 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo + goto err_ret; if (ENABLE_FEATURE_PASSWD_WEAK_CHECK - && obscure(orig, newp, pw) + && obscure(orig, newp, pw) /* NB: passing NULL orig is ok */ - && myuid != 0 ) { goto err_ret; /* non-root is not allowed to have weak passwd */