- up to 1.29.3

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 41e58918be83ddc1f41ea422f91a5ceb5a63bdf1..6a3f01c660128cf957643feccbbc58746112981a 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -74,6 +74,7 @@ CONFIG_NO_DEBUG_LIB=y
 CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_PLATFORM_LINUX=y
+CONFIG_STACK_OPTIMIZATION_386=y
 
 #
 # Installation Options
@@ -99,6 +100,7 @@ CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
 # CONFIG_FEATURE_FAST_TOP is not set
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -109,6 +111,7 @@ 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_EDITING_WINCH=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 CONFIG_FEATURE_NON_POSIX_CP=y
@@ -451,6 +454,7 @@ CONFIG_FEATURE_KILL_DELAY=0
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
+CONFIG_FEATURE_WAIT_FOR_INIT=y
 # CONFIG_FEATURE_CALL_TELINIT is not set
 # CONFIG_MESG is not set
 # CONFIG_ADD_SHELL is not set
@@ -839,6 +843,8 @@ CONFIG_ROUTE=y
 # CONFIG_SENDMAIL is not set
 # CONFIG_SLATTACH is not set
 # CONFIG_SSL_CLIENT is not set
+CONFIG_TC=y
+CONFIG_FEATURE_TC_INGRESS=y
 # CONFIG_TELNET is not set
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
@@ -881,6 +887,7 @@ CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
 CONFIG_FEATURE_UDHCPC6_RFC4704=y
 CONFIG_FEATURE_UDHCPC6_RFC4833=y
+CONFIG_FEATURE_UDHCPC6_RFC5970=y
 
 #
 # Process Utilities
@@ -937,6 +944,8 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set
+# CONFIG_ASH_BASH_SOURCE_CURDIR is not set
 # CONFIG_ASH_IDLE_TIMEOUT is not set
 # CONFIG_ASH_JOB_CONTROL is not set
 CONFIG_ASH_ALIAS=y
@@ -997,8 +1006,10 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
 # CONFIG_RUNSV is not set
 # CONFIG_RUNSVDIR is not set
 # CONFIG_SV is not set
+# CONFIG_SV_DEFAULT_SERVICE_DIR is not set
 # CONFIG_SVC is not set
 # CONFIG_SVLOGD is not set
+# CONFIG_SVOK is not set
 # CONFIG_CHPST is not set
 # CONFIG_SETUIDGID is not set
 # CONFIG_ENVUIDGID is not set

diff --git a/busybox-logconsole.patch b/busybox-logconsole.patch
index 7e7a92c3c7302a7e7393f4853a659b2750422fb6..cb18d0ae2d71c8e091e3027660153ce51eb68125 100644 (file)
--- a/busybox-logconsole.patch
+++ b/busybox-logconsole.patch
@@ -1,32 +1,21 @@
---- busybox-1.17.3/include/libbb.h.orig        2010-10-09 22:57:13.000000000 +0300
-+++ busybox-1.17.3/include/libbb.h     2010-11-08 21:21:38.520518694 +0200
-@@ -1677,7 +1677,7 @@
- # define VC_2 "/dev/vc/2"
- # define VC_3 "/dev/vc/3"
- # define VC_4 "/dev/vc/4"
--# define VC_5 "/dev/vc/5"
-+# define VC_12 "/dev/vc/12"
- # define VC_FORMAT "/dev/vc/%d"
- # define LOOP_FORMAT "/dev/loop/%d"
- # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
-@@ -1690,7 +1690,7 @@
- # define VC_2 "/dev/tty2"
+--- busybox-1.29.3/include/libbb.h~    2018-12-16 11:20:56.000000000 +0100
++++ busybox-1.29.3/include/libbb.h     2018-12-16 11:22:32.895687694 +0100
+@@ -2095,6 +2095,7 @@ extern const char bb_default_login_shell
  # define VC_3 "/dev/tty3"
  # define VC_4 "/dev/tty4"
--# define VC_5 "/dev/tty5"
+ # define VC_5 "/dev/tty5"
 +# define VC_12 "/dev/tty12"
  # define VC_FORMAT "/dev/tty%d"
