From e746ded4dd366dda0dc859771abd02a599c5b6af Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 1 Nov 2015 19:15:02 +0100 Subject: busybox: update to latest stable version --- package/busybox/config/Config.in | 2 +- package/busybox/config/archival/Config.in | 10 ++++++ package/busybox/config/coreutils/Config.in | 30 ++++++++++++++++++ package/busybox/config/miscutils/Config.in | 36 +++++++++++++++++++++ package/busybox/config/networking/Config.in | 49 +++++++++++++++++++++++++++++ package/busybox/config/util-linux/Config.in | 21 +++++++++++-- 6 files changed, 144 insertions(+), 4 deletions(-) (limited to 'package/busybox/config') diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 54d4e1120..e01d8d8d8 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -266,7 +266,7 @@ config BUSYBOX_PAM config BUSYBOX_FEATURE_USE_SENDFILE bool "Use sendfile system call" default y - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help When enabled, busybox will use the kernel sendfile() function instead of read/write loops to copy data between file descriptors diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index e13da8c0e..320203861 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -218,6 +218,16 @@ config BUSYBOX_LZOP_COMPR_HIGH are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. +config BUSYBOX_FEATURE_GZIP_LEVELS + bool "Enable compression levels" + default n + depends on BUSYBOX_GZIP + help + Enable support for compression levels 4-9. The default level + is 6. If levels 1-3 are specified, 4 is used. + If this option is not selected, -N options are ignored and -9 + is used. + config BUSYBOX_IPKG bool "ipkg" default n diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 46eccd4f1..adc99c1b7 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -148,6 +148,13 @@ config BUSYBOX_FEATURE_TR_EQUIV useful for cases when no other way of expressing a character is possible. +config BUSYBOX_TRUNCATE + bool "truncate" + default n + help + truncate truncates files to a given size. If a file does + not exist, it is created unless told otherwise. + config BUSYBOX_UNLINK bool "unlink" default y @@ -292,6 +299,13 @@ config BUSYBOX_FEATURE_DD_IBS_OBS Enables support for writing a certain number of bytes in and out, at a time, and performing conversions on the data stream. +config BUSYBOX_FEATURE_DD_STATUS + bool "Enable status display options" + default n + depends on BUSYBOX_DD + help + Enables support for status=noxfer/none option. + config BUSYBOX_DF bool "df" default y @@ -782,6 +796,14 @@ config BUSYBOX_SYNC help sync is used to flush filesystem buffers. +config BUSYBOX_FEATURE_SYNC_FANCY + bool "Enable -d and -f flags (requres syncfs(2) in libc)" + default n + depends on BUSYBOX_SYNC + help + sync -d FILE... executes fdatasync() on each FILE. + sync -f FILE... executes syncfs() on each FILE. + config BUSYBOX_TAC bool "tac" default y @@ -840,6 +862,14 @@ config BUSYBOX_UNAME help uname is used to print system information. +config BUSYBOX_UNAME_OSNAME + string "Operating system name" + default "GNU/Linux" + depends on BUSYBOX_UNAME + help + Sets the operating system name reported by uname -o. The + default is "GNU/Linux". + config BUSYBOX_UNEXPAND bool "unexpand" default y diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 496349f42..a0f76ff40 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -16,6 +16,34 @@ config BUSYBOX_CONSPY or conspy -nd NUM screenshot of console num or conspy -cs NUM poor man's GNU screen like +config BUSYBOX_I2CGET + bool "i2cget" + default y + select BUSYBOX_PLATFORM_LINUX + help + Read from I2C/SMBus chip registers. + +config BUSYBOX_I2CSET + bool "i2cset" + default y + select BUSYBOX_PLATFORM_LINUX + help + Set I2C registers. + +config BUSYBOX_I2CDUMP + bool "i2cdump" + default y + select BUSYBOX_PLATFORM_LINUX + help + Examine I2C registers. + +config BUSYBOX_I2CDETECT + bool "i2cdetect" + default y + select BUSYBOX_PLATFORM_LINUX + help + Detect I2C chips. + config BUSYBOX_LESS bool "less" depends on !BUSYBOX_DISABLE_LESS @@ -44,6 +72,14 @@ config BUSYBOX_FEATURE_LESS_FLAGS help The -M/-m flag enables a more sophisticated status line. +config BUSYBOX_FEATURE_LESS_TRUNCATE + bool "Enable -S" + default y + depends on BUSYBOX_LESS + help + The -S flag causes long lines to be truncated rather than + wrapped. + config BUSYBOX_FEATURE_LESS_MARKS bool "Enable marks" default y diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 93ff2c0f0..3f5019e7b 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -635,6 +635,13 @@ config BUSYBOX_FEATURE_IP_ROUTE help Add support for routing table management to "ip". +config BUSYBOX_FEATURE_IP_ROUTE_DIR + string "ip route configuration directory" + default "/etc/iproute2" + depends on BUSYBOX_FEATURE_IP_ROUTE + help + Location of the "ip" applet routing configuration. + config BUSYBOX_FEATURE_IP_TUNNEL bool "ip tunnel" default y @@ -1093,6 +1100,48 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT connection initialization). When FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option will work in addition to -T. +config BUSYBOX_FEATURE_WGET_OPENSSL + bool "Try to connect to HTTPS using openssl" + default y + depends on BUSYBOX_WGET + help + Choose how wget establishes SSL connection for https:// URLs. + + Busybox itself contains no SSL code. wget will spawn + a helper program to talk over HTTPS. + + OpenSSL has a simple SSL client for debug purposes. + If you select "openssl" helper, wget will effectively call + "openssl s_client -quiet -connect IP:443 2>/dev/null" + and pipe its data through it. + Note inconvenient API: host resolution is done twice, + and there is no guarantee openssl's idea of IPv6 address + format is the same as ours. + Another problem is that s_client prints debug information + to stderr, and it needs to be suppressed. This means + all error messages get suppressed too. + openssl is also a big binary, often dynamically linked + against ~15 libraries. + +config BUSYBOX_FEATURE_WGET_SSL_HELPER + bool "Try to connect to HTTPS using ssl_helper" + default y + depends on BUSYBOX_WGET + help + Choose how wget establishes SSL connection for https:// URLs. + + Busybox itself contains no SSL code. wget will spawn + a helper program to talk over HTTPS. + + ssl_helper is a tool which can be built statically + from busybox sources against a small embedded SSL library. + Please see networking/ssl_helper/README. + It does not require double host resolution and emits + error messages to stderr. + + Precompiled static binary may be available at + http://busybox.net/downloads/binaries/ + config BUSYBOX_ZCIP bool "zcip" default n diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 04e049668..f848f85c5 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -15,14 +15,14 @@ config BUSYBOX_BLOCKDEV config BUSYBOX_FATATTR bool "fatattr" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help fatattr lists or changes the file attributes on a fat file system. config BUSYBOX_FSTRIM bool "fstrim" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Discard unused blocks on a mounted filesystem. @@ -90,6 +90,14 @@ config BUSYBOX_REV help Reverse lines of a file or files. +config BUSYBOX_UEVENT + bool "uevent" + default y + select BUSYBOX_PLATFORM_LINUX + help + uevent is a netlink listener for kernel uevent notifications + sent via netlink. It is usually used for dynamic device creation. + config BUSYBOX_ACPID bool "acpid" default n @@ -333,7 +341,7 @@ config BUSYBOX_FSCK_MINIX config BUSYBOX_MKFS_EXT2 bool "mkfs_ext2" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Utility to create EXT2 filesystems. @@ -610,6 +618,13 @@ config BUSYBOX_FEATURE_MOUNT_FSTAB help Support mount all and looking for files in /etc/fstab. +config BUSYBOX_FEATURE_MOUNT_OTHERTAB + depends on BUSYBOX_FEATURE_MOUNT_FSTAB + bool "Support -T " + default n + help + Support mount -T (specifying an alternate fstab) + config BUSYBOX_PIVOT_ROOT bool "pivot_root" default n -- cgit v1.2.3