main/busybox: update to 1.21.0

5 files changed, 61 insertions, 214 deletions

diff --git a/main/busybox/0001-tar-Implement-no-recursion.patch b/main/busybox/0001-tar-Implement-no-recursion.patch
deleted file mode 100644
index b457c50c93..0000000000
--- a/main/busybox/0001-tar-Implement-no-recursion.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From abc357b4612ac02e9246eccdde8dcfcda81a5433 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 24 Apr 2012 17:02:15 +0200
-Subject: [PATCH] tar: Implement --no-recursion
-
-bloatcheck on x86_64:
-
-function                                             old     new   delta
-tar_longopts                                         259     274     +15
-.rodata                                             5757    5772     +15
-tar_main                                            1038    1052     +14
-writeTarFile                                         362     353      -9
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 44/-9)              Total: 35 bytes
-   text	   data	    bss	    dec	    hex	filename
-  81457	   1706	   8344	  91507	  16573	busybox_old
-  81477	   1706	   8344	  91527	  16587	busybox_unstripped
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- archival/tar.c |   19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/archival/tar.c b/archival/tar.c
-index cf972c2..a64d651 100644
---- a/archival/tar.c
-+++ b/archival/tar.c
-@@ -60,8 +60,8 @@
- 
- #if !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_FEATURE_SEAMLESS_BZ2
- /* Do not pass gzip flag to writeTarFile() */
--#define writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude, gzip) \
--	writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude)
-+#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \
-+	writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude)
- #endif
- 
- 
-@@ -598,7 +598,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
- 
- /* gcc 4.2.1 inlines it, making code bigger */
- static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
--	int dereferenceFlag, const llist_t *include,
-+	int recurseFlags, const llist_t *include,
- 	const llist_t *exclude, int gzip)
- {
- 	int errorFlag = FALSE;
-@@ -621,8 +621,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
- 
- 	/* Read the directory/files and iterate over them one at a time */
- 	while (include) {
--		if (!recursive_action(include->data, ACTION_RECURSE |
--				(dereferenceFlag ? ACTION_FOLLOWLINKS : 0),
-+		if (!recursive_action(include->data, recurseFlags,
- 				writeFileToTarball, writeFileToTarball, &tbInfo, 0)
- 		) {
- 			errorFlag = TRUE;
-@@ -662,7 +661,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
- }
- #else
- int writeTarFile(int tar_fd, int verboseFlag,
--	int dereferenceFlag, const llist_t *include,
-+	int recurseFlags, const llist_t *include,
- 	const llist_t *exclude, int gzip);
- #endif /* FEATURE_TAR_CREATE */
- 
-@@ -749,6 +748,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
- //	o	no-same-owner
- //	p	same-permissions
- //	k	keep-old
-+//	no-recursion
- //	numeric-owner
- //	no-same-permissions
- //	overwrite
-@@ -768,6 +768,7 @@ enum {
- 	IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,) // 16th bit
- 	IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
- #if ENABLE_FEATURE_TAR_LONG_OPTIONS
-+	OPTBIT_NORECURSION,
- 	IF_FEATURE_TAR_TO_COMMAND(OPTBIT_2COMMAND   ,)
- 	OPTBIT_NUMERIC_OWNER,
- 	OPTBIT_NOPRESERVE_PERM,
-@@ -791,6 +792,7 @@ enum {
- 	OPT_GZIP         = IF_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
- 	OPT_COMPRESS     = IF_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
- 	OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
-+	OPT_NORECURSION     = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION    )) + 0, // no-recursion
- 	OPT_2COMMAND        = IF_FEATURE_TAR_TO_COMMAND(  (1 << OPTBIT_2COMMAND       )) + 0, // to-command
- 	OPT_NUMERIC_OWNER   = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER  )) + 0, // numeric-owner
- 	OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
-@@ -835,6 +837,7 @@ static const char tar_longopts[] ALIGN1 =
- # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
- 	"touch\0"               No_argument       "m"
- # endif
-+	"no-recursion\0"	No_argument       "\xfa"
- # if ENABLE_FEATURE_TAR_TO_COMMAND
- 	"to-command\0"		Required_argument "\xfb"
- # endif
-@@ -1050,7 +1053,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
- 			zipMode = 2;
- #endif
- 		/* NB: writeTarFile() closes tar_handle->src_fd */
--		return writeTarFile(tar_handle->src_fd, verboseFlag, opt & OPT_DEREFERENCE,
-+		return writeTarFile(tar_handle->src_fd, verboseFlag,
-+				(opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
-+				| (opt & OPT_NORECURSION ? 0 : ACTION_RECURSE),
- 				tar_handle->accept,
- 				tar_handle->reject, zipMode);
- 	}
--- 
-1.7.10
-
diff --git a/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch b/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
deleted file mode 100644
index aa2846a083..0000000000
--- a/main/busybox/0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 76997894e631affe0742f380eda7de3898e0556c Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 1 May 2012 15:09:28 +0200
-Subject: [PATCH] unzip: ignore chmod errors so unzipping on FAT works
-
----
- archival/unzip.c       |    2 +-
- include/libbb.h        |    1 +
- libbb/make_directory.c |    7 ++++++-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/archival/unzip.c b/archival/unzip.c
-index 3c76cda..c1b945a 100644
---- a/archival/unzip.c
-+++ b/archival/unzip.c
-@@ -596,7 +596,7 @@ int unzip_main(int argc, char **argv)
- 						printf("   creating: %s\n", dst_fn);
- 					}
- 					unzip_create_leading_dirs(dst_fn);
--					if (bb_make_directory(dst_fn, dir_mode, 0)) {
-+					if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
- 						xfunc_die();
- 					}
- 				} else {
-diff --git a/include/libbb.h b/include/libbb.h
-index f12800f..5e5c8c7 100644
---- a/include/libbb.h
-+++ b/include/libbb.h
-@@ -333,6 +333,7 @@ enum {	/* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
- 	FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
- 	FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
- #endif
-+	FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
- };
- #define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
- extern int remove_file(const char *path, int flags) FAST_FUNC;
-diff --git a/libbb/make_directory.c b/libbb/make_directory.c
-index 72303e7..7826b90 100644
---- a/libbb/make_directory.c
-+++ b/libbb/make_directory.c
-@@ -107,6 +107,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
- 			 * an error. */
- 			if ((mode != -1) && (chmod(path, mode) < 0)) {
- 				fail_msg = "set permissions of";
-+				if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
-+					flags = 0;
-+					goto print_err;
-+				}
- 				break;
- 			}
- 			goto ret0;
-@@ -116,8 +120,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
- 		*s = c;
- 	} /* while (1) */
- 
--	bb_perror_msg("can't %s directory '%s'", fail_msg, path);
- 	flags = -1;
-+ print_err:
-+	bb_perror_msg("can't %s directory '%s'", fail_msg, path);
- 	goto ret;
-  ret0:
- 	flags = 0;
--- 
-1.7.10.2
-
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1b85018560..a9a2cb0ccf 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.20.2
-pkgrel=5
+pkgver=1.21.0
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -11,18 +11,16 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-static"
 triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
