- up to 1.19.2

Changed files:
    busybox-initrd.config -> 1.58
    busybox.config -> 1.45
    busybox.spec -> 1.191

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 6ff488f05e9d8a6297d9cd4d9825b55e378ab895..a69f3cf06bee3cf93f16f7f04693b548fba30ff7 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -86,6 +86,9 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
 # CONFIG_FEATURE_FAST_TOP is not set
@@ -198,6 +201,7 @@ CONFIG_FALSE=y
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
 # CONFIG_ID is not set
+# CONFIG_GROUPS is not set
 # CONFIG_INSTALL is not set
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
 # CONFIG_LENGTH is not set
@@ -633,6 +637,7 @@ CONFIG_FEATURE_LESS_MAXLINES=
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
 # CONFIG_RFKILL is not set
@@ -649,6 +654,10 @@ CONFIG_FEATURE_LESS_MAXLINES=
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WALL is not set
 # CONFIG_WATCHDOG is not set
@@ -738,6 +747,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_NSLOOKUP is not set
 # CONFIG_NTPD is not set
 # CONFIG_PING is not set
+# CONFIG_WHOIS is not set
 # CONFIG_PING6 is not set
 # CONFIG_FEATURE_FANCY_PING is not set
 # CONFIG_PSCAN is not set
@@ -772,6 +782,7 @@ 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
+CONFIG_FEATURE_UDHCP_8021Q=y
 # CONFIG_VCONFIG is not set
 # CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
@@ -805,6 +816,8 @@ CONFIG_KILLALL5=y
 # CONFIG_MPSTAT is not set
 # CONFIG_PMAP is not set
 # CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
 # CONFIG_BB_SYSCTL is not set
 # CONFIG_TOP is not set
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
@@ -830,6 +843,7 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 # CONFIG_ASH_JOB_CONTROL is not set
 # CONFIG_ASH_READ_NCHARS is not set
 # CONFIG_ASH_READ_TIMEOUT is not set
@@ -861,6 +875,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 CONFIG_FEATURE_SH_STANDALONE=y
 # CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE 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 a8e21ea556d49d5bcf8ec7fd8138bcf5222f0755..77333157b3007bb704eed44e54e883369efe20fb 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
 CONFIG_FEATURE_FAST_TOP=y
@@ -98,6 +100,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
 CONFIG_FEATURE_EDITING_HISTORY=15
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -105,6 +108,7 @@ CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
 CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
 CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_HWIB=y
@@ -206,6 +210,7 @@ CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
 CONFIG_ID=y
+CONFIG_GROUPS=y
 CONFIG_INSTALL=y
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
 CONFIG_LENGTH=y
@@ -278,6 +283,7 @@ CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
 CONFIG_WHO=y
+CONFIG_USERS=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -364,6 +370,7 @@ CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_REGEX_SEARCH=y
 CONFIG_FEATURE_VI_USE_SIGNALS=y
 CONFIG_FEATURE_VI_DOT_CMD=y
 CONFIG_FEATURE_VI_READONLY=y
@@ -425,6 +432,7 @@ CONFIG_FEATURE_INITRD=y
 CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_HALT=y
 CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 CONFIG_BOOTCHARTD=y
 CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
 CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
@@ -512,6 +520,7 @@ CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKID=y
+CONFIG_FEATURE_BLKID_TYPE=y
 CONFIG_BLOCKDEV=y
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
@@ -629,6 +638,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=30
 CONFIG_CONSPY=y
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
 # CONFIG_FEATURE_CHAT_NOFAIL is not set
 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
 # CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
@@ -698,6 +708,10 @@ CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
@@ -793,6 +807,7 @@ CONFIG_FEATURE_NTPD_SERVER=y
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WHOIS=y
 CONFIG_PSCAN=y
 CONFIG_ROUTE=y
 CONFIG_SLATTACH=y
@@ -818,12 +833,14 @@ CONFIG_UDHCPD=y
 CONFIG_DHCPRELAY=y
 CONFIG_DUMPLEASES=y
 CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
+CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
 CONFIG_DHCPD_LEASES_FILE="/var/run/udhcpd.leases"
 CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_PORT=y
 CONFIG_UDHCP_DEBUG=0
 CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_APP_UDHCPD=y
@@ -881,6 +898,8 @@ CONFIG_IOSTAT=y
 CONFIG_MPSTAT=y
 CONFIG_PMAP=y
 CONFIG_POWERTOP=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 CONFIG_KILLALL5=y
@@ -907,6 +926,7 @@ CONFIG_FEATURE_TOPMEM=y
 CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_SMEMCAP=y
 CONFIG_UPTIME=y
+CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
 CONFIG_WATCH=y
 
 #
@@ -955,6 +975,7 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_READ_NCHARS=y
 CONFIG_ASH_READ_TIMEOUT=y
@@ -995,6 +1016,7 @@ CONFIG_MSH=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 CONFIG_FEATURE_SH_STANDALONE=y
 CONFIG_FEATURE_SH_NOFORK=y
+CONFIG_FEATURE_SH_HISTFILESIZE=y
 CONFIG_CTTYHACK=y
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y
@@ -1007,6 +1029,7 @@ CONFIG_SYSLOGD=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_SYSLOGD_CFG=y
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y

diff --git a/busybox.spec b/busybox.spec
index 394a0592879bc0b90437b780c6a461f37f0d4f35..7857d5f3982447f9d72ef7e58f0682487c4f578e 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -37,15 +37,23 @@ 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.18.5
+Version:       1.19.2
 Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 96dd43cc7cee4017a6bf31b7da82a1f5
+# Source0-md5: 50267054345f1a0b77fe65f6e0e5ba29
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
+Patch100:      busybox-1.19.2-android.patch
+Patch101:      busybox-1.19.2-buildsys.patch
+Patch102:      busybox-1.19.2-chpasswd.patch
+Patch103:      busybox-1.19.2-crond.patch
+Patch104:      busybox-1.19.2-inetd.patch
+Patch105:      busybox-1.19.2-syslogd.patch
+Patch106:      busybox-1.19.2-tail.patch
+Patch107:      busybox-1.19.2-tftp.patch
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -152,6 +160,15 @@ Statycznie skonsolidowany busybox dla initrd.
 
 %prep
 %setup -q
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p1