- merged 1.28.4 from PLD

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 96ebc1efe7a9fa0409352f2be53ee34dbab5ab17..41e58918be83ddc1f41ea422f91a5ceb5a63bdf1 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -170,6 +170,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_BASENAME=y
 # CONFIG_CAL is not set
 CONFIG_CAT=y
+CONFIG_FEATURE_CATN=y
 CONFIG_FEATURE_CATV=y
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
@@ -285,6 +286,7 @@ CONFIG_TEST2=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
+# CONFIG_BB_ARCH is not set
 # CONFIG_UNEXPAND is not set
 # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 # CONFIG_UNIQ is not set
@@ -359,6 +361,14 @@ CONFIG_LOADKMAP=y
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 # CONFIG_WHICH is not set
 
+#
+# klibc-utils
+#
+# CONFIG_MINIPS is not set
+# CONFIG_NUKE is not set
+CONFIG_RESUME=y
+# CONFIG_RUN_INIT is not set
+
 #
 # Editors
 #
@@ -590,6 +600,13 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
+# CONFIG_FEATURE_VOLUMEID_F2FS is not set
+# CONFIG_FEATURE_VOLUMEID_MINIX is not set
+# CONFIG_FEATURE_VOLUMEID_NILFS is not set
+# CONFIG_FEATURE_VOLUMEID_UBIFS is not set
 CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
@@ -613,6 +630,7 @@ CONFIG_SWAPON=y
 CONFIG_FEATURE_SWAPON_DISCARD=y
 CONFIG_FEATURE_SWAPON_PRI=y
 CONFIG_SWAPOFF=y
+CONFIG_FEATURE_SWAPONOFF_LABEL=y
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -687,6 +705,7 @@ CONFIG_FEATURE_LESS_ASK_TERMINAL=y
 # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
 # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
 # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_HEXEDIT is not set
 # CONFIG_MAKEDEVS is not set
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
@@ -703,6 +722,7 @@ CONFIG_PARTPROBE=y
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+# CONFIG_SETFATTR is not set
 # CONFIG_SCRIPT is not set
 # CONFIG_SCRIPTREPLAY is not set
 # CONFIG_STRINGS is not set
@@ -805,6 +825,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
+# CONFIG_NETCAT is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_NSLOOKUP is not set
@@ -951,6 +972,7 @@ CONFIG_FEATURE_SH_MATH_64=y
 CONFIG_FEATURE_SH_STANDALONE=y
 # CONFIG_FEATURE_SH_NOFORK is not set
 # CONFIG_FEATURE_SH_HISTFILESIZE is not set
+# CONFIG_FEATURE_SH_READ_FRAC is not set
 # CONFIG_CTTYHACK is not set
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y

diff --git a/busybox.config b/busybox.config
index 5d6b4f2f955de6c2d765dd34309b2fcb6321f9c1..8fc39c9d9c2738d7faeba471407d5ab0f67238db 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -192,6 +192,7 @@ CONFIG_BASE64=y
 CONFIG_BASENAME=y
 CONFIG_CAL=y
 CONFIG_CAT=y
+CONFIG_FEATURE_CATN=y
 CONFIG_FEATURE_CATV=y
 CONFIG_CATV=y
 CONFIG_CHGRP=y
@@ -316,6 +317,7 @@ CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="PLD/Linux"
+CONFIG_BB_ARCH=y
 CONFIG_UNEXPAND=y
 # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 CONFIG_UNIQ=y
@@ -398,6 +400,14 @@ CONFIG_START_STOP_DAEMON=y
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 CONFIG_WHICH=y
 
+#
+# klibc-utils
+#
+CONFIG_MINIPS=y
+CONFIG_NUKE=y
+CONFIG_RESUME=y
+CONFIG_RUN_INIT=y
+
 #
 # Editors
 #
@@ -469,6 +479,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
 CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
 CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
+CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
+CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
 
 #
 # Init Utilities
@@ -673,6 +685,7 @@ CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_FEATURE_VOLUMEID_OCFS2=y
 CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
+CONFIG_FEATURE_VOLUMEID_MINIX=y
 CONFIG_MOUNT=y
 CONFIG_FEATURE_MOUNT_FAKE=y
 CONFIG_FEATURE_MOUNT_VERBOSE=y
@@ -696,9 +709,13 @@ CONFIG_SETARCH=y
 CONFIG_LINUX32=y
 CONFIG_LINUX64=y
 CONFIG_SETPRIV=y
+CONFIG_FEATURE_SETPRIV_DUMP=y
+CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
+CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
 CONFIG_SWAPON=y
 CONFIG_SWAPONOFF=y
 CONFIG_SWAPOFF=y
+CONFIG_FEATURE_SWAPONOFF_LABEL=y
 CONFIG_FEATURE_SWAPON_DISCARD=y
 CONFIG_FEATURE_SWAPON_PRI=y
 CONFIG_SWITCH_ROOT=y
@@ -737,6 +754,7 @@ CONFIG_CHRT=y
 CONFIG_CROND=y
 # CONFIG_FEATURE_CROND_D is not set
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
+CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
 CONFIG_CRONTAB=y
 CONFIG_I2CGET=y
@@ -781,6 +799,7 @@ CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
 # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
 CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_HEXEDIT=y
 CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
@@ -793,6 +812,7 @@ CONFIG_READAHEAD=y
 CONFIG_RFKILL=y
 CONFIG_RUNLEVEL=y
 CONFIG_RX=y
+CONFIG_SETFATTR=y
 CONFIG_SETSID=y
 CONFIG_STRINGS=y
 CONFIG_TASKSET=y
@@ -899,6 +919,7 @@ CONFIG_NC=y
 CONFIG_NC_SERVER=y
 # CONFIG_NC_EXTRA is not set
 # CONFIG_NC_110_COMPAT is not set
+CONFIG_NETCAT=y
 CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_FEATURE_NETSTAT_PRG=y
@@ -1111,6 +1132,7 @@ CONFIG_HUSH_SET=y
 CONFIG_HUSH_UNSET=y
 CONFIG_HUSH_ULIMIT=y
 CONFIG_HUSH_UMASK=y
+CONFIG_HUSH_GETOPTS=y
 # CONFIG_HUSH_MEMLEAK is not set
 CONFIG_HUSH_HELP=y
 CONFIG_HUSH_INTERACTIVE=y
@@ -1122,7 +1144,9 @@ CONFIG_HUSH_CASE=y
 CONFIG_HUSH_FUNCTIONS=y
 CONFIG_HUSH_LOCAL=y
 CONFIG_HUSH_EXPORT_N=y
+CONFIG_HUSH_READONLY=y
 CONFIG_HUSH_RANDOM_SUPPORT=y
+CONFIG_HUSH_TIMES=y
 CONFIG_MSH=y
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
@@ -1133,6 +1157,7 @@ CONFIG_FEATURE_SH_MATH_64=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 CONFIG_FEATURE_SH_STANDALONE=y
 CONFIG_FEATURE_SH_NOFORK=y
+CONFIG_FEATURE_SH_READ_FRAC=y
 CONFIG_FEATURE_SH_HISTFILESIZE=y
 CONFIG_CTTYHACK=y
 CONFIG_SH_MATH_SUPPORT=y

diff --git a/busybox.spec b/busybox.spec
index 6f176c3f07fcca59a0f5dfdfa7b600744ab2f5c6..aecff3216c1b1b195e47b365fbfab655a2233a21 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -41,12 +41,12 @@ 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.27.2
+Version:       1.28.4
 Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 476186f4bab81781dab2369bfd42734e
+# Source0-md5: 5661d013c9ef7cc31a453640c320f56b
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}