-	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-kernel_ver.patch
-	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-ntpd.patch
-	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-pkg-config-selinux.patch
-	http://busybox.net/downloads/fixes-1.20.2/busybox-1.20.2-sys-resource.patch
+	http://busybox.net/downloads/fixes-1.21.0/busybox-1.21.0-mdev.patch
+	http://busybox.net/downloads/fixes-1.21.0/busybox-1.21.0-platform.patch
+	http://busybox.net/downloads/fixes-1.21.0/busybox-1.21.0-xz.patch
+
 	bbsuid.c
 
 	nologin.c
 	$pkgname-1.11.1-bb.patch
 	busybox-uname-is-not-gnu.patch
 	bb-app-location.patch
-	0001-tar-Implement-no-recursion.patch
-	0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
 	loginutils-sha512.patch
 
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
@@ -98,20 +96,45 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="e025414bc6cd79579cc7a32a45d3ae1c  busybox-1.20.2.tar.bz2
-3386a2bf992f2284b86608498f4cb822  busybox-1.20.2-kernel_ver.patch
-87538be04a4f313d5a99fa543f64ffee  busybox-1.20.2-ntpd.patch
-a1b6587697c70808808f3693c4610884  busybox-1.20.2-pkg-config-selinux.patch
-cfb5d5d7ed1414b5749f2c2ec0bf066a  busybox-1.20.2-sys-resource.patch
+md5sums="d613f2e4b580305c1de8691f7b84285e  busybox-1.21.0.tar.bz2
+86afecbf8216eab9d486b2c0fcc0175d  busybox-1.21.0-mdev.patch
+324097adfdd8a25b85784bd4da6bec48  busybox-1.21.0-platform.patch
+4ae68a09b398aee34453dc02e3474e21  busybox-1.21.0-xz.patch
 8485cf1e389e891914cbb8771a6d9bbd  bbsuid.c
 d64b58a30892c558bdbab7f0d0997577  nologin.c
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
-754916e52fa11d3fe7c29c93248b6707  bb-app-location.patch
-b0977368029587bab23067f0267ae309  0001-tar-Implement-no-recursion.patch
-8bf65d5bc87112946675f540b46d406d  0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch
+c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
 04eeda8c49d4688e6dec02451f8b6aae  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 e1c183cbe1ca18a0fa0d9597314076c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
-8b3bcd5dd5e3245721da3d376172dcac  busyboxconfig
+b4e7c47c05c1fdaee0a418731e1d1135  busyboxconfig
 befaac2c59c380e36a452b3f1c1d4a3a  glibc.patch"