- # define LOOP_FORMAT "/dev/loop%d"
- # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)
---- busybox/init/init.c.orig   2008-04-19 04:03:13.000000000 +0000
-+++ busybox.o/init/init.c      2008-04-26 17:09:58.075653000 +0000
-@@ -217,7 +217,7 @@ struct init_action {
- static struct init_action *init_action_list = NULL;
- 
- #if !ENABLE_FEATURE_INIT_SYSLOG
--static const char *log_console = VC_5;
-+static const char *log_console = VC_12;
- #endif
+ #elif ENABLE_FEATURE_DEVFS
+ /*Linux, obsolete devfs names */
+--- busybox-1.29.3/init/init.c~        2018-07-02 13:23:06.000000000 +0200
++++ busybox-1.29.3/init/init.c 2018-12-16 11:21:50.307764617 +0100
+@@ -221,7 +221,7 @@ struct globals {
+ #define G (*(struct globals*)bb_common_bufsiz1)
+ #define INIT_G() do { \
+       setup_common_bufsiz(); \
+-      IF_NOT_FEATURE_INIT_SYSLOG(G.log_console = VC_5;) \
++      IF_NOT_FEATURE_INIT_SYSLOG(G.log_console = VC_12;) \
+ } while (0)
  
  enum {
-

diff --git a/busybox.config b/busybox.config
index 8fc39c9d9c2738d7faeba471407d5ab0f67238db..bd6309f0f6b849936b6ef9c2c60d1b5ee743689e 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -79,6 +79,7 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
 # CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_STACK_OPTIMIZATION_386=y
 
 #
 # Installation Options
@@ -104,6 +105,7 @@ CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_ETC_SERVICES=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
@@ -114,6 +116,7 @@ CONFIG_FEATURE_REVERSE_SEARCH=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 CONFIG_FEATURE_USERNAME_COMPLETION=y
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_EDITING_WINCH=y
 CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
 CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
@@ -141,6 +144,7 @@ CONFIG_FEATURE_AR_CREATE=y
 CONFIG_BUNZIP2=y
 CONFIG_BZCAT=y
 CONFIG_BZIP2=y
+CONFIG_BZIP2_SMALL=8
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
@@ -287,6 +291,7 @@ CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
 CONFIG_SPLIT=y
 CONFIG_FEATURE_SPLIT_FANCY=y
 CONFIG_STAT=y
@@ -501,6 +506,7 @@ CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
+CONFIG_FEATURE_WAIT_FOR_INIT=y
 CONFIG_MESG=y
 CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 CONFIG_BOOTCHARTD=y
@@ -670,6 +676,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_HFS=y
 CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_LFS=y
 CONFIG_FEATURE_VOLUMEID_XFS=y
 CONFIG_FEATURE_VOLUMEID_NILFS=y
 CONFIG_FEATURE_VOLUMEID_NTFS=y
@@ -924,6 +931,8 @@ CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_FEATURE_NETSTAT_PRG=y
 CONFIG_NSLOOKUP=y
+CONFIG_FEATURE_NSLOOKUP_BIG=y
+CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
 CONFIG_NTPD=y
 CONFIG_FEATURE_NTPD_SERVER=y
 CONFIG_FEATURE_NTPD_CONF=y
@@ -935,6 +944,8 @@ CONFIG_PSCAN=y
 CONFIG_ROUTE=y
 CONFIG_SLATTACH=y
 CONFIG_SSL_CLIENT=y
+CONFIG_TC=y
+CONFIG_FEATURE_TC_INGRESS=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
@@ -987,6 +998,7 @@ CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
 CONFIG_FEATURE_UDHCPC6_RFC4704=y
 CONFIG_FEATURE_UDHCPC6_RFC4833=y
+CONFIG_FEATURE_UDHCPC6_RFC5970=y
 CONFIG_FEATURE_TUNCTL_UG=y
 CONFIG_NBDCLIENT=y
 
@@ -1058,9 +1070,10 @@ CONFIG_WATCH=y
 # CONFIG_RUNSVDIR is not set
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
 # CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
 CONFIG_SVC=y
 # CONFIG_SVLOGD is not set
+CONFIG_SVOK=y
 CONFIG_CHPST=y
 CONFIG_SETUIDGID=y
 CONFIG_ENVUIDGID=y
@@ -1097,7 +1110,9 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_BASH_SOURCE_CURDIR=y
 # CONFIG_ASH_IDLE_TIMEOUT is not set
+CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_GETOPTS=y
@@ -1117,6 +1132,8 @@ CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_HUSH=y
 CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_BRACE_EXPANSION=y
+CONFIG_HUSH_LINENO_VAR=y
+CONFIG_HUSH_BASH_SOURCE_CURDIR=y
 CONFIG_HUSH_SAVEHISTORY=y
 CONFIG_HUSH_MODE_X=y
 CONFIG_HUSH_ECHO=y
@@ -1125,6 +1142,7 @@ CONFIG_HUSH_TEST=y
 CONFIG_HUSH_EXPORT=y
 CONFIG_HUSH_KILL=y
 CONFIG_HUSH_WAIT=y
+CONFIG_HUSH_COMMAND=y
 CONFIG_HUSH_TRAP=y
 CONFIG_HUSH_TYPE=y
 CONFIG_HUSH_READ=y

diff --git a/busybox.spec b/busybox.spec
index 1a7f783c6386e474f692574103800e78ddb3eb69..72d35566c27f27fd1d33061fb3e02fe21049d541 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.28.4
+Version:       1.29.3
 Release:       1
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 5661d013c9ef7cc31a453640c320f56b
+# Source0-md5: 0a367e19cdfd157e8258d87f893ee516
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}