- up to 1.15.1

Changed files:
    busybox-initrd.config -> 1.49
    busybox-printf-gettext.patch -> 1.11
    busybox.config -> 1.39
    busybox.spec -> 1.172

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 9e72f0b5de84837531df94cdc90a5297272bd9e9..759ffd2685848a131d8cb1cb1e1f2d7f611d5974 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -17,6 +17,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_LONG_OPTS is not set
 # CONFIG_SHOW_USAGE is not set
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
@@ -88,6 +89,7 @@ CONFIG_FEATURE_EDITING_HISTORY=
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_COPYBUF_KB=4
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
@@ -114,6 +116,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_GUNZIP is not set
 # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
 # CONFIG_GZIP is not set
+# CONFIG_LZOP is not set
 # CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
 # CONFIG_FEATURE_RPM_BZ2 is not set
@@ -176,6 +179,7 @@ CONFIG_FEATURE_FANCY_ECHO=y
 # CONFIG_EXPR_MATH_SUPPORT_64 is not set
 CONFIG_FALSE=y
 # 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
@@ -377,6 +381,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_INITRD is not set
 CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
 # CONFIG_MESG is not set
 
 #
@@ -541,6 +546,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 #
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
+# CONFIG_BEEP is not set
 # CONFIG_CHAT is not set
 # CONFIG_FEATURE_CHAT_NOFAIL is not set
 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
@@ -564,6 +570,8 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_EJECT is not set
 # CONFIG_FEATURE_EJECT_SCSI is not set
 # CONFIG_FBSPLASH is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_IONICE is not set
 # CONFIG_INOTIFYD is not set
@@ -594,6 +602,7 @@ CONFIG_FEATURE_LESS_MAXLINES=
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 # CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
 # CONFIG_STRINGS is not set
 # CONFIG_SETSID is not set
 # CONFIG_TASKSET is not set
@@ -601,12 +610,14 @@ CONFIG_FEATURE_LESS_MAXLINES=
 # CONFIG_TIME is not set
 # CONFIG_TIMEOUT is not set
 # CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
 
 #
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_HWIB=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
@@ -643,6 +654,7 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 # CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
 # CONFIG_IFUPDOWN is not set
 CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
@@ -714,7 +726,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 CONFIG_APP_UDHCPC=y
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCP_PORT is not set
-# CONFIG_UDHCP_DEBUG is not set
+CONFIG_UDHCP_DEBUG=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80

diff --git a/busybox-printf-gettext.patch b/busybox-printf-gettext.patch
index a566ff8811952d7a51fa3dfd312e3b3fc10f1bf8..ec29e13ebbb3f0c4105a4ee64bcacc546b8200c9 100644 (file)
--- a/busybox-printf-gettext.patch
+++ b/busybox-printf-gettext.patch
@@ -123,6 +123,7 @@
 +
  int printf_main(int argc UNUSED_PARAM, char **argv)
  {
+       int conv_err;
        char *format;
        char **argv2;
 +      int opt;
@@ -141,7 +142,6 @@
 +      format = getmsg(nls_file, argv[optind++]);
  
        /* We must check that stdout is not closed.
-        * The reason for this is highly non-obvious.
 @@ -362,8 +486,8 @@
        if (!argv[1])
                bb_show_usage();

diff --git a/busybox.config b/busybox.config
index ab51bdd24886aca815a91194784283b8ebeaed04..50a1910bc1c3c568bacf3a7956f0868da905bf33 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -14,7 +14,9 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_DESKTOP=y
 CONFIG_EXTRA_COMPAT=y
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_ASSUME_UNICODE=y
+CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
+CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -88,6 +90,8 @@ CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
+CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
 CONFIG_MONOTONIC_SYSCALL=y
@@ -117,6 +121,8 @@ CONFIG_DPKG_DEB=y
 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
 CONFIG_GUNZIP=y
 CONFIG_GZIP=y
+CONFIG_LZOP=y
+CONFIG_LZOP_COMPR_HIGH=y
 CONFIG_RPM2CPIO=y
 CONFIG_RPM=y
 CONFIG_TAR=y
@@ -170,6 +176,7 @@ CONFIG_EXPR=y
 CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
+CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
@@ -391,6 +398,9 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
 # CONFIG_USE_BB_SHADOW is not set
 # CONFIG_USE_BB_CRYPT is not set
 CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELGROUP=y
 CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
@@ -484,6 +494,7 @@ CONFIG_MKFS_VFAT=y
 #
 CONFIG_FEATURE_MINIX2=y
 CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
 CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
@@ -501,6 +512,7 @@ CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_VOLUMEID=y
@@ -535,6 +547,7 @@ CONFIG_RDEV=y
 CONFIG_READPROFILE=y
 CONFIG_RTCWAKE=y
 CONFIG_SCRIPT=y
+CONFIG_SCRIPTREPLAY=y
 CONFIG_SETARCH=y
 CONFIG_SWAPONOFF=y
 CONFIG_FEATURE_SWAPON_PRI=y
@@ -553,6 +566,9 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
 #
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
 # CONFIG_CHAT is not set
 # CONFIG_FEATURE_CHAT_NOFAIL is not set
 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
@@ -578,6 +594,8 @@ CONFIG_DEVMEM=y
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
 # CONFIG_FLASH_ERASEALL is not set
 CONFIG_IONICE=y
 CONFIG_INOTIFYD=y
@@ -618,12 +636,14 @@ CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
+CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
 #
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_UNIX_LOCAL=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 CONFIG_ARP=y
@@ -661,6 +681,7 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 CONFIG_IFENSLAVE=y
+CONFIG_IFPLUGD=y
 CONFIG_IFUPDOWN=y
 CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 CONFIG_FEATURE_IFUPDOWN_IP=y
@@ -731,7 +752,7 @@ CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
 CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_PORT=y
-# CONFIG_UDHCP_DEBUG is not set
+CONFIG_UDHCP_DEBUG=0
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -784,6 +805,7 @@ CONFIG_PKILL=y
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
 CONFIG_FEATURE_PS_TIME=y
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
@@ -856,6 +878,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_HUSH=y
+CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_HELP=y
 CONFIG_HUSH_INTERACTIVE=y
 CONFIG_HUSH_JOB=y
@@ -864,6 +887,7 @@ CONFIG_HUSH_IF=y
 CONFIG_HUSH_LOOPS=y
 CONFIG_HUSH_CASE=y
 CONFIG_HUSH_FUNCTIONS=y
+CONFIG_HUSH_LOCAL=y
 CONFIG_HUSH_EXPORT_N=y
 CONFIG_LASH=y
 CONFIG_MSH=y

diff --git a/busybox.spec b/busybox.spec
index 6a607447731fc25090dd413ae20fc1ffb1b88f23..3447e51b56f553aed018203043fdd90b401e0298 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -34,16 +34,15 @@ 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.14.2
-Release:       2
+Version:       1.15.1
+Release:       1
 License:       GPL
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: c13b09b4125688d5fca5c95a79bf814a
+# Source0-md5: e67a98eef14212abfc265092e4683fbe
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
-Patch100:      http://busybox.net/downloads/fixes-1.14.2/busybox-1.14.2-ls.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -150,7 +149,6 @@ Statycznie skonsolidowany busybox dla initrd.
 
 %prep
 %setup -q
-%patch100 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1