+sha256sums="eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed  busybox-1.21.0.tar.bz2
+738c6f71ca2b277afb0d0371a67d7021214a269c7d4b887701e44bdaa526f4f3  busybox-1.21.0-mdev.patch
+ee7b96577330a68598d4ec48ce94f6eca3079c32a86cca32f3bb6cc28d467654  busybox-1.21.0-platform.patch
+c807f73718e836a81ee74987306c72297ddba209038240f81fab96b4a28b73b4  busybox-1.21.0-xz.patch
+81957f1fe0c386120dad1c8174ccc1fcfeed98c14d229db7d164d4fb4c938b3d  bbsuid.c
+9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c
+327bb8049e2726351a5c8b6b2cef864f6ce58725d4453983f97092ea73656ccc  busybox-1.11.1-bb.patch
+a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-is-not-gnu.patch
+576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2  bb-app-location.patch
+57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
+2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
+7774d71ddab017c4e436bc575637bd54e3936a7e82574756afced8e1e0077c57  busyboxconfig
+c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0  glibc.patch"
+sha512sums="ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31  busybox-1.21.0.tar.bz2
+646556d1b923e93ced3219b14013d1a75b41bfc21f4a917428707ebd9de4c1e06306c249b206307f898556e1d44cb5792bfa42088eb6f4715b48acac5c2c0cb1  busybox-1.21.0-mdev.patch
+595e1081dcc9f2dca714066c1f59659d7c7e3f702df937c138ff60cf9af42272b71ac354521c3abd26ac406eb07a710c14c4f94e62a293edcd6473ba1fd53675  busybox-1.21.0-platform.patch
+696dd31a73bbd919435a3ee1b8cd05769e6c3a45e853e3e052a22b7290bf332cd3b7e17e394911864b3c7ed7f9eea604dfbd7a5c43f0eb1e65b257d679fcccd3  busybox-1.21.0-xz.patch
+16b3dd6a8b76b062d51458351fcb44f84b49eb4bf898584c933df90fb2cb3966f9547865a4d7447589bb20b7c203beb04ff7512f76f85d29138d2cff4eb9ee81  bbsuid.c
+4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c
+eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d499e8dffbe6df8aa37ae27625c552162923d59fe35b55b32b  busybox-1.11.1-bb.patch
+225c0608972f7daaca672eafdf647eea392e076537287370ca7791931de4803645d4d159385dc2909314028dccba3c64d0c89fa4e1184f856959b17c58459ed1  busybox-uname-is-not-gnu.patch
+5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d  bb-app-location.patch
+69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
+f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
+373b23c3a0db5353dc19bc1f758ec1ebaec82a05f99ac1ab839b95c94e6214f1c252b6b39fcd56cd5f0e0b3bd6c32bd9dde72a4afa5be49c49b6bc9190a8776f  busyboxconfig
+1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc  glibc.patch"
diff --git a/main/busybox/bb-app-location.patch b/main/busybox/bb-app-location.patch
index acad1f3313..7a4c99b353 100644
--- a/main/busybox/bb-app-location.patch
+++ b/main/busybox/bb-app-location.patch
@@ -1,14 +1,5 @@
 --- ./include/applets.src.h.orig
 +++ ./include/applets.src.h
-@@ -194,7 +194,7 @@
-  || ENABLE_FEATURE_IP_LINK \
-  || ENABLE_FEATURE_IP_TUNNEL \
-  || ENABLE_FEATURE_IP_RULE
--IF_IP(APPLET(ip, BB_DIR_BIN, BB_SUID_DROP))
-+IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
- #endif
- IF_IPADDR(APPLET(ipaddr, BB_DIR_BIN, BB_SUID_DROP))
- IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
 @@ -229,7 +229,7 @@
  IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr))
  IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 19cd7af7bf..1e9b839a69 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.20.0
-# Mon May 21 13:21:57 2012
+# Busybox version: 1.21.0
+# Mon Mar 11 14:45:05 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
 CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
 CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
@@ -96,6 +97,7 @@ CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox"
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=0
+CONFIG_SHA3_SMALL=0
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
@@ -263,6 +265,7 @@ CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
 CONFIG_SHA256SUM=y
 CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
@@ -613,9 +615,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_REISERFS=y
 CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
 CONFIG_FEATURE_VOLUMEID_JFS=y
 CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NILFS=y
 CONFIG_FEATURE_VOLUMEID_NTFS=y
 CONFIG_FEATURE_VOLUMEID_ISO9660=y
 CONFIG_FEATURE_VOLUMEID_UDF=y
@@ -623,6 +627,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y
 CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 CONFIG_FEATURE_VOLUMEID_OCFS2=y
 CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
@@ -895,6 +900,13 @@ CONFIG_POWERTOP=y
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
 CONFIG_SMEMCAP=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
 CONFIG_FREE=y
@@ -915,13 +927,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
 # CONFIG_FEATURE_SHOW_THREADS is not set
 CONFIG_WATCH=y
 
@@ -1016,6 +1021,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_FEATURE_KMSG_SYSLOG=y
 CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
 CONFIG_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y