- up to 1.25.1 (nsenter not enabled due to lack of functionality in *libc)

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 8d8ccdf74f5604c7b8372f539dde66754515eb1c..f929686eb767e1a0451a3d1a7f1ec9abad8e9544 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -39,6 +39,7 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
 CONFIG_FEATURE_PREFER_APPLETS=y
+CONFIG_BUSYBOX=y
 CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_FEATURE_HAVE_RPC=y
@@ -63,6 +64,7 @@ CONFIG_EXTRA_LDLIBS=""
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
@@ -101,7 +103,9 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=255
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
 CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USE_BSS_TAIL is not set
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -403,6 +407,7 @@ CONFIG_FEATURE_VI_WIN_RESIZE=y
 # Init Utilities
 #
 # CONFIG_INIT is not set
+# CONFIG_LINUXRC is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
 # CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
@@ -446,6 +451,7 @@ CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
 # CONFIG_CRYPTPW is not set
 # CONFIG_CHPASSWD is not set
+# CONFIG_MKPASSWD is not set
 # CONFIG_SU is not set
 # CONFIG_FEATURE_SU_SYSLOG is not set
 # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
@@ -489,6 +495,7 @@ CONFIG_FEATURE_INSMOD_TRY_MMAP=y
 #
 # Linux System Utilities
 #
+# CONFIG_BLKDISCARD is not set
 # CONFIG_BLKID is not set
 CONFIG_DMESG=y
 # CONFIG_BLOCKDEV is not set
@@ -564,6 +571,7 @@ CONFIG_FEATURE_MOUNT_NFS=y
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
 # CONFIG_FEATURE_MOUNT_FSTAB is not set
+# CONFIG_NSENTER is not set
 CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 # CONFIG_RDEV is not set
@@ -672,6 +680,7 @@ CONFIG_FEATURE_LESS_ASK_TERMINAL=y
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set

diff --git a/busybox.config b/busybox.config
index 623da7d9df8b7754179340f9d1dc053bf85f9a15..ffc570a58bf9076c80a3f15ec78d1d87519dd7df 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -23,6 +23,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
+CONFIG_BUSYBOX=y
 # CONFIG_LOCALE_SUPPORT is not set
 CONFIG_UNICODE_SUPPORT=y
 CONFIG_SUBST_WCHAR=63
@@ -68,6 +69,7 @@ CONFIG_EXTRA_LDLIBS=""
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
@@ -93,6 +95,7 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
+# CONFIG_FEATURE_USE_BSS_TAIL is not set
 CONFIG_FEATURE_SYSTEMD=y
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
@@ -143,6 +146,7 @@ CONFIG_DPKG=y
 CONFIG_DPKG_DEB=y
 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
 CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=0
@@ -267,6 +271,7 @@ CONFIG_SPLIT=y
 CONFIG_FEATURE_SPLIT_FANCY=y
 CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_FEATURE_STAT_FILESYSTEM=y
 CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
@@ -445,7 +450,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 # Init Utilities
 #
 CONFIG_INIT=y
+CONFIG_LINUXRC=y
 CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y
 CONFIG_FEATURE_KILL_REMOVED=y
 CONFIG_FEATURE_KILL_DELAY=0
 CONFIG_FEATURE_INIT_SCTTY=y
@@ -491,6 +498,7 @@ CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
 CONFIG_CRYPTPW=y
+CONFIG_MKPASSWD=y
 CONFIG_CHPASSWD=y
 CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
 CONFIG_SU=y
@@ -544,6 +552,7 @@ CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 # Linux System Utilities
 #
 CONFIG_ACPID=y
+CONFIG_BLKDISCARD=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKID=y
 CONFIG_FEATURE_BLKID_TYPE=y
@@ -576,6 +585,7 @@ CONFIG_MKFS_EXT2=y
 CONFIG_MKFS_REISER=y
 CONFIG_REV=y
 CONFIG_UEVENT=y
+CONFIG_UNSHARE=y
 
 #
 # Minix filesystem support
@@ -608,6 +618,7 @@ CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_VOLUMEID=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_BCACHE=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_REISERFS=y
 CONFIG_FEATURE_VOLUMEID_FAT=y
@@ -638,6 +649,8 @@ CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_FEATURE_MOUNT_OTHERTAB=y
+# CONFIG_NSENTER is not set
+# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_RDEV=y
@@ -751,6 +764,7 @@ CONFIG_TTYSIZE=y
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+# CONFIG_UBIRENAME is not set
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
@@ -820,6 +834,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 CONFIG_FEATURE_IP_TUNNEL=y
 CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_NEIGH=y
 CONFIG_FEATURE_IP_SHORT_FORMS=y
 CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
 CONFIG_IPADDR=y

diff --git a/busybox.spec b/busybox.spec
index 7e75c4817d2c67c97b6a8b803b1dd3209df6486e..cdf3f2815f34676cbf044fbac7ccc29c9cdd6138 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,21 +41,17 @@ 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.24.2
-Release:       2
+Version:       1.25.1
+Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 2eaae519cac1143bcf583636a745381f
+# Source0-md5: 4f4c5de50b479b11ff636d7d8eb902a2
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
-Patch100:      https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-CVE-2016-2147.patch
-# Patch100-md5:        c45a85f5ced712743efbb683900f8c1d
-Patch101:      https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-CVE-2016-2148.patch
-# Patch101-md5:        850a57ca2871e370b4916161a0320a3f
-Patch102:      https://busybox.net/downloads/fixes-1.24.2/busybox-1.24.2-ash-recursive-heredocs.patch
-# Patch102-md5:        b59eb7536609db1ab5215de860d9e558
+Patch100:      https://busybox.net/downloads/fixes-1.25.1/busybox-1.25.1-setfiles.patch
+# Patch100-md5:        62152de75f60d0e729f68565560e4e19
 Patch0:                x32.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
@@ -166,8 +162,6 @@ Statycznie skonsolidowany busybox dla initrd.
 %prep
 %setup -q
 %patch100 -p1
-%patch101 -p1
-%patch102 -p1
 
 %patch0 -p1
 %patch1 -p1