From 3768b2dcb69ff2424656ce8f44eb04b38a1e6f93 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 22 Feb 2019 14:45:51 +0100 Subject: [PATCH] busybox 1.30.1 configs --- config/busybox/Config.in | 4 ++++ config/busybox/coreutils/Config.in | 6 ++++++ config/busybox/findutils/Config.in | 12 ++++++++++++ config/busybox/libbb/Config.in | 18 ++++++++++++++++++ config/busybox/miscutils/Config.in | 33 +++++++++++++++++++++++++++++++++ config/busybox/networking/Config.in | 11 +++++++++++ config/busybox/shell/Config.in | 14 ++++++++++++++ config/busybox/util-linux/Config.in | 23 ++++++++++++++++++++++- 8 files changed, 120 insertions(+), 1 deletion(-) diff --git a/config/busybox/Config.in b/config/busybox/Config.in index 507a522c1..e092dcacf 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -178,6 +178,10 @@ config BUSYBOX_BUSYBOX Running "busybox APPLET [ARGS...]" will still work, of course. +config BUSYBOX_FEATURE_SHOW_SCRIPT + bool "Support --show SCRIPT" + default y + depends on BUSYBOX_BUSYBOX config BUSYBOX_FEATURE_INSTALLER bool "Support --install [-s] to install applet links at runtime" default y diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 633a3fd78..9da7b53a0 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -84,6 +84,12 @@ config BUSYBOX_FEATURE_CP_LONG_OPTIONS help Enable long options. Also add support for --parents option. + +config BUSYBOX_FEATURE_CP_REFLINK + bool "Enable --reflink[=auto]" + default y + depends on BUSYBOX_FEATURE_CP_LONG_OPTIONS + config BUSYBOX_CUT bool "cut (5.3 kb)" default y diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in index 0f65ed991..97f5f7f4c 100644 --- a/config/busybox/findutils/Config.in +++ b/config/busybox/findutils/Config.in @@ -50,6 +50,11 @@ config BUSYBOX_FEATURE_FIND_TYPE help Enable searching based on file type (file, directory, socket, device, etc.). + +config BUSYBOX_FEATURE_FIND_EXECUTABLE + bool "Enable -executable: file is executable" + default y + depends on BUSYBOX_FIND config BUSYBOX_FEATURE_FIND_XDEV bool "Enable -xdev: 'stay in filesystem'" @@ -137,6 +142,13 @@ config BUSYBOX_FEATURE_FIND_PRUNE help If the file is a directory, don't descend into it. Useful for exclusion .svn and CVS directories. + +config BUSYBOX_FEATURE_FIND_QUIT + bool "Enable -quit: exit" + default y + depends on BUSYBOX_FIND + help + If this action is reached, 'find' exits. config BUSYBOX_FEATURE_FIND_DELETE bool "Enable -delete: delete files/dirs" diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index 49bf216b1..8442919d6 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -39,12 +39,30 @@ config BUSYBOX_FEATURE_USE_BSS_TAIL If you are getting a build error like this: appletlib.c:(.text.main+0xd): undefined reference to '_end' disable this option. +config BUSYBOX_FLOAT_DURATION + bool "Enable fractional duration arguments" + default y + help + Allow sleep N.NNN, top -d N.NNN etc. + config BUSYBOX_FEATURE_RTMINMAX bool "Support RTMIN[+n] and RTMAX[-n] signal names" default y help Support RTMIN[+n] and RTMAX[-n] signal names in kill, killall etc. This costs ~250 bytes. + +config BUSYBOX_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS + bool "Use the definitions of SIGRTMIN/SIGRTMAX provided by libc" + default y + depends on BUSYBOX_FEATURE_RTMINMAX + help + Some C libraries reserve a few real-time signals for internal + use, and adjust the values of SIGRTMIN/SIGRTMAX seen by + applications accordingly. Saying yes here means that a signal + name RTMIN+n will be interpreted according to the libc definition + of SIGRTMIN, and not the raw definition provided by the kernel. + This behavior matches "kill -l RTMIN+n" from bash. choice prompt "Buffer allocation policy" diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 9c5a6aeb2..59953a845 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -20,6 +20,14 @@ config BUSYBOX_BBCONFIG The bbconfig applet will print the config file with which busybox was built. +config BUSYBOX_BC + bool "bc (45 kb)" + default y + select BUSYBOX_FEATURE_DC_BIG + help + bc is a command-line, arbitrary-precision calculator with a + Turing-complete language. See the GNU bc manual + config BUSYBOX_FEATURE_COMPRESS_BBCONFIG bool "Compress bbconfig data" default y @@ -201,6 +209,31 @@ config BUSYBOX_FEATURE_DC_LIBM help Enable power and exp functions. NOTE: This will require libm to be present for linking. + +config BUSYBOX_FEATURE_BC_INTERACTIVE + bool "Interactive mode (+4kb)" + default y + depends on BUSYBOX_BC || (BUSYBOX_DC && BUSYBOX_FEATURE_DC_BIG) + help + Enable interactive mode: when started on a tty, + ^C interrupts execution and returns to command line, + errors also return to command line instead of exiting, + line editing with history is available. + + With this option off, input can still be taken from tty, + but all errors are fatal, ^C is fatal, + tty is treated exactly the same as any other + standard input (IOW: no line editing). + +config BUSYBOX_FEATURE_BC_LONG_OPTIONS + bool "Enable bc/dc long options" + default y + depends on BUSYBOX_BC || (BUSYBOX_DC && BUSYBOX_FEATURE_DC_BIG) + +config BUSYBOX_FEATURE_DC_BIG + bool "Use bc code base for dc (larger, more features)" + default y + config BUSYBOX_DEVFSD bool "devfsd (obsolete)" default n diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index 8dccd1051..2e3f1e0b3 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -1170,5 +1170,16 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. (IE: --syslog --background etc...) + +config BUSYBOX_FEATURE_TLS_SHA1 + bool "In TLS code, support ciphers which use deprecated SHA1" + depends on BUSYBOX_TLS + default n + help + Selecting this option increases interoperability with very old + servers, but slightly increases code size. + Most TLS servers support SHA256 today (2018), since SHA1 is + considered possibly insecure (although not yet definitely broken). + endmenu diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in index ab95e2fb8..846471f75 100644 --- a/config/busybox/shell/Config.in +++ b/config/busybox/shell/Config.in @@ -559,6 +559,20 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE to set shell history size. Note that its max value is capped by "History size" setting in library tuning section. +config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS + bool "Embed scripts in the binary" + default y + depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + help + Allow scripts to be compressed and embedded in the busybox + binary. The scripts should be placed in the 'embed' directory + at build time. Like applets, scripts can be run as + 'busybox SCRIPT ...' or by linking their name to the binary. + + This also allows applets to be implemented as scripts: place + the script in 'applets_sh' and a stub C file containing + configuration in the appropriate subsystem directory. + endif # Options common to all shells endmenu diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index d603c4f51..62abc1f97 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -962,7 +962,28 @@ config BUSYBOX_FEATURE_MTAB_SUPPORT About the only reason to use this is if you've removed /proc from your kernel. - + +config BUSYBOX_NOLOGIN + bool "nologin" + default y + depends on BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS + help + Politely refuse a login + +config BUSYBOX_NOLOGIN_DEPENDENCIES + bool "Enable dependencies for nologin" + default y + depends on BUSYBOX_NOLOGIN + select BUSYBOX_CAT + select BUSYBOX_ECHO + select BUSYBOX_SLEEP + help + nologin is implemented as a shell script. It requires the + following in the runtime environment: + cat echo sleep + If you know these will be available externally you can + disable this option. + source "config/busybox/util-linux/volume_id/Config.in" endmenu -- 2.14.1.windows.1