From c8df42c6d071025fec8daf3dc1308b98ef851a8a Mon Sep 17 00:00:00 2001 From: Clemens Gruber Date: Fri, 1 Sep 2017 18:39:11 +0200 Subject: busybox: version bump 1.26.2 -> 1.27.2 Signed-off-by: Clemens Gruber Signed-off-by: Michael Olbrich --- config/busybox/Config.in | 47 +++-- config/busybox/archival/Config.in | 113 ++++++----- config/busybox/console-tools/Config.in | 10 +- config/busybox/coreutils/Config.in | 144 +++++++------- config/busybox/debianutils/Config.in | 20 +- config/busybox/editors/Config.in | 37 ++-- config/busybox/findutils/Config.in | 18 +- config/busybox/init/Config.in | 34 +--- config/busybox/libbb/Config.in | 17 +- config/busybox/loginutils/Config.in | 36 ++-- config/busybox/miscutils/Config.in | 112 +++-------- config/busybox/modutils/Config.in | 108 +++++------ config/busybox/networking/Config.in | 142 ++++++++------ config/busybox/networking/udhcp/Config.in | 80 +++++--- config/busybox/procps/Config.in | 52 +++--- config/busybox/selinux/Config.in | 4 - config/busybox/shell/Config.in | 259 ++++++++++++++++---------- config/busybox/sysklogd/Config.in | 2 +- config/busybox/util-linux/Config.in | 146 +++++++++++++-- config/busybox/util-linux/volume_id/Config.in | 134 ------------- 20 files changed, 763 insertions(+), 752 deletions(-) (limited to 'config') diff --git a/config/busybox/Config.in b/config/busybox/Config.in index b8a4d795c..a15c05cce 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -22,7 +22,7 @@ config BUSYBOX_DESKTOP If you are preparing your build to be used on an embedded box where you have tighter control over the entire set of userspace - tools, you can unselect this option for smaller code size. + tools, you can unselect this option for smaller code size. config BUSYBOX_EXTRA_COMPAT bool "Provide compatible behavior for rare corner cases (bigger code)" @@ -33,6 +33,19 @@ config BUSYBOX_EXTRA_COMPAT some GNU extensions in libc. You probably only need this option if you plan to run busybox on desktop. +config BUSYBOX_FEDORA_COMPAT + bool "Building for Fedora distribution" + default n + help + This option makes some tools behave like they do on Fedora. + + At the time of this writing (2017-08) this only affects uname: + normally, uname -p (processor) and uname -i (platform) + are shown as "unknown", but with this option uname -p + shows the same string as uname -m (machine type), + and so does uname -i unless machine type is i486/i586/i686 - + then uname -i shows "i386". + config BUSYBOX_INCLUDE_SUSv2 bool "Enable obsolete features removed before SUSv3" default y @@ -50,17 +63,6 @@ config BUSYBOX_USE_PORTABLE_CODE compiler other than gcc. If you do use gcc, this option may needlessly increase code size. -config BUSYBOX_PLATFORM_LINUX - bool "Enable Linux-specific applets and features" - default y - help - For the most part, busybox requires only POSIX compatibility - from the target system, but some applets and features use - Linux-specific interfaces. - - Answering 'N' here will disable such applets and hide the - corresponding configuration options. - config BUSYBOX_SHOW_USAGE bool "Show applet usage messages" default y @@ -124,14 +126,14 @@ config BUSYBOX_INSTALL_NO_USR never to /usr/bin or /usr/sbin. config BUSYBOX_PAM - bool "Support for PAM (Pluggable Authentication Modules)" + bool "Support PAM (Pluggable Authentication Modules)" default n help Use PAM in some busybox applets (currently login and httpd) instead of direct access to password database. config BUSYBOX_LONG_OPTS - bool "Support for --long-options" + bool "Support --long-options" default y help Enable this if you want busybox applets to use the gnu --long-option @@ -198,7 +200,7 @@ config BUSYBOX_PID_FILE_PATH specify a pidfile path. config BUSYBOX_FEATURE_SUID - bool "Support for SUID/SGID handling" + bool "Support SUID/SGID handling" default y help With this option you can install the busybox binary belonging @@ -338,6 +340,17 @@ config BUSYBOX_FEATURE_HAVE_RPC # This is automatically selected if any of enabled applets need it. # You do not need to select it manually. +config BUSYBOX_PLATFORM_LINUX + bool #No description makes it a hidden option + default n + #help + # For the most part, busybox requires only POSIX compatibility + # from the target system, but some applets and features use + # Linux-specific interfaces. + # + # This is automatically selected if any applet or feature requires + # Linux-specific interfaces. You do not need to select it manually. + comment 'Build Options' config BUSYBOX_STATIC @@ -611,6 +624,8 @@ config BUSYBOX_DEBUG_SANITIZE catch bad memory accesses (e.g. buffer overflows), but will make the executable larger and slow down runtime a bit. + This adds -fsanitize=foo options to gcc command line. + If you aren't developing/testing busybox, say N here. config BUSYBOX_UNIT_TEST @@ -625,7 +640,7 @@ config BUSYBOX_WERROR bool "Abort compilation on any warning" default n help - Selecting this will add -Werror to gcc command line. + This adds -Werror to gcc command line. Most people should answer N. diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in index 92abf98c9..750df33c7 100644 --- a/config/busybox/archival/Config.in +++ b/config/busybox/archival/Config.in @@ -9,32 +9,22 @@ menu "Archival Utilities" config BUSYBOX_FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y - help - Make tar, rpm, modprobe etc understand .xz data. config BUSYBOX_FEATURE_SEAMLESS_LZMA bool "Make tar, rpm, modprobe etc understand .lzma data" default y - help - Make tar, rpm, modprobe etc understand .lzma data. config BUSYBOX_FEATURE_SEAMLESS_BZ2 bool "Make tar, rpm, modprobe etc understand .bz2 data" default y - help - Make tar, rpm, modprobe etc understand .bz2 data. config BUSYBOX_FEATURE_SEAMLESS_GZ bool "Make tar, rpm, modprobe etc understand .gz data" default y - help - Make tar, rpm, modprobe etc understand .gz data. config BUSYBOX_FEATURE_SEAMLESS_Z bool "Make tar, rpm, modprobe etc understand .Z data" default n # it is ancient - help - Make tar, rpm, modprobe etc understand .Z data. config BUSYBOX_AR bool "ar" @@ -50,7 +40,7 @@ config BUSYBOX_AR probably say N here: most compilers come with their own ar utility. config BUSYBOX_FEATURE_AR_LONG_FILENAMES - bool "Support for long filenames (not needed for debs)" + bool "Support long filenames (not needed for debs)" default y depends on BUSYBOX_AR help @@ -74,6 +64,7 @@ config BUSYBOX_UNCOMPRESS config BUSYBOX_GUNZIP bool "gunzip" default y + select BUSYBOX_FEATURE_GZIP_DECOMPRESS help gunzip is used to decompress archives created by gzip. You can use the `-t' option to test the integrity of @@ -82,6 +73,7 @@ config BUSYBOX_GUNZIP config BUSYBOX_ZCAT bool "zcat" default y + select BUSYBOX_FEATURE_GZIP_DECOMPRESS help Alias to "gunzip -c". @@ -89,11 +81,10 @@ config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS bool "Enable long options" default y depends on (BUSYBOX_GUNZIP || BUSYBOX_ZCAT) && BUSYBOX_LONG_OPTS - help - Enable use of long options. config BUSYBOX_BUNZIP2 bool "bunzip2" default y + select BUSYBOX_FEATURE_BZIP2_DECOMPRESS help bunzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -107,6 +98,7 @@ config BUSYBOX_BUNZIP2 config BUSYBOX_BZCAT bool "bzcat" default y + select BUSYBOX_FEATURE_BZIP2_DECOMPRESS help Alias to "bunzip2 -c". config BUSYBOX_UNLZMA @@ -141,7 +133,7 @@ config BUSYBOX_LZMA IOW: you'll get lzma applet, but it will always require -d option. config BUSYBOX_FEATURE_LZMA_FAST - bool "Optimize unlzma for speed" + bool "Optimize for speed" default n depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA help @@ -177,6 +169,15 @@ config BUSYBOX_BZIP2 Unless you have a specific application which requires bzip2, you should probably say N here. + +config BUSYBOX_FEATURE_BZIP2_DECOMPRESS + bool "Enable decompression" + default y + depends on BUSYBOX_BZIP2 || BUSYBOX_BUNZIP2 || BUSYBOX_BZCAT + help + Enable -d (--decompress) and -t (--test) options for bzip2. + This will be automatically selected if bunzip2 or bzcat is + enabled. config BUSYBOX_CPIO bool "cpio" default y @@ -192,7 +193,7 @@ config BUSYBOX_CPIO should probably say N here. config BUSYBOX_FEATURE_CPIO_O - bool "Support for archive creation" + bool "Support archive creation" default y depends on BUSYBOX_CPIO help @@ -200,7 +201,7 @@ config BUSYBOX_FEATURE_CPIO_O format only. config BUSYBOX_FEATURE_CPIO_P - bool "Support for passthrough mode" + bool "Support passthrough mode" default y depends on BUSYBOX_FEATURE_CPIO_O help @@ -237,11 +238,9 @@ config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_GZIP && BUSYBOX_LONG_OPTS - help - Enable use of long options, increases size by about 106 Bytes config BUSYBOX_GZIP_FAST - int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" + int "Trade memory for speed (0:small,slow - 2:fast,big)" default 0 range 0 2 depends on BUSYBOX_GZIP @@ -261,6 +260,15 @@ config BUSYBOX_FEATURE_GZIP_LEVELS 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_FEATURE_GZIP_DECOMPRESS + bool "Enable decompression" + default y + depends on BUSYBOX_GZIP || BUSYBOX_GUNZIP || BUSYBOX_ZCAT + help + Enable -d (--decompress) and -t (--test) options for gzip. + This will be automatically selected if gunzip or zcat is + enabled. config BUSYBOX_LZOP bool "lzop" default y @@ -269,13 +277,13 @@ config BUSYBOX_LZOP config BUSYBOX_UNLZOP bool "unlzop" - default y + default n # INCOMPAT: upstream lzop does not provide such tool help Lzop decompresion. config BUSYBOX_LZOPCAT bool "lzopcat" - default y + default n # INCOMPAT: upstream lzop does not provide such tool help Alias to "unlzop -c". @@ -305,13 +313,15 @@ config BUSYBOX_TAR create compressed archives. It's probably the most widely used UNIX archive program. +config BUSYBOX_FEATURE_TAR_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS + config BUSYBOX_FEATURE_TAR_CREATE - bool "Enable archive creation" + bool "Enable -c (archive creation)" default y depends on BUSYBOX_TAR - help - If you enable this option you'll be able to create - tar archives using the `-c' option. config BUSYBOX_FEATURE_TAR_AUTODETECT bool "Autodetect compressed tarballs" @@ -330,7 +340,7 @@ config BUSYBOX_FEATURE_TAR_FROM a list of files to include or exclude from an archive. config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY - bool "Support for old tar header format" + bool "Support old tar header format" default y depends on BUSYBOX_TAR || BUSYBOX_DPKG help @@ -349,22 +359,12 @@ config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY tarballs still exist. config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS - bool "Support for GNU tar extensions (long filenames)" + bool "Support GNU tar extensions (long filenames)" default y depends on BUSYBOX_TAR || BUSYBOX_DPKG - help - With this option busybox supports GNU long filenames and - linknames. - -config BUSYBOX_FEATURE_TAR_LONG_OPTIONS - bool "Enable long options" - default y - depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS - help - Enable use of long options, increases size by about 400 Bytes config BUSYBOX_FEATURE_TAR_TO_COMMAND - bool "Support for writing to an external program" + bool "Support writing to an external program (--to-command)" default y depends on BUSYBOX_TAR && BUSYBOX_FEATURE_TAR_LONG_OPTIONS help @@ -377,20 +377,17 @@ config BUSYBOX_FEATURE_TAR_UNAME_GNAME default y depends on BUSYBOX_TAR help - Enables use of user and group names in tar. This affects contents + Enable use of user and group names in tar. This affects contents listings (-t) and preserving permissions when unpacking (-p). +200 bytes. config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME - bool "Enable -m (do not preserve time) option" + bool "Enable -m (do not preserve time) GNU option" default y depends on BUSYBOX_TAR - help - With this option busybox supports GNU tar -m - (do not preserve time) option. config BUSYBOX_FEATURE_TAR_SELINUX - bool "Support for extracting SELinux labels" + bool "Support extracting SELinux labels" default n depends on BUSYBOX_TAR && BUSYBOX_SELINUX help @@ -403,7 +400,31 @@ config BUSYBOX_UNZIP unzip will list or extract files from a ZIP archive, commonly found on DOS/WIN systems. The default behavior (with no options) is to extract the archive into the - current directory. Use the `-d' option to extract to a - directory of your choice. + current directory. + +config BUSYBOX_FEATURE_UNZIP_CDF + bool "Read and use Central Directory data" + default y + depends on BUSYBOX_UNZIP + help + If you know that you only need to deal with simple + ZIP files without deleted/updated files, SFX archives etc, + you can reduce code size by unselecting this option. + To support less trivial ZIPs, say Y. + +config BUSYBOX_FEATURE_UNZIP_BZIP2 + bool "Support compression method 12 (bzip2)" + default y + depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP + +config BUSYBOX_FEATURE_UNZIP_LZMA + bool "Support compression method 14 (lzma)" + default y + depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP + +config BUSYBOX_FEATURE_UNZIP_XZ + bool "Support compression method 95 (xz)" + default y + depends on BUSYBOX_FEATURE_UNZIP_CDF && BUSYBOX_DESKTOP endmenu diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in index ea2e77255..331a09af0 100644 --- a/config/busybox/console-tools/Config.in +++ b/config/busybox/console-tools/Config.in @@ -76,18 +76,14 @@ comment "Common options for loadfont and setfont" depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT config BUSYBOX_FEATURE_LOADFONT_PSF2 - bool "Support for PSF2 console fonts" + bool "Support PSF2 console fonts" default y depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT - help - Support PSF2 console fonts. config BUSYBOX_FEATURE_LOADFONT_RAW - bool "Support for old (raw) console fonts" + bool "Support old (raw) console fonts" default y depends on BUSYBOX_LOADFONT || BUSYBOX_SETFONT - help - Support old (raw) console fonts. config BUSYBOX_LOADKMAP bool "loadkmap" default y @@ -136,8 +132,6 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS - help - Support long options for the setconsole applet. config BUSYBOX_SETKEYCODES bool "setkeycodes" default y diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 91bfc115f..f8dd7b0aa 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -13,23 +13,19 @@ config BUSYBOX_BASENAME basename is used to strip the directory and suffix from filenames, leaving just the filename itself. Enable this option if you wish to enable the 'basename' utility. -config BUSYBOX_CAL - bool "cal" - default y - help - cal is used to display a monthly calendar. config BUSYBOX_CAT bool "cat" default y help cat is used to concatenate files and print them to the standard output. Enable this option if you wish to enable the 'cat' utility. -config BUSYBOX_CATV - bool "catv" + +config BUSYBOX_FEATURE_CATV + bool "cat -v[etA]" default y + depends on BUSYBOX_CAT help - Display nonprinting characters as escape sequences (like some - implementations' cat -v option). + Display nonprinting characters as escape sequences config BUSYBOX_CHGRP bool "chgrp" default y @@ -51,8 +47,6 @@ config BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_CHOWN && BUSYBOX_LONG_OPTS - help - Enable use of long options config BUSYBOX_CHROOT bool "chroot" default y @@ -77,11 +71,11 @@ config BUSYBOX_CP cp is used to copy files and directories. config BUSYBOX_FEATURE_CP_LONG_OPTIONS - bool "Enable long options for cp" + bool "Enable long options" default y depends on BUSYBOX_CP && BUSYBOX_LONG_OPTS help - Enable long options for cp. + Enable long options. Also add support for --parents option. config BUSYBOX_CUT bool "cut" @@ -163,7 +157,7 @@ config BUSYBOX_FEATURE_DD_IBS_OBS default y depends on BUSYBOX_DD help - Enables support for writing a certain number of bytes in and out, + Enable 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 @@ -171,7 +165,7 @@ config BUSYBOX_FEATURE_DD_STATUS default y depends on BUSYBOX_DD help - Enables support for status=noxfer/none option. + Enable support for status=noxfer/none option. config BUSYBOX_DF bool "df" default y @@ -184,11 +178,9 @@ config BUSYBOX_FEATURE_DF_FANCY default y depends on BUSYBOX_DF help - This option enables -a, -i and -B. - - -a Show all filesystems - -i Inodes - -B Blocksize + -a Show all filesystems + -i Inodes + -B Blocksize config BUSYBOX_DIRNAME bool "dirname" default y @@ -229,11 +221,9 @@ config BUSYBOX_ECHO # this entry also appears in shell/Config.in, next to the echo builtin config BUSYBOX_FEATURE_FANCY_ECHO - bool "Enable echo options (-n and -e)" + bool "Enable -n and -e options" default y - depends on BUSYBOX_ECHO || BUSYBOX_ASH_BUILTIN_ECHO || BUSYBOX_HUSH - help - This adds options (-n and -e) to echo. + depends on BUSYBOX_ECHO || BUSYBOX_ASH_ECHO || BUSYBOX_HUSH_ECHO config BUSYBOX_ENV bool "env" default y @@ -246,8 +236,6 @@ config BUSYBOX_FEATURE_ENV_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_ENV && BUSYBOX_LONG_OPTS - help - Support long options for the env applet. config BUSYBOX_EXPAND bool "expand" default y @@ -258,8 +246,6 @@ config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_EXPAND && BUSYBOX_LONG_OPTS - help - Support long options for the expand applet. config BUSYBOX_UNEXPAND bool "unexpand" @@ -271,8 +257,6 @@ config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_UNEXPAND && BUSYBOX_LONG_OPTS - help - Support long options for the unexpand applet. config BUSYBOX_EXPR bool "expr" default y @@ -288,6 +272,11 @@ config BUSYBOX_EXPR_MATH_SUPPORT_64 Enable 64-bit math support in the expr applet. This will make the applet slightly larger, but will allow computation with very large numbers. +config BUSYBOX_FACTOR + bool "factor" + default y + help + factor factorizes integers config BUSYBOX_FALSE bool "false" default y @@ -311,11 +300,9 @@ config BUSYBOX_HEAD from files. config BUSYBOX_FEATURE_FANCY_HEAD - bool "Enable head options (-c, -q, and -v)" + bool "Enable -c, -q, and -v" default y depends on BUSYBOX_HEAD - help - This enables the head options (-c, -q, and -v). config BUSYBOX_HOSTID bool "hostid" default y @@ -343,8 +330,11 @@ config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_INSTALL && BUSYBOX_LONG_OPTS +config BUSYBOX_LINK + bool "link" + default y help - Support long options for the install applet. + link creates hard links between files. config BUSYBOX_LN bool "ln" default y @@ -365,22 +355,21 @@ config BUSYBOX_FEATURE_LS_FILETYPES bool "Enable filetyping options (-p and -F)" default y depends on BUSYBOX_LS - help - Enable the ls options (-p and -F). config BUSYBOX_FEATURE_LS_FOLLOWLINKS bool "Enable symlinks dereferencing (-L)" default y depends on BUSYBOX_LS - help - Enable the ls option (-L). config BUSYBOX_FEATURE_LS_RECURSIVE bool "Enable recursion (-R)" default y depends on BUSYBOX_LS - help - Enable the ls option (-R). + +config BUSYBOX_FEATURE_LS_WIDTH + bool "Enable -w WIDTH and window size autodetection" + default y + depends on BUSYBOX_LS config BUSYBOX_FEATURE_LS_SORTFILES bool "Sort the file names" @@ -460,7 +449,6 @@ config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK help Enabling the -c options allows files to be checked against pre-calculated hash values. - -s and -w are useful options when verifying checksums. config BUSYBOX_MKDIR bool "mkdir" @@ -472,8 +460,6 @@ config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_MKDIR && BUSYBOX_LONG_OPTS - help - Support long options for the mkdir applet. config BUSYBOX_MKFIFO bool "mkfifo" default y @@ -486,6 +472,11 @@ config BUSYBOX_MKNOD help mknod is used to create FIFOs or block/character special files with the specified names. +config BUSYBOX_MKTEMP + bool "mktemp" + default y + help + mktemp is used to create unique temporary files config BUSYBOX_MV bool "mv" default y @@ -496,23 +487,37 @@ config BUSYBOX_FEATURE_MV_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_MV && BUSYBOX_LONG_OPTS - help - Support long options for the mv applet. config BUSYBOX_NICE bool "nice" default y help nice runs a program with modified scheduling priority. +config BUSYBOX_NL + bool "nl" + default y + help + nl is used to number lines of files. config BUSYBOX_NOHUP bool "nohup" default y help run a command immune to hangups, with output to a non-tty. +config BUSYBOX_NPROC + bool "nproc" + default y + help + Print number of CPUs config BUSYBOX_OD bool "od" default y help od is used to dump binary files in octal and other formats. +config BUSYBOX_PASTE + bool "paste" + default y + help + paste is used to paste lines of different files together + and write the result to stdout config BUSYBOX_PRINTENV bool "printenv" default y @@ -571,6 +576,11 @@ config BUSYBOX_SEQ default y help print a sequence of numbers +config BUSYBOX_SHRED + bool "shred" + default y + help + Overwrite a file to hide its contents, and optionally delete it config BUSYBOX_SHUF bool "shuf" default y @@ -624,7 +634,7 @@ config BUSYBOX_SPLIT bool "split" default y help - split a file into pieces. + Split a file into pieces. config BUSYBOX_FEATURE_SPLIT_FANCY bool "Fancy extensions" @@ -692,13 +702,12 @@ config BUSYBOX_TAIL from files. config BUSYBOX_FEATURE_FANCY_TAIL - bool "Enable extra tail options (-q, -s, -v, and -F)" + bool "Enable -q, -s, -v, and -F options" default y depends on BUSYBOX_TAIL help - The options (-q, -s, -v and -F) are provided by GNU tail, but - are not specific in the SUSv3 standard. - + These options are provided by GNU tail, but + are not specific in the SUSv3 standard: -q Never output headers giving file names -s SEC Wait SEC seconds between reads with -f -v Always output headers giving file names @@ -739,9 +748,15 @@ config BUSYBOX_TEST2 config BUSYBOX_FEATURE_TEST_64 bool "Extend test to 64 bit" default y - depends on BUSYBOX_TEST || BUSYBOX_TEST1 || BUSYBOX_TEST2 || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH + depends on BUSYBOX_TEST || BUSYBOX_TEST1 || BUSYBOX_TEST2 || BUSYBOX_ASH_TEST || BUSYBOX_HUSH_TEST help Enable 64-bit support in test. +config BUSYBOX_TIMEOUT + bool "timeout" + default y + help + Runs a program and watches it. If it does not terminate in + specified number of seconds, it is sent a signal. config BUSYBOX_TOUCH bool "touch" default y @@ -856,11 +871,11 @@ config BUSYBOX_WC in specified files. config BUSYBOX_FEATURE_WC_LARGE - bool "Support very large files in wc" + bool "Support very large counts" default y depends on BUSYBOX_WC help - Use "unsigned long long" in wc for counter variables. + Use "unsigned long long" for counter variables. config BUSYBOX_WHO bool "who" default y @@ -868,6 +883,13 @@ config BUSYBOX_WHO help who is used to show who is logged on. +config BUSYBOX_W + bool "w" + default y + depends on BUSYBOX_FEATURE_UTMP + help + w is used to show who is logged on. + config BUSYBOX_USERS bool "users" default y @@ -907,25 +929,11 @@ config BUSYBOX_FEATURE_PRESERVE_HARDLINKS help Allow cp and mv to preserve hard links. -comment "Common options for ls, more and telnet" - depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET - -config BUSYBOX_FEATURE_AUTOWIDTH - bool "Calculate terminal & column widths" - default y - depends on BUSYBOX_LS || BUSYBOX_MORE || BUSYBOX_TELNET - help - This option allows utilities such as 'ls', 'more' and 'telnet' - to determine the width of the screen, which can allow them to - display additional text or avoid wrapping text onto the next line. - If you leave this disabled, your utilities will be especially - primitive and will be unable to determine the current screen width. - comment "Common options for df, du, ls" depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS config BUSYBOX_FEATURE_HUMAN_READABLE - bool "Support for human readable output (example 13k, 23M, 235G)" + bool "Support human readable output (example 13k, 23M, 235G)" default y depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS help diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in index 632c36e25..12015e095 100644 --- a/config/busybox/debianutils/Config.in +++ b/config/busybox/debianutils/Config.in @@ -6,11 +6,6 @@ menu "Debian Utilities" -config BUSYBOX_MKTEMP - bool "mktemp" - default y - help - mktemp is used to create unique temporary files config BUSYBOX_PIPE_PROGRESS bool "pipe_progress" default y @@ -35,8 +30,6 @@ config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_RUN_PARTS && BUSYBOX_LONG_OPTS - help - Support long options for the run-parts applet. config BUSYBOX_FEATURE_RUN_PARTS_FANCY bool "Support additional arguments" @@ -54,22 +47,19 @@ config BUSYBOX_START_STOP_DAEMON termination of system-level processes, usually the ones started during the startup of the system. +config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS + config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" default y depends on BUSYBOX_START_STOP_DAEMON help - Support additional arguments. -o|--oknodo ignored since we exit with 0 anyway -v|--verbose -N|--nicelevel N - -config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS - bool "Enable long options" - default y - depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS - help - Support long options for the start-stop-daemon applet. config BUSYBOX_WHICH bool "which" default y diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in index 510cca5b1..30da5d05e 100644 --- a/config/busybox/editors/Config.in +++ b/config/busybox/editors/Config.in @@ -49,8 +49,6 @@ config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS - help - Enable use of long options. config BUSYBOX_FEATURE_DIFF_DIR bool "Enable directory support" @@ -87,7 +85,7 @@ config BUSYBOX_VI you may wish to use something else. config BUSYBOX_FEATURE_VI_MAX_LEN - int "Maximum screen width in vi" + int "Maximum screen width" range 256 16384 default 4096 depends on BUSYBOX_VI @@ -96,7 +94,7 @@ config BUSYBOX_FEATURE_VI_MAX_LEN Make it smaller than 4k only if you are very limited on memory. config BUSYBOX_FEATURE_VI_8BIT - bool "Allow vi to display 8-bit chars (otherwise shows dots)" + bool "Allow to display 8-bit chars (otherwise shows dots)" default n depends on BUSYBOX_VI help @@ -110,7 +108,7 @@ config BUSYBOX_FEATURE_VI_COLON default y depends on BUSYBOX_VI help - Enable a limited set of colon commands for vi. This does not + Enable a limited set of colon commands. This does not provide an "ex" mode. config BUSYBOX_FEATURE_VI_YANKMARK @@ -118,16 +116,14 @@ config BUSYBOX_FEATURE_VI_YANKMARK default y depends on BUSYBOX_VI help - This will enable you to use yank and put, as well as mark in - busybox vi. + This will enable you to use yank and put, as well as mark. config BUSYBOX_FEATURE_VI_SEARCH bool "Enable search and replace cmds" default y depends on BUSYBOX_VI help - Select this if you wish to be able to do search and replace in - busybox vi. + Select this if you wish to be able to do search and replace. config BUSYBOX_FEATURE_VI_REGEX_SEARCH bool "Enable regex in search and replace" @@ -141,16 +137,15 @@ config BUSYBOX_FEATURE_VI_USE_SIGNALS default y depends on BUSYBOX_VI help - Selecting this option will make busybox vi signal aware. This will - make busybox vi support SIGWINCH to deal with Window Changes, catch - Ctrl-Z and Ctrl-C and alarms. + Selecting this option will make vi signal aware. This will support + SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms. config BUSYBOX_FEATURE_VI_DOT_CMD bool "Remember previous cmd and \".\" cmd" default y depends on BUSYBOX_VI help - Make busybox vi remember the last command and be able to repeat it. + Make vi remember the last command and be able to repeat it. config BUSYBOX_FEATURE_VI_READONLY bool "Enable -R option and \"view\" mode" @@ -161,25 +156,23 @@ config BUSYBOX_FEATURE_VI_READONLY open a file in read-only mode. config BUSYBOX_FEATURE_VI_SETOPTS - bool "Enable set-able options, ai ic showmatch" + bool "Enable settable options, ai ic showmatch" default y depends on BUSYBOX_VI help Enable the editor to set some (ai, ic, showmatch) options. config BUSYBOX_FEATURE_VI_SET - bool "Support for :set" + bool "Support :set" default y depends on BUSYBOX_VI - help - Support for ":set". config BUSYBOX_FEATURE_VI_WIN_RESIZE bool "Handle window resize" default y depends on BUSYBOX_VI help - Make busybox vi behave nicely with terminals that get resized. + Behave nicely with terminals that get resized. config BUSYBOX_FEATURE_VI_ASK_TERMINAL bool "Use 'tell me cursor position' ESC sequence to measure window" @@ -190,15 +183,16 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL this option makes vi perform a last-ditch effort to find it: position cursor to 999,999 and ask terminal to report real cursor position using "ESC [ 6 n" escape sequence, then read stdin. - This is not clean but helps a lot on serial lines and such. + config BUSYBOX_FEATURE_VI_UNDO - bool "Support undo command 'u'" + bool "Support undo command \"u\"" default y depends on BUSYBOX_VI help Support the 'u' command to undo insertion, deletion, and replacement of text. + config BUSYBOX_FEATURE_VI_UNDO_QUEUE bool "Enable undo operation queuing" default y @@ -209,6 +203,7 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE reached, the contents of the queue are committed to the undo stack. This increases the size of the undo code and allows some undo operations (especially un-typing/backspacing) to be far more useful. + config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX int "Maximum undo character queue size" default 256 @@ -228,7 +223,7 @@ config BUSYBOX_FEATURE_ALLOW_EXEC default y depends on BUSYBOX_VI || BUSYBOX_AWK help - Enables vi and awk features which allows user to execute + Enables vi and awk features which allow user to execute shell commands (using system() C call). endmenu diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in index 26de6c83f..1a6a5d343 100644 --- a/config/busybox/findutils/Config.in +++ b/config/busybox/findutils/Config.in @@ -42,8 +42,6 @@ config BUSYBOX_FEATURE_FIND_PERM bool "Enable -perm: permissions matching" default y depends on BUSYBOX_FIND - help - Enable searching based on file permissions. config BUSYBOX_FEATURE_FIND_TYPE bool "Enable -type: file type matching (file/dir/link/...)" @@ -57,15 +55,11 @@ config BUSYBOX_FEATURE_FIND_XDEV bool "Enable -xdev: 'stay in filesystem'" default y depends on BUSYBOX_FIND - help - This option allows find to restrict searches to a single filesystem. config BUSYBOX_FEATURE_FIND_MAXDEPTH bool "Enable -mindepth N and -maxdepth N" default y depends on BUSYBOX_FIND - help - This option enables -mindepth N and -maxdepth N option. config BUSYBOX_FEATURE_FIND_NEWER bool "Enable -newer: compare file modification times" @@ -79,8 +73,6 @@ config BUSYBOX_FEATURE_FIND_INUM bool "Enable -inum: inode number matching" default y depends on BUSYBOX_FIND - help - Support the 'find -inum' option for searching by inode number. config BUSYBOX_FEATURE_FIND_EXEC bool "Enable -exec: execute commands" @@ -104,15 +96,11 @@ config BUSYBOX_FEATURE_FIND_USER bool "Enable -user: username/uid matching" default y depends on BUSYBOX_FIND - help - Support the 'find -user' option for searching by username or uid. config BUSYBOX_FEATURE_FIND_GROUP bool "Enable -group: group/gid matching" default y depends on BUSYBOX_FIND - help - Support the 'find -group' option for searching by group name or gid. config BUSYBOX_FEATURE_FIND_NOT bool "Enable the 'not' (!) operator" @@ -141,15 +129,13 @@ config BUSYBOX_FEATURE_FIND_SIZE bool "Enable -size: file size matching" default y depends on BUSYBOX_FIND - help - Support the 'find -size' option for searching by file size. config BUSYBOX_FEATURE_FIND_PRUNE bool "Enable -prune: exclude subdirectories" default y depends on BUSYBOX_FIND help - If the file is a directory, dont descend into it. Useful for + If the file is a directory, don't descend into it. Useful for exclusion .svn and CVS directories. config BUSYBOX_FEATURE_FIND_DELETE @@ -209,7 +195,7 @@ config BUSYBOX_FGREP config BUSYBOX_FEATURE_GREP_CONTEXT bool "Enable before and after context flags (-A, -B and -C)" default y - depends on BUSYBOX_GREP || BUSYBOX_EGREP + depends on BUSYBOX_GREP || BUSYBOX_EGREP || BUSYBOX_FGREP help Print the specified number of leading (-B) and/or trailing (-A) context surrounding our matching lines. diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in index 70bac7d4d..4c9e13671 100644 --- a/config/busybox/init/Config.in +++ b/config/busybox/init/Config.in @@ -89,7 +89,7 @@ config BUSYBOX_INIT init is the first program run when the system boots. config BUSYBOX_LINUXRC - bool "Support running init from within an initrd (not initramfs)" + bool "linuxrc: support running init from initrd (not initramfs)" default y select BUSYBOX_FEATURE_SYSLOG help @@ -145,13 +145,15 @@ config BUSYBOX_FEATURE_INIT_SYSLOG bool "Enable init to write to syslog" default y depends on BUSYBOX_INIT || BUSYBOX_LINUXRC + help + If selected, some init messages are sent to syslog. + Otherwise, they are sent to VT #5 if linux virtual tty is detected + (if not, no separate logging is done). -config BUSYBOX_FEATURE_EXTRA_QUIET - bool "Be _extra_ quiet on boot" +config BUSYBOX_FEATURE_INIT_QUIET + bool "Be quiet on boot (no 'init started:' message)" default y depends on BUSYBOX_INIT || BUSYBOX_LINUXRC - help - Prevent init from logging some messages to the console during boot. config BUSYBOX_FEATURE_INIT_COREDUMPS bool "Support dumping core for child processes (debugging only)" @@ -176,36 +178,18 @@ config BUSYBOX_INIT_TERMINAL_TYPE sets TERM to "vt102" if one is found. config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE - bool "Modify the command-line to \"init\"" + bool "Clear init's command line" default y depends on BUSYBOX_INIT || BUSYBOX_LINUXRC help When launched as PID 1 and after parsing its arguments, init wipes all the arguments but argv[0] and rewrites argv[0] to - contain only "init", so that its command-line appears solely as + contain only "init", so that its command line appears solely as "init" in tools such as ps. If this option is set to Y, init will keep its original behavior, otherwise, all the arguments including argv[0] will be preserved, be they parsed or ignored by init. The original command-line used to launch init can then be retrieved in /proc/1/cmdline on Linux, for example. -config BUSYBOX_MESG - bool "mesg" - default y - help - Mesg controls access to your terminal by others. It is typically - used to allow or disallow other users to write to your terminal - -config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP - bool "Enable writing to tty only by group, not by everybody" - default y - depends on BUSYBOX_MESG - help - Usually, ttys are owned by group "tty", and "write" tool is - setgid to this group. This way, "mesg y" only needs to enable - "write by owning group" bit in tty mode. - - If you set this option to N, "mesg y" will enable writing - by anybody at all. This is not recommended. endmenu diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index 967442436..600f089ef 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -108,24 +108,13 @@ config BUSYBOX_FEATURE_FAST_TOP but code size is slightly bigger. config BUSYBOX_FEATURE_ETC_NETWORKS - bool "Support for /etc/networks" + bool "Support /etc/networks" default n help Enable support for network names in /etc/networks. This is a rarely used feature which allows you to use names instead of IP/mask pairs in route command. -config BUSYBOX_FEATURE_USE_TERMIOS - bool "Use termios to manipulate the screen" - default y - depends on BUSYBOX_MORE || BUSYBOX_TOP || BUSYBOX_POWERTOP - help - This option allows utilities such as 'more' and 'top' to determine - the size of the screen. If you leave this disabled, your utilities - that display things on the screen will be especially primitive and - will be unable to determine the current screen size, and will be - unable to move the cursor. - config BUSYBOX_FEATURE_EDITING bool "Command line editing" default y @@ -185,15 +174,11 @@ config BUSYBOX_FEATURE_TAB_COMPLETION bool "Tab completion" default y depends on BUSYBOX_FEATURE_EDITING - help - Enable tab completion. config BUSYBOX_FEATURE_USERNAME_COMPLETION bool "Username completion" default y depends on BUSYBOX_FEATURE_TAB_COMPLETION - help - Enable username completion. config BUSYBOX_FEATURE_EDITING_FANCY_PROMPT bool "Fancy shell prompts" diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in index fb3edd1d4..11dd33b1b 100644 --- a/config/busybox/loginutils/Config.in +++ b/config/busybox/loginutils/Config.in @@ -7,7 +7,7 @@ menu "Login/Password Management Utilities" config BUSYBOX_FEATURE_SHADOWPASSWDS - bool "Support for shadow passwords" + bool "Support shadow passwords" default y help Build support for shadow password in /etc/shadow. This file is only @@ -113,15 +113,13 @@ config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS - help - Support long options for the addgroup applet. config BUSYBOX_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" + bool "Support adding users to groups" default y depends on BUSYBOX_ADDGROUP help - If called with two non-option arguments, + If called with two non-option arguments, addgroup will add an existing user to an existing group. config BUSYBOX_ADDUSER @@ -134,8 +132,6 @@ config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS - help - Support long options for the adduser applet. config BUSYBOX_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" @@ -179,9 +175,9 @@ config BUSYBOX_CHPASSWD and uses this information to update a group of existing users. config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO - string "Default password encryption method (passwd -a, cryptpw -m parameter)" + string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)" default "des" - depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW + depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD help Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". config BUSYBOX_CRYPTPW @@ -211,7 +207,7 @@ config BUSYBOX_DELGROUP Utility for deleting a group account. config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups" + bool "Support removing users from groups" default y depends on BUSYBOX_DELGROUP help @@ -257,7 +253,7 @@ config BUSYBOX_LOGIN_SESSION_AS_CHILD will not be cleaned up. config BUSYBOX_LOGIN_SCRIPTS - bool "Support for login scripts" + bool "Support login scripts" depends on BUSYBOX_LOGIN default y help @@ -265,7 +261,7 @@ config BUSYBOX_LOGIN_SCRIPTS just prior to switching from root to logged-in user. config BUSYBOX_FEATURE_NOLOGIN - bool "Support for /etc/nologin" + bool "Support /etc/nologin" default y depends on BUSYBOX_LOGIN help @@ -273,7 +269,7 @@ config BUSYBOX_FEATURE_NOLOGIN If it exists, non-root logins are prohibited. config BUSYBOX_FEATURE_SECURETTY - bool "Support for /etc/securetty" + bool "Support /etc/securetty" default y depends on BUSYBOX_LOGIN help @@ -306,19 +302,23 @@ config BUSYBOX_SU help su is used to become another user during a login session. Invoked without a username, su defaults to becoming the super user. - - Note that Busybox binary must be setuid root for this applet to + Note that busybox binary must be setuid root for this applet to work properly. config BUSYBOX_FEATURE_SU_SYSLOG - bool "Enable su to write to syslog" + bool "Log to syslog all attempts to use su" default y depends on BUSYBOX_SU config BUSYBOX_FEATURE_SU_CHECKS_SHELLS - bool "Enable su to check user's shell to be listed in /etc/shells" - depends on BUSYBOX_SU + bool "If user's shell is not in /etc/shells, disallow -s PROG" default y + depends on BUSYBOX_SU + +config BUSYBOX_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY + bool "Allow blank passwords only on TTYs in /etc/securetty" + default n + depends on BUSYBOX_SU config BUSYBOX_SULOGIN bool "sulogin" default y diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 311003f8e..6255c42f3 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -42,7 +42,7 @@ config BUSYBOX_BEEP config BUSYBOX_FEATURE_BEEP_FREQ int "default frequency" - range 0 2147483647 + range 20 50000 # allowing 0 here breaks the build default 4000 depends on BUSYBOX_BEEP help @@ -121,12 +121,6 @@ config BUSYBOX_FEATURE_CHAT_CLR_ABORT default y help Support CLR_ABORT directive. -config BUSYBOX_CHRT - bool "chrt" - default y - help - manipulate real-time attributes of a process. - This requires sched_{g,s}etparam support in your libc. config BUSYBOX_CONSPY bool "conspy" default y @@ -220,7 +214,7 @@ config BUSYBOX_DEVFSD_MODLOAD the external modutils. config BUSYBOX_DEVFSD_FG_NP - bool "Enables the -fg and -np options" + bool "Enable the -fg and -np options" default y depends on BUSYBOX_DEVFSD help @@ -253,20 +247,6 @@ config BUSYBOX_DEVMEM help devmem is a small program that reads and writes from physical memory using /dev/mem. -config BUSYBOX_EJECT - bool "eject" - default y - select BUSYBOX_PLATFORM_LINUX - help - Used to eject cdroms. (defaults to /dev/cdrom) - -config BUSYBOX_FEATURE_EJECT_SCSI - bool "SCSI support" - default y - depends on BUSYBOX_EJECT - help - Add the -s option to eject, this allows to eject SCSI-Devices and - usb-storage devices. config BUSYBOX_FBSPLASH bool "fbsplash" default y @@ -327,7 +307,7 @@ config BUSYBOX_FEATURE_HDPARM_GET_IDENTITY default y depends on BUSYBOX_HDPARM help - Enables the -I and -i options to obtain detailed information + Enable the -I and -i options to obtain detailed information directly from drives about their capabilities and supported ATA feature set. If no device name is specified, hdparm will read identify data from stdin. Enabling this option will add about 16k... @@ -337,7 +317,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF default y depends on BUSYBOX_HDPARM help - Enables the 'hdparm -R' option to register an IDE interface. + Enable the 'hdparm -R' option to register an IDE interface. This is dangerous stuff, so you should probably say N. config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF @@ -345,7 +325,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF default y depends on BUSYBOX_HDPARM help - Enables the 'hdparm -U' option to un-register an IDE interface. + Enable the 'hdparm -U' option to un-register an IDE interface. This is dangerous stuff, so you should probably say N. config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET @@ -353,7 +333,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET default y depends on BUSYBOX_HDPARM help - Enables the 'hdparm -w' option to perform a device reset. + Enable the 'hdparm -w' option to perform a device reset. This is dangerous stuff, so you should probably say N. config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF @@ -361,7 +341,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF default y depends on BUSYBOX_HDPARM help - Enables the 'hdparm -x' option to tristate device for hotswap, + Enable the 'hdparm -x' option to tristate device for hotswap, and the '-b' option to get/set bus state. This is dangerous stuff, so you should probably say N. @@ -370,7 +350,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA default y depends on BUSYBOX_HDPARM help - Enables the 'hdparm -d' option to get/set using_dma flag. + Enable the 'hdparm -d' option to get/set using_dma flag. config BUSYBOX_I2CGET bool "i2cget" default y @@ -405,27 +385,6 @@ config BUSYBOX_INOTIFYD help Simple inotify daemon. Reports filesystem changes. Requires kernel >= 2.6.13 -config BUSYBOX_IONICE - bool "ionice" - default y - select BUSYBOX_PLATFORM_LINUX - help - Set/set program io scheduling class and priority - Requires kernel >= 2.6.13 -config BUSYBOX_LAST - bool "last" - default y - depends on BUSYBOX_FEATURE_WTMP - help - 'last' displays a list of the last users that logged into the system. - -config BUSYBOX_FEATURE_LAST_FANCY - bool "Turn on output of extra information" - default y - depends on BUSYBOX_LAST - help - 'last' displays detailed information about the last users that - logged into the system (mimics sysvinit last). +900 bytes. config BUSYBOX_LESS bool "less" default y @@ -492,7 +451,6 @@ config BUSYBOX_FEATURE_LESS_ASK_TERMINAL this option makes less perform a last-ditch effort to find it: position cursor to 999,999 and ask terminal to report real cursor position using "ESC [ 6 n" escape sequence, then read stdin. - This is not clean but helps a lot on serial lines and such. config BUSYBOX_FEATURE_LESS_DASHCMD @@ -504,11 +462,18 @@ config BUSYBOX_FEATURE_LESS_DASHCMD less itself ('-' keyboard command). config BUSYBOX_FEATURE_LESS_LINENUMS - bool "Enable dynamic switching of line numbers" + bool "Enable -N (dynamic switching of line numbers)" default y depends on BUSYBOX_FEATURE_LESS_DASHCMD +config BUSYBOX_LSSCSI + bool "lsscsi" + default y + #select PLATFORM_LINUX help - Enables "-N" command. + lsscsi is a utility for displaying information about SCSI buses in the + system and devices connected to them. + + This version uses sysfs (/sys/bus/scsi/devices) only. config BUSYBOX_MAKEDEVS bool "makedevs" default y @@ -550,11 +515,6 @@ config BUSYBOX_MICROCOM default y help The poor man's minicom utility for chatting with serial port devices. -config BUSYBOX_MOUNTPOINT - bool "mountpoint" - default y - help - mountpoint checks if the directory is a mountpoint. config BUSYBOX_MT bool "mt" default y @@ -575,6 +535,12 @@ config BUSYBOX_NANDDUMP select BUSYBOX_PLATFORM_LINUX help Dump the content of raw NAND chip +config BUSYBOX_PARTPROBE + bool "partprobe" + default y + select BUSYBOX_PLATFORM_LINUX + help + Ask kernel to rescan partition table. config BUSYBOX_RAIDAUTORUN bool "raidautorun" default y @@ -632,32 +598,12 @@ config BUSYBOX_SETSERIAL select BUSYBOX_PLATFORM_LINUX help Retrieve or set Linux serial port. -config BUSYBOX_SETSID - bool "setsid" - default y - help - setsid runs a program in a new session config BUSYBOX_STRINGS bool "strings" default y help strings prints the printable character sequences for each file specified. -config BUSYBOX_TASKSET - bool "taskset" - default n # doesn't build on some non-x86 targets (m68k) - help - Retrieve or set a processes's CPU affinity. - This requires sched_{g,s}etaffinity support in your libc. - -config BUSYBOX_FEATURE_TASKSET_FANCY - bool "Fancy output" - default y - depends on BUSYBOX_TASKSET - help - Add code for fancy output. This merely silences a compiler-warning - and adds about 135 Bytes. May be needed for machines with alot - of CPUs. config BUSYBOX_TIME bool "time" default y @@ -665,12 +611,6 @@ config BUSYBOX_TIME The time command runs the specified program with the given arguments. When the command finishes, time writes a message to standard output giving timing statistics about this program run. -config BUSYBOX_TIMEOUT - bool "timeout" - default y - help - Runs a program and watches it. If it does not terminate in - specified number of seconds, it is sent a signal. config BUSYBOX_TTYSIZE bool "ttysize" default y @@ -731,12 +671,6 @@ config BUSYBOX_VOLNAME default y help Prints a CD-ROM volume name. -config BUSYBOX_WALL - bool "wall" - default y - depends on BUSYBOX_FEATURE_UTMP - help - Write a message to all users that are logged in. config BUSYBOX_WATCHDOG bool "watchdog" default y diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in index 62e1ee439..98f0e9b05 100644 --- a/config/busybox/modutils/Config.in +++ b/config/busybox/modutils/Config.in @@ -9,9 +9,11 @@ menu "Linux Module Utilities" config BUSYBOX_MODPROBE_SMALL bool "Simplified modutils" default y - select BUSYBOX_PLATFORM_LINUX help - Simplified modutils. + Build smaller (~1.5 kbytes), simplified module tools. + + This option by itself does not enable any applets - + you need to select applets individually below. With this option modprobe does not require modules.dep file and does not use /etc/modules.conf file. @@ -32,11 +34,6 @@ config BUSYBOX_MODPROBE_SMALL Additional module parameters can be stored in /etc/modules/$module_name files. - Apart from modprobe, other utilities are also provided: - - insmod is an alias to modprobe - - rmmod is an alias to modprobe -r - - depmod generates modules.dep.bb - config BUSYBOX_DEPMOD bool "depmod" default y @@ -62,7 +59,6 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT bool "Pretty output" default y depends on BUSYBOX_LSMOD && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX help This option makes output format of lsmod adjusted to the format of module-init-tools for Linux kernel 2.6. @@ -73,20 +69,6 @@ config BUSYBOX_MODINFO select BUSYBOX_PLATFORM_LINUX help Show information about a Linux Kernel module -config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE - bool "Accept module options on modprobe command line" - default y - depends on BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX - help - Allow insmod and modprobe take module options from command line. - -config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED - bool "Skip loading of already loaded modules" - default y - depends on BUSYBOX_MODPROBE_SMALL - help - Check if the module is already loaded. config BUSYBOX_MODPROBE bool "modprobe" default y @@ -99,7 +81,6 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST bool "Blacklist support" default y depends on BUSYBOX_MODPROBE && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX help Say 'y' here to enable support for the 'blacklist' command in modprobe.conf. This prevents the alias resolver to resolve @@ -115,38 +96,34 @@ config BUSYBOX_RMMOD comment "Options common to multiple modutils" +config BUSYBOX_FEATURE_CMDLINE_MODULE_OPTIONS + bool "Accept module options on modprobe command line" + default y + depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE + help + Allow insmod and modprobe take module options from the applets' + command line. + +config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED + bool "Skip loading of already loaded modules" + default y + depends on BUSYBOX_MODPROBE_SMALL && (BUSYBOX_DEPMOD || BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + help + Check if the module is already loaded. + config BUSYBOX_FEATURE_2_4_MODULES bool "Support version 2.2/2.4 Linux kernels" default n - depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_INSMOD || BUSYBOX_LSMOD || BUSYBOX_MODPROBE || BUSYBOX_RMMOD) && !BUSYBOX_MODPROBE_SMALL help Support module loading for 2.2.x and 2.4.x Linux kernels. This increases size considerably. Say N unless you plan to run ancient kernels. -config BUSYBOX_FEATURE_INSMOD_TRY_MMAP - bool "Try to load module from a mmap'ed area" - default n - depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX - help - This option causes module loading code to try to mmap - module first. If it does not work (for example, - it does not work for compressed modules), module will be read - (and unpacked if needed) into a memory block allocated by malloc. - - The only case when mmap works but malloc does not is when - you are trying to load a big module on a very memory-constrained - machine. Malloc will momentarily need 2x as much memory as mmap. - - Choosing N saves about 250 bytes of code (on 32-bit x86). - config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING bool "Enable module version checking" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help Support checking of versions for modules. This is used to ensure that the kernel and module are made for each other. @@ -155,10 +132,9 @@ config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help By adding module symbols to the kernel symbol table, Oops messages - occuring within kernel modules can be properly debugged. By enabling + occurring within kernel modules can be properly debugged. By enabling this feature, module symbols will always be added to the kernel symbol table for proper debugging support. If you are not interested in Oops messages from kernel modules, say N. @@ -167,7 +143,6 @@ config BUSYBOX_FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help This is a special uClinux only memory optimization that lets insmod load the specified kernel module directly into kernel space, reducing @@ -178,7 +153,6 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP bool "Enable insmod load map (-m) option" default n depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD - select BUSYBOX_PLATFORM_LINUX help Enabling this, one would be able to get a load map output on stdout. This makes kernel module debugging @@ -189,8 +163,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default y - depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX + depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP help Without this option, -m will only output section load map. With this option, -m will also output @@ -200,18 +173,32 @@ config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your support request. This option is required to support GPLONLY modules. +config BUSYBOX_FEATURE_INSMOD_TRY_MMAP + bool "Try to load module from a mmap'ed area" + default n + depends on (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL + help + This option causes module loading code to try to mmap + module first. If it does not work (for example, + it does not work for compressed modules), module will be read + (and unpacked if needed) into a memory block allocated by malloc. + + The only case when mmap works but malloc does not is when + you are trying to load a big module on a very memory-constrained + machine. Malloc will momentarily need 2x as much memory as mmap. + + Choosing N saves about 250 bytes of code (on 32-bit x86). + config BUSYBOX_FEATURE_MODUTILS_ALIAS - bool "Support for module.aliases file" + bool "Support module.aliases file" default y - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL help Generate and parse modules.alias containing aliases for bus identifiers: @@ -225,10 +212,9 @@ config BUSYBOX_FEATURE_MODUTILS_ALIAS Say Y if unsure. config BUSYBOX_FEATURE_MODUTILS_SYMBOLS - bool "Support for module.symbols file" + bool "Support module.symbols file" default y - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL help Generate and parse modules.symbols containing aliases for symbol_request() kernel calls, such as: @@ -239,7 +225,7 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS config BUSYBOX_DEFAULT_MODULES_DIR string "Default directory containing modules" default "/lib/modules" - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO help Directory that contains kernel modules. Defaults to "/lib/modules" @@ -247,9 +233,13 @@ config BUSYBOX_DEFAULT_MODULES_DIR config BUSYBOX_DEFAULT_DEPMOD_FILE string "Default name of modules.dep" default "modules.dep" - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO help Filename that contains kernel modules dependencies. - Defaults to "modules.dep" + Defaults to "modules.dep". + If you configured the "simplified modutils" (MODPROBE_SMALL), a + ".bb" suffix will be added after this name. Do not specify ".bb" + here unless you intend your depmod or modprobe to work on + "modules.dep.bb.bb" or such. endmenu diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index fa6a318d4..b859cb9f3 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -101,7 +101,7 @@ config BUSYBOX_FTPD bool "ftpd" default y help - simple FTP daemon. You have to run it via inetd. + Simple FTP daemon. You have to run it via inetd. config BUSYBOX_FEATURE_FTPD_WRITE bool "Enable upload commands" @@ -143,8 +143,6 @@ config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" default y depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT) - help - Support long options for the ftpget/ftpput applet. config BUSYBOX_HOSTNAME bool "hostname" default y @@ -160,7 +158,7 @@ config BUSYBOX_HTTPD bool "httpd" default y help - Serve web pages via an HTTP server. + HTTP server. config BUSYBOX_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" @@ -214,7 +212,7 @@ config BUSYBOX_FEATURE_HTTPD_CGI when specific URLs are requested. config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR - bool "Support for running scripts through an interpreter" + bool "Support running scripts through an interpreter" default y depends on BUSYBOX_FEATURE_HTTPD_CGI help @@ -243,7 +241,7 @@ config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR "<Hello World>". config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES - bool "Support for custom error pages" + bool "Support custom error pages" default y depends on BUSYBOX_HTTPD help @@ -256,7 +254,7 @@ config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES message. config BUSYBOX_FEATURE_HTTPD_PROXY - bool "Support for reverse proxy" + bool "Support reverse proxy" default y depends on BUSYBOX_HTTPD help @@ -268,7 +266,7 @@ config BUSYBOX_FEATURE_HTTPD_PROXY http://hostname[:port]/new/path/myfile. config BUSYBOX_FEATURE_HTTPD_GZIP - bool "Support for GZIP content encoding" + bool "Support GZIP content encoding" default y depends on BUSYBOX_HTTPD help @@ -383,14 +381,14 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP utilities, or enable these applets in Busybox. config BUSYBOX_FEATURE_IFUPDOWN_IPV4 - bool "Support for IPv4" + bool "Support IPv4" default y depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN help If you want ifup/ifdown to talk IPv4, leave this on. config BUSYBOX_FEATURE_IFUPDOWN_IPV6 - bool "Support for IPv6" + bool "Support IPv6" default y depends on (BUSYBOX_IFUP || BUSYBOX_IFDOWN) && BUSYBOX_FEATURE_IPV6 help @@ -406,7 +404,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING a weird network setup you don't need it. config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP - bool "Support for external dhcp clients" + bool "Support external DHCP clients" default n depends on BUSYBOX_IFUP || BUSYBOX_IFDOWN help @@ -585,6 +583,11 @@ config BUSYBOX_IPCALC ipcalc takes an IP address and netmask and calculates the resulting broadcast, network, and host range. +config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS + config BUSYBOX_FEATURE_IPCALC_FANCY bool "Fancy IPCALC, more options, adds 1 kbyte" default y @@ -592,13 +595,6 @@ config BUSYBOX_FEATURE_IPCALC_FANCY help Adds the options hostname, prefix and silent to the output of "ipcalc". - -config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS - bool "Enable long options" - default y - depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS - help - Support long options for the ipcalc applet. config BUSYBOX_FAKEIDENTD bool "fakeidentd" default y @@ -680,7 +676,7 @@ config BUSYBOX_NETSTAT netstat prints information about the Linux networking subsystem. config BUSYBOX_FEATURE_NETSTAT_WIDE - bool "Enable wide netstat output" + bool "Enable wide output" default y depends on BUSYBOX_NETSTAT help @@ -761,6 +757,12 @@ config BUSYBOX_SLATTACH help slattach is a small utility to attach network interfaces to serial lines. +config BUSYBOX_SSL_CLIENT + bool "ssl_client" + default y + select BUSYBOX_TLS + help + This tool pipes data to/from a socket, TLS-encrypting it. config BUSYBOX_TCPSVD bool "tcpsvd" default y @@ -799,6 +801,11 @@ config BUSYBOX_FEATURE_TELNET_AUTOLOGIN remote host you are connecting to. This is useful when you need to log into a machine without telling the username (autologin). This option enables `-a' and `-l USER' arguments. + +config BUSYBOX_FEATURE_TELNET_WIDTH + bool "Enable window size autodetection" + default y + depends on BUSYBOX_TELNET config BUSYBOX_TELNETD bool "telnetd" default y @@ -918,11 +925,9 @@ config BUSYBOX_FEATURE_TFTP_BLOCKSIZE "blksize" and "tsize" options. config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR - bool "Enable tftp progress meter" + bool "Enable progress bar" default y depends on BUSYBOX_TFTP && BUSYBOX_FEATURE_TFTP_BLOCKSIZE - help - Show progress bar. config BUSYBOX_TFTP_DEBUG bool "Enable debug" @@ -931,6 +936,9 @@ config BUSYBOX_TFTP_DEBUG help Make tftp[d] print debugging messages on stderr. This is useful if you are diagnosing a bug in tftp[d]. +config BUSYBOX_TLS + bool #No description makes it a hidden option + default n config BUSYBOX_TRACEROUTE bool "traceroute" default y @@ -957,8 +965,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP bool "Enable -I option (use ICMP instead of UDP)" default y depends on BUSYBOX_TRACEROUTE || BUSYBOX_TRACEROUTE6 - help - Add option -I to use ICMP ECHO instead of UDP datagrams. config BUSYBOX_TUNCTL bool "tunctl" default y @@ -986,12 +992,15 @@ config BUSYBOX_WGET wget is a utility for non-interactive download of files from HTTP and FTP servers. +config BUSYBOX_FEATURE_WGET_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS + config BUSYBOX_FEATURE_WGET_STATUSBAR - bool "Enable a nifty process meter (+2k)" + bool "Enable progress bar (+2k)" default y depends on BUSYBOX_WGET - help - Enable the transfer progress bar for wget transfers. config BUSYBOX_FEATURE_WGET_AUTHENTICATION bool "Enable HTTP authentication" @@ -1000,13 +1009,6 @@ config BUSYBOX_FEATURE_WGET_AUTHENTICATION help Support authenticated HTTP transfers. -config BUSYBOX_FEATURE_WGET_LONG_OPTIONS - bool "Enable long options" - default y - depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS - help - Support long options for the wget applet. - config BUSYBOX_FEATURE_WGET_TIMEOUT bool "Enable timeout option -T SEC" default y @@ -1021,18 +1023,59 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option will work in addition to -T. +config BUSYBOX_FEATURE_WGET_HTTPS + bool "Support HTTPS using internal TLS code" + default y + depends on BUSYBOX_WGET + select BUSYBOX_TLS + help + wget will use internal TLS code to connect to https:// URLs. + Note: + On NOMMU machines, ssl_helper applet should be available + in the $PATH for this to work. Make sure to select that applet. + + Note: currently, TLS code only makes TLS I/O work, it + does *not* check that the peer is who it claims to be, etc. + IOW: it uses peer-supplied public keys to establish encryption + and signing keys, then encrypts and signs outgoing data and + decrypts incoming data. + It does not check signature hashes on the incoming data: + this means that attackers manipulating TCP packets can + send altered data and we unknowingly receive garbage. + (This check might be relatively easy to add). + It does not check public key's certificate: + this means that the peer may be an attacker impersonating + the server we think we are talking to. + + If you think this is unacceptable, consider this. As more and more + servers switch to HTTPS-only operation, without such "crippled" + TLS code it is *impossible* to simply download a kernel source + from kernel.org. Which can in real world translate into + "my small automatic tooling to build cross-compilers from sources + no longer works, I need to additionally keep a local copy + of ~4 megabyte source tarball of a SSL library and ~2 megabyte + source "config/busybox/of wget, need to compile and built both before I can" + download anything. All this despite the fact that the build + is done in a QEMU sandbox on a machine with absolutely nothing + worth stealing, so I don't care if someone would go to a lot + of trouble to intercept my HTTPS download to send me an altered + kernel tarball". + + If you still think this is unacceptable, send patches. + + If you still think this is unacceptable, do not want to send + patches, but do want to waste bandwidth expaining how wrong + it is, you will be ignored. + 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. + Try to use openssl to handle HTTPS. OpenSSL has a simple SSL client for debug purposes. - If you select "openssl" helper, wget will effectively run: + If you select this option, wget will effectively run: "openssl s_client -quiet -connect hostname:443 -servername hostname 2>/dev/null" and pipe its data through it. -servername is not used if hostname is numeric. @@ -1045,24 +1088,9 @@ config BUSYBOX_FEATURE_WGET_OPENSSL 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/ + If openssl can't be executed, internal TLS code will be used + (if you enabled it); if openssl can be executed but fails later, + wget can't detect this, and download will fail. config BUSYBOX_WHOIS bool "whois" default y diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in index 4be268aac..75dd99c09 100644 --- a/config/busybox/networking/udhcp/Config.in +++ b/config/busybox/networking/udhcp/Config.in @@ -5,35 +5,43 @@ # config BUSYBOX_UDHCPC6 - bool "udhcp client for DHCPv6 (udhcpc6)" + bool "udhcpc6 (DHCPv6 client, EXPERIMENTAL)" default n # not yet ready depends on BUSYBOX_FEATURE_IPV6 help udhcpc6 is a DHCPv6 client -config BUSYBOX_UDHCPD - bool "udhcp server (udhcpd)" +config BUSYBOX_FEATURE_UDHCPC6_RFC3646 + bool "Support RFC 3646 (DNS server and search list)" default y - select BUSYBOX_PLATFORM_LINUX + depends on BUSYBOX_UDHCPC6 help - udhcpd is a DHCP server geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. + List of DNS servers and domain search list can be requested with + "-O dns" and "-O search". If server gives these values, + they will be set in environment variables "dns" and "search". -config BUSYBOX_DHCPRELAY - bool "dhcprelay" +config BUSYBOX_FEATURE_UDHCPC6_RFC4704 + bool "Support RFC 4704 (Client FQDN)" default y + depends on BUSYBOX_UDHCPC6 help - dhcprelay listens for dhcp requests on one or more interfaces - and forwards these requests to a different interface or dhcp - server. + You can request FQDN to be given by server using "-O fqdn". -config BUSYBOX_DUMPLEASES - bool "Lease display utility (dumpleases)" +config BUSYBOX_FEATURE_UDHCPC6_RFC4833 + bool "Support RFC 4833 (Timezones)" default y + depends on BUSYBOX_UDHCPC6 help - dumpleases displays the leases written out by the udhcpd server. - Lease times are stored in the file by time remaining in lease, or - by the absolute time that it expires in seconds from epoch. + You can request POSIX timezone with "-O tz" and timezone name + with "-O timezone". + +config BUSYBOX_UDHCPD + bool "udhcpd (DHCP server)" + default y + select BUSYBOX_PLATFORM_LINUX + help + udhcpd is a DHCP server geared primarily toward embedded systems, + while striving to be fully functional and RFC compliant. config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY bool "Rewrite the lease file at every new acknowledge" @@ -67,8 +75,24 @@ config BUSYBOX_DHCPD_LEASES_FILE udhcpd stores addresses in a lease file. This is the absolute path of the file. Normally it is safe to leave it untouched. +config BUSYBOX_DUMPLEASES + bool "dumpleases" + default y + help + dumpleases displays the leases written out by the udhcpd. + Lease times are stored in the file by time remaining in lease, or + by the absolute time that it expires in seconds from epoch. + +config BUSYBOX_DHCPRELAY + bool "dhcprelay" + default y + help + dhcprelay listens for dhcp requests on one or more interfaces + and forwards these requests to a different interface or dhcp + server. + config BUSYBOX_UDHCPC - bool "udhcp client (udhcpc)" + bool "udhcpc (DHCP client)" default y select BUSYBOX_PLATFORM_LINUX help @@ -99,6 +123,15 @@ config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT they will be replaced with string "bad" when exporting to the environment. +config BUSYBOX_UDHCPC_DEFAULT_SCRIPT + string "Absolute path to config script" + default "/usr/share/udhcpc/default.script" + depends on BUSYBOX_UDHCPC + help + This script is called after udhcpc receives an answer. See + examples/udhcp for a working example. Normally it is safe + to leave this untouched. + config BUSYBOX_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default n @@ -120,7 +153,7 @@ config BUSYBOX_UDHCP_DEBUG are very verbose and useful for debugging only. config BUSYBOX_FEATURE_UDHCP_RFC3397 - bool "Support for RFC3397 domain search (experimental)" + bool "Support RFC3397 domain search (experimental)" default y depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC help @@ -129,22 +162,13 @@ config BUSYBOX_FEATURE_UDHCP_RFC3397 and SIP servers option 120, specified in RFC 3361. config BUSYBOX_FEATURE_UDHCP_8021Q - bool "Support for 802.1Q VLAN parameters" + bool "Support 802.1Q VLAN parameters" default y depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC help If selected, both client and server will support passing of VLAN ID and priority via options 132 and 133 as per 802.1Q. -config BUSYBOX_UDHCPC_DEFAULT_SCRIPT - string "Absolute path to config script" - default "/usr/share/udhcpc/default.script" - depends on BUSYBOX_UDHCPC - help - This script is called after udhcpc receives an answer. See - examples/udhcp for a working example. Normally it is safe - to leave this untouched. - config BUSYBOX_UDHCPC_SLACK_FOR_BUGGY_SERVERS int "DHCP options slack buffer size" default 80 diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in index 783d3bfc6..da93002bd 100644 --- a/config/busybox/procps/Config.in +++ b/config/busybox/procps/Config.in @@ -85,18 +85,18 @@ config BUSYBOX_PIDOF those id's on the standard output. config BUSYBOX_FEATURE_PIDOF_SINGLE - bool "Enable argument for single shot (-s)" + bool "Enable single shot (-s)" default y depends on BUSYBOX_PIDOF help - Support argument '-s' for returning only the first pid found. + Support '-s' for returning only the first pid found. config BUSYBOX_FEATURE_PIDOF_OMIT - bool "Enable argument for omitting pids (-o)" + bool "Enable omitting pids (-o PID)" default y depends on BUSYBOX_PIDOF help - Support argument '-o' for omitting the given pids in output. + Support '-o PID' for omitting the given pid(s) in output. The special pid %PPID can be used to name the parent process of the pidof, in other words the calling shell or shell script. config BUSYBOX_PMAP @@ -109,6 +109,14 @@ config BUSYBOX_POWERTOP default y help Analyze power consumption on Intel-based laptops + +config BUSYBOX_FEATURE_POWERTOP_INTERACTIVE + bool "Accept keyboard commands" + default y + depends on BUSYBOX_POWERTOP + help + Without this, powertop will only refresh display every 10 seconds. + No keyboard commands will work, only ^C to terminate. config BUSYBOX_PS bool "ps" default y @@ -133,19 +141,10 @@ config BUSYBOX_FEATURE_PS_LONG Adds fields PPID, RSS, START, TIME & TTY config BUSYBOX_FEATURE_PS_TIME - bool "Enable time and elapsed time output" + bool "Support -o time and -o etime output specifiers" default y depends on BUSYBOX_PS && BUSYBOX_DESKTOP select BUSYBOX_PLATFORM_LINUX - help - Support -o time and -o etime output specifiers. - -config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS - bool "Enable additional ps columns" - default y - depends on BUSYBOX_PS && BUSYBOX_DESKTOP - help - Support -o rgroup, -o ruser, -o nice output specifiers. config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS bool "Support Linux prior to 2.4.0 and non-ELF systems" @@ -154,6 +153,11 @@ config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS help Include support for measuring HZ on old kernels and non-ELF systems (if you are on Linux 2.4.0+ and use ELF, you don't need this) + +config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS + bool "Support -o rgroup, -o ruser, -o nice specifiers" + default y + depends on BUSYBOX_PS && BUSYBOX_DESKTOP config BUSYBOX_PSTREE bool "pstree" default y @@ -164,12 +168,6 @@ config BUSYBOX_PWDX default y help Report current working directory of a process -config BUSYBOX_RENICE - bool "renice" - default y - help - Renice alters the scheduling priority of one or more running - processes. config BUSYBOX_SMEMCAP bool "smemcap" default y @@ -188,6 +186,14 @@ config BUSYBOX_TOP The top program provides a dynamic real-time view of a running system. +config BUSYBOX_FEATURE_TOP_INTERACTIVE + bool "Accept keyboard commands" + default y + depends on BUSYBOX_TOP + help + Without this, top will only refresh display every 5 seconds. + No keyboard commands will work, only ^C to terminate. + config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE bool "Show CPU per-process usage percentage" default y @@ -244,11 +250,11 @@ config BUSYBOX_UPTIME on, and the system load averages for the past 1, 5, and 15 minutes. config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT - bool "Support for showing the number of users" + bool "Show the number of users" default y depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP help - Makes uptime display the number of users currently logged on. + Display the number of users currently logged on. config BUSYBOX_WATCH bool "watch" default y @@ -257,7 +263,7 @@ config BUSYBOX_WATCH output to the screen. config BUSYBOX_FEATURE_SHOW_THREADS - bool "Support for showing threads in ps/pstree/top" + bool "Support thread display in ps/pstree/top" default y depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE help diff --git a/config/busybox/selinux/Config.in b/config/busybox/selinux/Config.in index 6dc3e75ea..9f062a3ed 100644 --- a/config/busybox/selinux/Config.in +++ b/config/busybox/selinux/Config.in @@ -18,8 +18,6 @@ config BUSYBOX_FEATURE_CHCON_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_CHCON && BUSYBOX_LONG_OPTS - help - Support long options for the chcon applet. config BUSYBOX_GETENFORCE bool "getenforce" default n @@ -56,8 +54,6 @@ config BUSYBOX_FEATURE_RUNCON_LONG_OPTIONS bool "Enable long options" default y depends on BUSYBOX_RUNCON && BUSYBOX_LONG_OPTS - help - Support long options for the runcon applet. config BUSYBOX_SELINUXENABLED bool "selinuxenabled" default n diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in index 3d41fb5f8..201dcfeec 100644 --- a/config/busybox/shell/Config.in +++ b/config/busybox/shell/Config.in @@ -18,9 +18,19 @@ choice config BUSYBOX_SH_IS_ASH depends on !BUSYBOX_NOMMU bool "ash" + help + Choose ash to be the shell executed by 'sh' name. + The ash code will be built into busybox. If you don't select + "ash" choice (CONFIG_ASH), this shell may only be invoked by + the name 'sh' (and not 'ash'). config BUSYBOX_SH_IS_HUSH bool "hush" + help + Choose hush to be the shell executed by 'sh' name. + The hush code will be built into busybox. If you don't select + "hush" choice (CONFIG_HUSH), this shell may only be invoked by + the name 'sh' (and not 'hush'). config BUSYBOX_SH_IS_NONE bool "none" @@ -32,7 +42,8 @@ choice default BUSYBOX_BASH_IS_NONE help Choose which shell you want to be executed by 'bash' alias. - The ash shell is the most bash compatible and full featured one. + The ash shell is the most bash compatible and full featured one, + although compatibility is far from being complete. Note that selecting this option does not switch on any bash compatibility code. It merely makes it possible to install @@ -47,9 +58,19 @@ choice config BUSYBOX_BASH_IS_ASH depends on !BUSYBOX_NOMMU bool "ash" + help + Choose ash to be the shell executed by 'bash' name. + The ash code will be built into busybox. If you don't select + "ash" choice (CONFIG_ASH), this shell may only be invoked by + the name 'bash' (and not 'ash'). config BUSYBOX_BASH_IS_HUSH bool "hush" + help + Choose hush to be the shell executed by 'bash' name. + The hush code will be built into busybox. If you don't select + "hush" choice (CONFIG_HUSH), this shell may only be invoked by + the name 'bash' (and not 'hush'). config BUSYBOX_BASH_IS_NONE bool "none" @@ -68,12 +89,15 @@ config BUSYBOX_ASH shell (by Herbert Xu), which was created by porting the 'ash' shell (written by Kenneth Almquist) from NetBSD. +# ash options +# note: Don't remove !NOMMU part in the next line; it would break +# menuconfig's indenting. +if !BUSYBOX_NOMMU && (BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH) + config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE bool "Optimize for size instead of speed" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Compile ash for reduced size at the price of speed. config BUSYBOX_ASH_INTERNAL_GLOB bool "Use internal glob() implementation" @@ -83,6 +107,23 @@ config BUSYBOX_ASH_INTERNAL_GLOB Do not use glob() function from libc, use internal implementation. Use this if you are getting "glob.h: No such file or directory" or similar build errors. + Note that as of now (2017-01), uclibc and musl glob() both have bugs + which would break ash if you select N here. + +config BUSYBOX_ASH_BASH_COMPAT + bool "bash-compatible extensions" + default y + depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH + +config BUSYBOX_ASH_JOB_CONTROL + bool "Job control" + default y + depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH + +config BUSYBOX_ASH_ALIAS + bool "Alias support" + default y + depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH config BUSYBOX_ASH_RANDOM_SUPPORT bool "Pseudorandom generator and $RANDOM variable" @@ -100,88 +141,62 @@ config BUSYBOX_ASH_EXPAND_PRMT default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH help - "PS#" may contain volatile content, such as backquote commands. + $PS# may contain volatile content, such as backquote commands. This option recreates the prompt string from the environment variable each time it is displayed. -config BUSYBOX_ASH_BASH_COMPAT - bool "bash-compatible extensions" - default y - depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable bash-compatible extensions. - config BUSYBOX_ASH_IDLE_TIMEOUT - bool "Idle timeout variable" - default n - depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enables bash-like auto-logout after $TMOUT seconds of idle time. - -config BUSYBOX_ASH_JOB_CONTROL - bool "Job control" + bool "Idle timeout variable $TMOUT" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH help - Enable job control in the ash shell. + Enable bash-like auto-logout after $TMOUT seconds of idle time. -config BUSYBOX_ASH_ALIAS - bool "Alias support" - default y - depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable alias support in the ash shell. - -config BUSYBOX_ASH_GETOPTS - bool "Builtin getopt to parse positional parameters" +config BUSYBOX_ASH_MAIL + bool "Check for new mail in interactive shell" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH help - Enable support for getopts builtin in ash. + Enable "check for new mail" function: + if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files + are checked for mtime changes, and "you have mail" + message is printed if change is detected. -config BUSYBOX_ASH_BUILTIN_ECHO - bool "Builtin version of 'echo'" +config BUSYBOX_ASH_ECHO + bool "echo builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable support for echo builtin in ash. -config BUSYBOX_ASH_BUILTIN_PRINTF - bool "Builtin version of 'printf'" +config BUSYBOX_ASH_PRINTF + bool "printf builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable support for printf builtin in ash. -config BUSYBOX_ASH_BUILTIN_TEST - bool "Builtin version of 'test'" +config BUSYBOX_ASH_TEST + bool "test builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable support for test builtin in ash. config BUSYBOX_ASH_HELP bool "help builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable help builtin in ash. -config BUSYBOX_ASH_CMDCMD - bool "'command' command to override shell builtins" +config BUSYBOX_ASH_GETOPTS + bool "getopts builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH - help - Enable support for the ash 'command' builtin, which allows - you to run the specified command with the specified arguments, - even when there is an ash builtin command with the same name. -config BUSYBOX_ASH_MAIL - bool "Check for new mail on interactive shells" +config BUSYBOX_ASH_CMDCMD + bool "command builtin" default y depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH help - Enable "check for new mail" function in the ash shell. + Enable support for the 'command' builtin, which allows + you to run the specified command or builtin, + even when there is a function with the same name. + +endif # ash options config BUSYBOX_CTTYHACK bool "cttyhack" default y @@ -243,8 +258,6 @@ config BUSYBOX_HUSH_BASH_COMPAT bool "bash-compatible extensions" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH - help - Enable bash-compatible extensions. config BUSYBOX_HUSH_BRACE_EXPANSION bool "Brace expansion" @@ -253,13 +266,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION help Enable {abc,def} extension. -config BUSYBOX_HUSH_HELP - bool "help builtin" - default y - depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH - help - Enable help builtin in hush. Code size + ~1 kbyte. - config BUSYBOX_HUSH_INTERACTIVE bool "Interactive mode" default y @@ -274,8 +280,6 @@ config BUSYBOX_HUSH_SAVEHISTORY bool "Save command history to .hush_history" default y depends on BUSYBOX_HUSH_INTERACTIVE && BUSYBOX_FEATURE_EDITING_SAVEHISTORY - help - Enable history saving in hush. config BUSYBOX_HUSH_JOB bool "Job control" @@ -289,42 +293,38 @@ config BUSYBOX_HUSH_JOB but no separate process group is formed. config BUSYBOX_HUSH_TICK - bool "Process substitution" + bool "Support process substitution" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH help - Enable process substitution `command` and $(command) in hush. + Enable `command` and $(command). config BUSYBOX_HUSH_IF bool "Support if/then/elif/else/fi" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH - help - Enable if/then/elif/else/fi in hush. config BUSYBOX_HUSH_LOOPS bool "Support for, while and until loops" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH - help - Enable for, while and until loops in hush. config BUSYBOX_HUSH_CASE bool "Support case ... esac statement" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH help - Enable case ... esac statement in hush. +400 bytes. + Enable case ... esac statement. +400 bytes. config BUSYBOX_HUSH_FUNCTIONS bool "Support funcname() { commands; } syntax" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH help - Enable support for shell functions in hush. +800 bytes. + Enable support for shell functions. +800 bytes. config BUSYBOX_HUSH_LOCAL - bool "Support local builtin" + bool "local builtin" default y depends on BUSYBOX_HUSH_FUNCTIONS help @@ -338,20 +338,95 @@ config BUSYBOX_HUSH_RANDOM_SUPPORT Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. +config BUSYBOX_HUSH_MODE_X + bool "Support 'hush -x' option and 'set -x' command" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + help + This instructs hush to print commands before execution. + Adds ~300 bytes. + +config BUSYBOX_HUSH_ECHO + bool "echo builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_PRINTF + bool "printf builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_TEST + bool "test builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_HELP + bool "help builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_EXPORT + bool "export builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + config BUSYBOX_HUSH_EXPORT_N bool "Support 'export -n' option" default y - depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + depends on BUSYBOX_HUSH_EXPORT help export -n unexports variables. It is a bash extension. -config BUSYBOX_HUSH_MODE_X - bool "Support 'hush -x' option and 'set -x' command" +config BUSYBOX_HUSH_KILL + bool "kill builtin (supports kill %jobspec)" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_WAIT + bool "wait builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_TRAP + bool "trap builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_TYPE + bool "type builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_READ + bool "read builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_SET + bool "set builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_UNSET + bool "unset builtin" default y depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH - help - This instructs hush to print commands before execution. - Adds ~300 bytes. + +config BUSYBOX_HUSH_ULIMIT + bool "ulimit builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_UMASK + bool "umask builtin" + default y + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + +config BUSYBOX_HUSH_MEMLEAK + bool "memleak builtin (debugging)" + default n + depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH config BUSYBOX_MSH bool "msh (deprecated: aliased to hush)" @@ -361,6 +436,9 @@ config BUSYBOX_MSH msh is deprecated and will be removed, please migrate to hush. +comment "Options common to all shells" +if BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH + config BUSYBOX_FEATURE_SH_MATH bool "POSIX math support" default y @@ -399,23 +477,11 @@ config BUSYBOX_FEATURE_SH_STANDALONE for use as a rescue shell, in the event that you screw up your system. This is implemented by re-execing /proc/self/exe (typically) - with right parameters. Some selected applets ("NOFORK" applets) - can even be executed without creating new process. - Instead, busybox will call _main() internally. - - However, this causes problems in chroot jails without mounted /proc - and with ps/top (command name can be shown as 'exe' for applets - started this way). -# untrue? -# Note that this will *also* cause applets to take precedence -# over shell builtins of the same name. So turning this on will -# eliminate any performance gained by turning on the builtin "echo" -# and "test" commands in ash. -# untrue? -# Note that when using this option, the shell will attempt to directly -# run '/bin/busybox'. If you do not have the busybox binary sitting in -# that exact location with that exact name, this option will not work at -# all. + with right parameters. + + However, there are drawbacks: it is problematic in chroot jails + without mounted /proc, and ps/top may show command name as 'exe' + for applets started this way. config BUSYBOX_FEATURE_SH_NOFORK bool "Run 'nofork' applets directly" @@ -444,5 +510,6 @@ 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. +endif # Options common to all shells endmenu diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in index 6ebb77d06..513adc0f2 100644 --- a/config/busybox/sysklogd/Config.in +++ b/config/busybox/sysklogd/Config.in @@ -58,7 +58,7 @@ config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING default y depends on BUSYBOX_LOGREAD help - 'logread' ouput to slow serial terminals can have + 'logread' output to slow serial terminals can have side effects on syslog because of the semaphore. This option make logread to double buffer copy from circular buffer, minimizing semaphore diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index 9968f3489..dc878e670 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -54,6 +54,17 @@ config BUSYBOX_BLOCKDEV default y help Performs some ioctls with block devices. +config BUSYBOX_CAL + bool "cal" + default y + help + cal is used to display a monthly calendar. +config BUSYBOX_CHRT + bool "chrt" + default y + help + manipulate real-time attributes of a process. + This requires sched_{g,s}etparam support in your libc. config BUSYBOX_DMESG bool "dmesg" default y @@ -68,7 +79,7 @@ config BUSYBOX_DMESG wish to enable the 'dmesg' utility. config BUSYBOX_FEATURE_DMESG_PRETTY - bool "Pretty dmesg output" + bool "Pretty output" default y depends on BUSYBOX_DMESG help @@ -87,6 +98,25 @@ config BUSYBOX_FEATURE_DMESG_PRETTY <5>Linux version 2.6.17.4 ..... <6>BIOS-provided physical RAM map: <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable) +config BUSYBOX_EJECT + bool "eject" + default y + select BUSYBOX_PLATFORM_LINUX + help + Used to eject cdroms. (defaults to /dev/cdrom) + +config BUSYBOX_FEATURE_EJECT_SCSI + bool "SCSI support" + default y + depends on BUSYBOX_EJECT + help + Add the -s option to eject, this allows to eject SCSI-Devices and + usb-storage devices. +config BUSYBOX_FALLOCATE + bool "fallocate" + default y + help + Preallocate space for files. config BUSYBOX_FATATTR bool "fatattr" default y @@ -104,7 +134,7 @@ config BUSYBOX_FBSET if you wish to enable the 'fbset' utility. config BUSYBOX_FEATURE_FBSET_FANCY - bool "Turn on extra fbset options" + bool "Enable extra options" default y depends on BUSYBOX_FBSET help @@ -114,7 +144,7 @@ config BUSYBOX_FEATURE_FBSET_FANCY options. config BUSYBOX_FEATURE_FBSET_READMODE - bool "Turn on fbset readmode support" + bool "Enable readmode support" default y depends on BUSYBOX_FBSET help @@ -142,8 +172,6 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS default y depends on BUSYBOX_FDISK depends on !BUSYBOX_LFS # with LFS no special code is needed - help - Enable this option to support large disks > 4GB. config BUSYBOX_FEATURE_FDISK_WRITABLE bool "Write support" @@ -251,6 +279,13 @@ config BUSYBOX_FSCK_MINIX power goes off in the middle of a write. This utility allows you to check for and attempt to repair any corruption that occurs to a minix filesystem. +config BUSYBOX_FSFREEZE + bool "fsfreeze" + default y + select BUSYBOX_PLATFORM_LINUX + select BUSYBOX_LONG_OPTS + help + Halt new accesses and flush writes on a mounted filesystem. config BUSYBOX_FSTRIM bool "fstrim" default y @@ -296,6 +331,12 @@ config BUSYBOX_HD default y help hd is an alias to hexdump -C. +config BUSYBOX_XXD + bool "xxd" + default y + help + The xxd utility is used to display binary data in a readable + way that is comparable to the output from most hex editors. config BUSYBOX_HWCLOCK bool "hwclock" default y @@ -310,10 +351,6 @@ config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS bool "Support long options (--hctosys,...)" default y depends on BUSYBOX_HWCLOCK && BUSYBOX_LONG_OPTS - help - By default, the hwclock utility only uses short options. If you - are overly fond of its long options, such as --hctosys, --utc, etc) - then enable this option. config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS bool "Use FHS /var/lib/hwclock/adjtime" @@ -326,6 +363,13 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS classic /etc/adjtime path. pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO +config BUSYBOX_IONICE + bool "ionice" + default y + select BUSYBOX_PLATFORM_LINUX + help + Set/set program io scheduling class and priority + Requires kernel >= 2.6.13 config BUSYBOX_IPCRM bool "ipcrm" default y @@ -340,6 +384,20 @@ config BUSYBOX_IPCS help The ipcs utility is used to provide information on the currently allocated System V interprocess (IPC) objects in the system. +config BUSYBOX_LAST + bool "last" + default y + depends on BUSYBOX_FEATURE_WTMP + help + 'last' displays a list of the last users that logged into the system. + +config BUSYBOX_FEATURE_LAST_FANCY + bool "Output extra information" + default y + depends on BUSYBOX_LAST + help + 'last' displays detailed information about the last users that + logged into the system (mimics sysvinit last). +900 bytes. config BUSYBOX_LOSETUP bool "losetup" default y @@ -423,6 +481,24 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE These devices will request userspace look up the files in /lib/firmware/ and if it exists, send it to the kernel for loading into the hardware. +config BUSYBOX_MESG + bool "mesg" + default y + help + Mesg controls access to your terminal by others. It is typically + used to allow or disallow other users to write to your terminal + +config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP + bool "Enable writing to tty only by group, not by everybody" + default y + depends on BUSYBOX_MESG + help + Usually, ttys are owned by group "tty", and "write" tool is + setgid to this group. This way, "mesg y" only needs to enable + "write by owning group" bit in tty mode. + + If you set this option to N, "mesg y" will enable writing + by anybody at all. This is not recommended. config BUSYBOX_MKE2FS bool "mke2fs" default y @@ -574,7 +650,7 @@ config BUSYBOX_FEATURE_MOUNT_CIFS config BUSYBOX_FEATURE_MOUNT_FLAGS depends on BUSYBOX_MOUNT - bool "Support lots of -o flags in mount" + bool "Support lots of -o flags" default y help Without this, mount only supports ro/rw/remount. With this, it @@ -595,6 +671,11 @@ config BUSYBOX_FEATURE_MOUNT_OTHERTAB default y help Support mount -T (specifying an alternate fstab) +config BUSYBOX_MOUNTPOINT + bool "mountpoint" + default y + help + mountpoint checks if the directory is a mountpoint. config BUSYBOX_NSENTER bool "nsenter" default y @@ -640,6 +721,12 @@ config BUSYBOX_READPROFILE #select PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. +config BUSYBOX_RENICE + bool "renice" + default y + help + Renice alters the scheduling priority of one or more running + processes. config BUSYBOX_REV bool "rev" default y @@ -685,6 +772,19 @@ config BUSYBOX_LINUX64 select BUSYBOX_PLATFORM_LINUX help Alias to "setarch linux64". +config BUSYBOX_SETPRIV + bool "setpriv" + default y + select BUSYBOX_PLATFORM_LINUX + select BUSYBOX_LONG_OPTS + help + Run a program with different Linux privilege settings. + Requires kernel >= 3.5 +config BUSYBOX_SETSID + bool "setsid" + default y + help + setsid runs a program in a new session config BUSYBOX_SWAPON bool "swapon" default y @@ -738,6 +838,21 @@ config BUSYBOX_SWITCH_ROOT * Because the Linux kernel uses rootfs internally as the starting and ending point for searching through the kernel's doubly linked list of active mount points. That's why. +config BUSYBOX_TASKSET + bool "taskset" + default y + help + Retrieve or set a processes's CPU affinity. + This requires sched_{g,s}etaffinity support in your libc. + +config BUSYBOX_FEATURE_TASKSET_FANCY + bool "Fancy output" + default y + depends on BUSYBOX_TASKSET + help + Needed for machines with more than 32-64 CPUs: + affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long + in this case. Otherwise, it is limited to sizeof(long). config BUSYBOX_UEVENT bool "uevent" default y @@ -764,10 +879,17 @@ config BUSYBOX_FEATURE_UMOUNT_ALL config BUSYBOX_UNSHARE bool "unshare" default y - depends on BUSYBOX_LONG_OPTS && !BUSYBOX_NOMMU + depends on !BUSYBOX_NOMMU select BUSYBOX_PLATFORM_LINUX + select BUSYBOX_LONG_OPTS help Run program with some namespaces unshared from parent. +config BUSYBOX_WALL + bool "wall" + default y + depends on BUSYBOX_FEATURE_UTMP + help + Write a message to all users that are logged in. comment "Common options for mount/umount" depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT @@ -802,7 +924,7 @@ config BUSYBOX_FEATURE_MOUNT_LOOP_CREATE if it does not find a free one. config BUSYBOX_FEATURE_MTAB_SUPPORT - bool "Support for the old /etc/mtab file" + bool "Support old /etc/mtab file" default n depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT select BUSYBOX_FEATURE_MOUNT_FAKE diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in index 3db6b6099..c40f584da 100644 --- a/config/busybox/util-linux/volume_id/Config.in +++ b/config/busybox/util-linux/volume_id/Config.in @@ -11,31 +11,18 @@ config BUSYBOX_VOLUMEID menu "Filesystem/Volume identification" depends on BUSYBOX_VOLUMEID - config BUSYBOX_FEATURE_VOLUMEID_BCACHE bool "bcache filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_BTRFS bool "btrfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_CRAMFS bool "cramfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_EXFAT bool "exFAT filesystem" default y @@ -44,16 +31,10 @@ config BUSYBOX_FEATURE_VOLUMEID_EXFAT exFAT (extended FAT) is a proprietary file system designed especially for flash drives. It has many features from NTFS, but with less overhead. exFAT is used on most SDXC cards for consumer electronics. - - config BUSYBOX_FEATURE_VOLUMEID_EXT bool "Ext filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_F2FS bool "f2fs filesystem" default y @@ -63,64 +44,34 @@ config BUSYBOX_FEATURE_VOLUMEID_F2FS which is adapted to newer forms of storage. F2FS also remedies some known issues of the older log structured file systems, such as high cleaning overhead. - - config BUSYBOX_FEATURE_VOLUMEID_FAT bool "fat filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_HFS bool "hfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_ISO9660 bool "iso9660 filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_JFS bool "jfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID bool "linuxraid" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP bool "linux swap filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_LUKS bool "luks filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_NILFS bool "nilfs filesystem" default y @@ -136,40 +87,22 @@ config BUSYBOX_FEATURE_VOLUMEID_NILFS SOX compliance logging, and so forth. It can serve as an alternative filesystem for Linux desktop environment, or as a basis of advanced storage appliances. - - config BUSYBOX_FEATURE_VOLUMEID_NTFS bool "ntfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_OCFS2 bool "ocfs2 filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_REISERFS bool "Reiser filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_ROMFS bool "romfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS bool "SquashFS filesystem" default y @@ -179,16 +112,10 @@ config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS intended for general read-only filesystem use and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed. - - config BUSYBOX_FEATURE_VOLUMEID_SYSV bool "sysv filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - config BUSYBOX_FEATURE_VOLUMEID_UBIFS bool "UBIFS filesystem" default y @@ -196,126 +123,65 @@ config BUSYBOX_FEATURE_VOLUMEID_UBIFS help UBIFS (Unsorted Block Image File System) is a file system for use with raw flash memory media. - - config BUSYBOX_FEATURE_VOLUMEID_UDF bool "udf filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - - ### config FEATURE_VOLUMEID_HIGHPOINTRAID ### bool "highpoint raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_HPFS ### bool "hpfs filesystem" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_ISWRAID ### bool "intel raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_LSIRAID ### bool "lsi raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_LVM ### bool "lvm" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_MAC ### bool "mac filesystem" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_MINIX ### bool "minix filesystem" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_MSDOS ### bool "msdos filesystem" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_NVIDIARAID ### bool "nvidia raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_PROMISERAID ### bool "promise raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_SILICONRAID ### bool "silicon raid" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_UFS ### bool "ufs filesystem" ### default y ### depends on VOLUMEID -### help -### TODO - - ### config FEATURE_VOLUMEID_VIARAID ### bool "via raid" ### default y ### depends on VOLUMEID -### help -### TODO - - config BUSYBOX_FEATURE_VOLUMEID_XFS bool "xfs filesystem" default y depends on BUSYBOX_VOLUMEID - help - TODO - endmenu -- cgit v1.2.3