- up to 1.24.2

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 29b5a56c462412e30dddb80cf6acc794ef7400ca..8d8ccdf74f5604c7b8372f539dde66754515eb1c 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -253,6 +253,7 @@ CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
 # CONFIG_TOUCH is not set
 # CONFIG_TR is not set
+# CONFIG_TRUNCATE is not set
 # CONFIG_UNLINK is not set
 # CONFIG_BASE64 is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
@@ -575,6 +576,7 @@ CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
 # CONFIG_ACPID is not set
 # CONFIG_REV is not set
+CONFIG_UEVENT=y
 
 #
 # Common options for mount/umount
@@ -600,6 +602,10 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CHRT is not set
 # CONFIG_CROND is not set
+# CONFIG_I2CGET is not set
+# CONFIG_I2CSET is not set
+# CONFIG_I2CDUMP is not set
+# CONFIG_I2CDETECT is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
@@ -623,6 +629,7 @@ CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 # CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_TRUNCATE is not set
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
 CONFIG_FEATURE_LESS_WINCH=y

diff --git a/busybox.config b/busybox.config
index 93a5dcf26937c70cf0da3297ec63a1a155459ea5..623da7d9df8b7754179340f9d1dc053bf85f9a15 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -146,6 +146,7 @@ CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=0
+CONFIG_FEATURE_GZIP_LEVELS=y
 CONFIG_LZOP=y
 CONFIG_LZOP_COMPR_HIGH=y
 CONFIG_RPM2CPIO=y
@@ -194,6 +195,7 @@ CONFIG_FEATURE_DATE_NANO=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_FEATURE_DD_STATUS=y
 CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
@@ -268,6 +270,7 @@ CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
+# CONFIG_FEATURE_SYNC_FANCY is not set
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -282,9 +285,11 @@ CONFIG_TR=y
 CONFIG_UNLINK=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUNCATE=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
+CONFIG_UNAME_OSNAME="PLD/Linux"
 CONFIG_UNEXPAND=y
 # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 CONFIG_UNIQ=y
@@ -570,6 +575,7 @@ CONFIG_MKFS_VFAT=y
 CONFIG_MKFS_EXT2=y
 CONFIG_MKFS_REISER=y
 CONFIG_REV=y
+CONFIG_UEVENT=y
 
 #
 # Minix filesystem support
@@ -631,6 +637,7 @@ CONFIG_FEATURE_MOUNT_NFS=y
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_FEATURE_MOUNT_OTHERTAB=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_RDEV=y
@@ -679,6 +686,10 @@ CONFIG_CROND=y
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
 CONFIG_CRONTAB=y
+CONFIG_I2CGET=y
+CONFIG_I2CSET=y
+CONFIG_I2CDUMP=y
+CONFIG_I2CDETECT=y
 CONFIG_DC=y
 CONFIG_FEATURE_DC_LIBM=y
 # CONFIG_DEVFSD is not set
@@ -705,7 +716,8 @@ CONFIG_FEATURE_LESS_MAXLINES=9999999
 # CONFIG_FEATURE_LESS_DASHCMD is not set
 # CONFIG_FEATURE_LESS_MARKS is not set
 CONFIG_FEATURE_LESS_REGEXP=y
-# CONFIG_FEATURE_LESS_LINENUMS is not set
+CONFIG_FEATURE_LESS_LINENUMS=y
+CONFIG_FEATURE_LESS_TRUNCATE=y
 # CONFIG_FEATURE_LESS_WINCH is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
@@ -805,6 +817,7 @@ CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 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_SHORT_FORMS=y
@@ -877,6 +890,8 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 CONFIG_FEATURE_WGET_TIMEOUT=y
+CONFIG_FEATURE_WGET_OPENSSL=y
+CONFIG_FEATURE_WGET_SSL_HELPER=y
 CONFIG_ZCIP=y
 CONFIG_TCPSVD=y
 CONFIG_UDPSVD=y

diff --git a/busybox.spec b/busybox.spec
index 944a6b3325fbd8cc5534238c038ee2d52bc194a4..e7df2bfb506333f9cbaad742b1274b9d00cbb6a9 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,15 +41,21 @@ 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.23.2
+Version:       1.24.2
 Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 7925683d7dd105aabe9b6b618d48cc73
+# Source0-md5: 2eaae519cac1143bcf583636a745381f
 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
 Patch0:                x32.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
@@ -157,6 +163,10 @@ Statycznie skonsolidowany busybox dla initrd.
 
 %prep
 %setup -q
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1