diff options
Diffstat (limited to 'package/utils/busybox/config')
| -rw-r--r-- | package/utils/busybox/config/Config.in | 33 | ||||
| -rw-r--r-- | package/utils/busybox/config/coreutils/Config.in | 23 | ||||
| -rw-r--r-- | package/utils/busybox/config/editors/Config.in | 30 | ||||
| -rw-r--r-- | package/utils/busybox/config/findutils/Config.in | 17 | ||||
| -rw-r--r-- | package/utils/busybox/config/loginutils/Config.in | 18 | ||||
| -rw-r--r-- | package/utils/busybox/config/miscutils/Config.in | 98 | ||||
| -rw-r--r-- | package/utils/busybox/config/networking/Config.in | 24 | ||||
| -rw-r--r-- | package/utils/busybox/config/networking/udhcp/Config.in | 11 | ||||
| -rw-r--r-- | package/utils/busybox/config/shell/Config.in | 7 | ||||
| -rw-r--r-- | package/utils/busybox/config/util-linux/Config.in | 15 |
10 files changed, 203 insertions, 73 deletions
diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in index 71ba45b..6a205f6 100644 --- a/package/utils/busybox/config/Config.in +++ b/package/utils/busybox/config/Config.in @@ -256,6 +256,26 @@ config BUSYBOX_CONFIG_UNICODE_PRESERVE_BROKEN at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. +config BUSYBOX_CONFIG_PAM + bool "Support for PAM (Pluggable Authentication Modules)" + default BUSYBOX_DEFAULT_PAM + help + Use PAM in some busybox applets (currently login and httpd) instead + of direct access to password database. + +config BUSYBOX_CONFIG_FEATURE_USE_SENDFILE + bool "Use sendfile system call" + default BUSYBOX_DEFAULT_FEATURE_USE_SENDFILE + select BUSYBOX_CONFIG_PLATFORM_LINUX + help + When enabled, busybox will use the kernel sendfile() function + instead of read/write loops to copy data between file descriptors + (for example, cp command does this a lot). + If sendfile() doesn't work, copying code falls back to read/write + loop. sendfile() was originally implemented for faster I/O + from files to sockets, but since Linux 2.6.33 it was extended + to work for many more file types. + config BUSYBOX_CONFIG_LONG_OPTS bool "Support for --long-options" default BUSYBOX_DEFAULT_LONG_OPTS @@ -415,10 +435,7 @@ config BUSYBOX_CONFIG_SELINUX the option of compiling in SELinux applets. If you do not have a complete SELinux userland installed, this stuff - will not compile. Go visit - http://www.nsa.gov/selinux/index.html - to download the necessary stuff to allow busybox to compile with - this option enabled. Specifially, libselinux 1.28 or better is + will not compile. Specifially, libselinux 1.28 or better is directly required by busybox. If the installation is located in a non-standard directory, provide it by invoking make as follows: CFLAGS=-I<libselinux-include-path> \ @@ -670,6 +687,14 @@ config BUSYBOX_CONFIG_DEBUG_PESSIMIZE in a much bigger executable that more closely matches the source code. +config BUSYBOX_CONFIG_UNIT_TEST + bool "Build unit tests" + default BUSYBOX_DEFAULT_UNIT_TEST + help + Say Y here if you want to build unit tests (both the framework and + test cases) as a Busybox applet. This results in bigger code, so you + probably don't want this option in production builds. + config BUSYBOX_CONFIG_WERROR bool "Abort compilation on any warning" default BUSYBOX_DEFAULT_WERROR diff --git a/package/utils/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in index c00eca9..f50823f 100644 --- a/package/utils/busybox/config/coreutils/Config.in +++ b/package/utils/busybox/config/coreutils/Config.in @@ -74,6 +74,11 @@ config BUSYBOX_CONFIG_GROUPS default BUSYBOX_DEFAULT_GROUPS help Print the group names associated with current user id. +config BUSYBOX_CONFIG_SHUF + bool "shuf" + default BUSYBOX_DEFAULT_SHUF + help + Generate random permutations config BUSYBOX_CONFIG_TEST bool "test" default BUSYBOX_DEFAULT_TEST @@ -134,6 +139,11 @@ config BUSYBOX_CONFIG_FEATURE_TR_EQUIV replace all instances of 'a' with 'xyz'. This option is mainly useful for cases when no other way of expressing a character is possible. +config BUSYBOX_CONFIG_UNLINK + bool "unlink" + default BUSYBOX_DEFAULT_UNLINK + help + unlink deletes a file by calling unlink() config BUSYBOX_CONFIG_BASE64 bool "base64" default BUSYBOX_DEFAULT_BASE64 @@ -778,12 +788,13 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL default BUSYBOX_DEFAULT_FEATURE_FANCY_TAIL depends on BUSYBOX_CONFIG_TAIL help - The options (-q, -s, and -v) are provided by GNU tail, but + The options (-q, -s, -v and -F) 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 + -F Same as -f, but keep retrying config BUSYBOX_CONFIG_TEE bool "tee" @@ -883,6 +894,16 @@ config BUSYBOX_CONFIG_YES yes is used to repeatedly output a specific string, or the default string `y'. +comment "Common options" + +config BUSYBOX_CONFIG_FEATURE_VERBOSE + bool "Support verbose options (usually -v) for various applets" + default BUSYBOX_DEFAULT_FEATURE_VERBOSE + help + Enable cp -v, rm -v and similar messages. + Also enables long option (--verbose) if it exists. + Without this option, -v is accepted but ignored. + comment "Common options for cp and mv" depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV diff --git a/package/utils/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in index 90f9f00..6ae361f 100644 --- a/package/utils/busybox/config/editors/Config.in +++ b/package/utils/busybox/config/editors/Config.in @@ -192,6 +192,36 @@ config BUSYBOX_CONFIG_FEATURE_VI_ASK_TERMINAL 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_CONFIG_FEATURE_VI_UNDO + bool "Support undo command 'u'" + default BUSYBOX_DEFAULT_FEATURE_VI_UNDO + depends on BUSYBOX_CONFIG_VI + help + Support the 'u' command to undo insertion, deletion, and replacement + of text. +config BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE + bool "Enable undo operation queuing" + default BUSYBOX_DEFAULT_FEATURE_VI_UNDO_QUEUE + depends on BUSYBOX_CONFIG_FEATURE_VI_UNDO + help + The vi undo functions can use an intermediate queue to greatly lower + malloc() calls and overhead. When the maximum size of this queue is + 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_CONFIG_FEATURE_VI_UNDO_QUEUE_MAX + int "Maximum undo character queue size" + default BUSYBOX_DEFAULT_FEATURE_VI_UNDO_QUEUE_MAX + range 32 65536 + depends on BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE + help + This option sets the number of bytes used at runtime for the queue. + Smaller values will create more undo objects and reduce the amount + of typed or backspaced characters that are grouped into one undo + operation; larger values increase the potential size of each undo + and will generally malloc() larger objects and less frequently. + Unless you want more (or less) frequent "undo points" while typing, + you should probably leave this unchanged. config BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" diff --git a/package/utils/busybox/config/findutils/Config.in b/package/utils/busybox/config/findutils/Config.in index 55929d2..85ee1db 100644 --- a/package/utils/busybox/config/findutils/Config.in +++ b/package/utils/busybox/config/findutils/Config.in @@ -90,6 +90,16 @@ config BUSYBOX_CONFIG_FEATURE_FIND_EXEC Support the 'find -exec' option for executing commands based upon the files matched. +config BUSYBOX_CONFIG_FEATURE_FIND_EXEC_PLUS + bool "Enable -exec ... {} +" + default BUSYBOX_DEFAULT_FEATURE_FIND_EXEC_PLUS + depends on BUSYBOX_CONFIG_FEATURE_FIND_EXEC + help + Support the 'find -exec ... {} +' option for executing commands + for all matched files at once. + Without this option, -exec + is a synonym for -exec ; + (IOW: it works correctly, but without expected speedup) + config BUSYBOX_CONFIG_FEATURE_FIND_USER bool "Enable -user: username/uid matching" default BUSYBOX_DEFAULT_FEATURE_FIND_USER @@ -249,4 +259,11 @@ config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM instead of whitespace, and the quotes and backslash are not special. +config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR + bool "Enable -I STR: string to replace" + default BUSYBOX_DEFAULT_FEATURE_XARGS_SUPPORT_REPL_STR + depends on BUSYBOX_CONFIG_XARGS + help + Support -I STR and -i[STR] options. + endmenu diff --git a/package/utils/busybox/config/loginutils/Config.in b/package/utils/busybox/config/loginutils/Config.in index 7fbe6a0..f5ecf6f 100644 --- a/package/utils/busybox/config/loginutils/Config.in +++ b/package/utils/busybox/config/loginutils/Config.in @@ -129,10 +129,17 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. +config BUSYBOX_CONFIG_LAST_ID + int "Last valid uid or gid for adduser and addgroup" + depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP + default BUSYBOX_DEFAULT_LAST_ID + help + Last valid uid or gid for adduser and addgroup + config BUSYBOX_CONFIG_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP - range 0 64900 + range 0 BUSYBOX_CONFIG_LAST_ID default BUSYBOX_DEFAULT_FIRST_SYSTEM_ID help First valid system uid or gid for adduser and addgroup @@ -140,7 +147,7 @@ config BUSYBOX_CONFIG_FIRST_SYSTEM_ID config BUSYBOX_CONFIG_LAST_SYSTEM_ID int "Last valid system uid or gid for adduser and addgroup" depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP - range 0 64900 + range BUSYBOX_CONFIG_FIRST_SYSTEM_ID BUSYBOX_CONFIG_LAST_ID default BUSYBOX_DEFAULT_LAST_SYSTEM_ID help Last valid system uid or gid for adduser and addgroup @@ -227,13 +234,6 @@ config BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD almost always would want this to be set to Y, else PAM session will not be cleaned up. -config BUSYBOX_CONFIG_PAM - bool "Support for PAM (Pluggable Authentication Modules)" - default BUSYBOX_DEFAULT_PAM - depends on BUSYBOX_CONFIG_LOGIN - help - Use PAM in login(1) instead of direct access to password database. - config BUSYBOX_CONFIG_LOGIN_SCRIPTS bool "Support for login scripts" depends on BUSYBOX_CONFIG_LOGIN diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in index 0e0e459..7819e30 100644 --- a/package/utils/busybox/config/miscutils/Config.in +++ b/package/utils/busybox/config/miscutils/Config.in @@ -15,6 +15,39 @@ config BUSYBOX_CONFIG_CONSPY example: conspy NUM shared access to console num or conspy -nd NUM screenshot of console num or conspy -cs NUM poor man's GNU screen like +config BUSYBOX_CONFIG_CROND + bool "crond" + default BUSYBOX_DEFAULT_CROND + select BUSYBOX_CONFIG_FEATURE_SYSLOG + help + Crond is a background daemon that parses individual crontab + files and executes commands on behalf of the users in question. + This is a port of dcron from slackware. It uses files of the + format /var/spool/cron/crontabs/<username> files, for example: + $ cat /var/spool/cron/crontabs/root + # Run daily cron jobs at 4:40 every day: + 40 4 * * * /etc/cron/daily > /dev/null 2>&1 + +config BUSYBOX_CONFIG_FEATURE_CROND_D + bool "Support option -d to redirect output to stderr" + depends on BUSYBOX_CONFIG_CROND + default BUSYBOX_DEFAULT_FEATURE_CROND_D + help + -d N sets loglevel (0:most verbose) and directs all output to stderr. + +config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL + bool "Report command output via email (using sendmail)" + default BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL + depends on BUSYBOX_CONFIG_CROND + help + Command output will be sent to corresponding user via email. + +config BUSYBOX_CONFIG_FEATURE_CROND_DIR + string "crond spool directory" + default BUSYBOX_DEFAULT_FEATURE_CROND_DIR + depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB + help + Location of crond spool. config BUSYBOX_CONFIG_LESS bool "less" default BUSYBOX_DEFAULT_LESS @@ -121,6 +154,21 @@ config BUSYBOX_CONFIG_SETSERIAL select BUSYBOX_CONFIG_PLATFORM_LINUX help Retrieve or set Linux serial port. +config BUSYBOX_CONFIG_TASKSET + bool "taskset" + default BUSYBOX_DEFAULT_TASKSET # 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_CONFIG_FEATURE_TASKSET_FANCY + bool "Fancy output" + default BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY + depends on BUSYBOX_CONFIG_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_CONFIG_UBIATTACH bool "ubiattach" default BUSYBOX_DEFAULT_UBIATTACH @@ -295,40 +343,6 @@ config BUSYBOX_CONFIG_CHRT manipulate real-time attributes of a process. This requires sched_{g,s}etparam support in your libc. -config BUSYBOX_CONFIG_CROND - bool "crond" - default BUSYBOX_DEFAULT_CROND - select BUSYBOX_CONFIG_FEATURE_SYSLOG - help - Crond is a background daemon that parses individual crontab - files and executes commands on behalf of the users in question. - This is a port of dcron from slackware. It uses files of the - format /var/spool/cron/crontabs/<username> files, for example: - $ cat /var/spool/cron/crontabs/root - # Run daily cron jobs at 4:40 every day: - 40 4 * * * /etc/cron/daily > /dev/null 2>&1 - -config BUSYBOX_CONFIG_FEATURE_CROND_D - bool "Support option -d to redirect output to stderr" - depends on BUSYBOX_CONFIG_CROND - default BUSYBOX_DEFAULT_FEATURE_CROND_D - help - -d sets loglevel to 0 (most verbose) and directs all output to stderr. - -config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL - bool "Report command output via email (using sendmail)" - default BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL - depends on BUSYBOX_CONFIG_CROND - help - Command output will be sent to corresponding user via email. - -config BUSYBOX_CONFIG_FEATURE_CROND_DIR - string "crond spool directory" - default BUSYBOX_DEFAULT_FEATURE_CROND_DIR - depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB - help - Location of crond spool. - config BUSYBOX_CONFIG_CRONTAB bool "crontab" default BUSYBOX_DEFAULT_CRONTAB @@ -701,22 +715,6 @@ config BUSYBOX_CONFIG_STRINGS strings prints the printable character sequences for each file specified. -config BUSYBOX_CONFIG_TASKSET - bool "taskset" - default BUSYBOX_DEFAULT_TASKSET # 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_CONFIG_FEATURE_TASKSET_FANCY - bool "Fancy output" - default BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY - depends on BUSYBOX_CONFIG_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_CONFIG_TIME bool "time" default BUSYBOX_DEFAULT_TIME diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in index 52e38a3..b3dd8c8 100644 --- a/package/utils/busybox/config/networking/Config.in +++ b/package/utils/busybox/config/networking/Config.in @@ -67,7 +67,6 @@ config BUSYBOX_CONFIG_NC_110_COMPAT bool "Netcat 1.10 compatibility (+2.5k)" default BUSYBOX_DEFAULT_NC_110_COMPAT # off specially for Rob depends on BUSYBOX_CONFIG_NC - select BUSYBOX_CONFIG_NC_SERVER help This option makes nc closely follow original nc-1.10. The code is about 2.5k bigger. It enables @@ -228,6 +227,13 @@ config BUSYBOX_CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST it increases the code size by ~40 bytes. Most other ftp servers seem to behave similar to this. +config BUSYBOX_CONFIG_FEATURE_FTP_AUTHENTICATION + bool "Enable authentication" + default BUSYBOX_DEFAULT_FEATURE_FTP_AUTHENTICATION + depends on BUSYBOX_CONFIG_FTPD + help + Enable basic system login as seen in telnet etc. + config BUSYBOX_CONFIG_FTPGET bool "ftpget" default BUSYBOX_DEFAULT_FTPGET @@ -268,14 +274,6 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted downloads, seeking in multimedia players etc. -config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE - bool "Use sendfile system call" - default BUSYBOX_DEFAULT_FEATURE_HTTPD_USE_SENDFILE - depends on BUSYBOX_CONFIG_HTTPD - help - When enabled, httpd will use the kernel sendfile() function - instead of read/write loop. - config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID bool "Enable -u <user> option" default BUSYBOX_DEFAULT_FEATURE_HTTPD_SETUID @@ -764,6 +762,14 @@ config BUSYBOX_CONFIG_FEATURE_NTPD_SERVER Make ntpd usable as a NTP server. If you disable this option ntpd will be usable only as a NTP client. +config BUSYBOX_CONFIG_FEATURE_NTPD_CONF + bool "Make ntpd understand /etc/ntp.conf" + default BUSYBOX_DEFAULT_FEATURE_NTPD_CONF + depends on BUSYBOX_CONFIG_NTPD + help + Make ntpd look in /etc/ntp.conf for peers. Only "server address" + is supported. + config BUSYBOX_CONFIG_PSCAN bool "pscan" default BUSYBOX_DEFAULT_PSCAN diff --git a/package/utils/busybox/config/networking/udhcp/Config.in b/package/utils/busybox/config/networking/udhcp/Config.in index 576a01a..4f48400 100644 --- a/package/utils/busybox/config/networking/udhcp/Config.in +++ b/package/utils/busybox/config/networking/udhcp/Config.in @@ -90,6 +90,17 @@ config BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING will DHCPDECLINE the offer if the address is in use, and restart the discover process. +config BUSYBOX_CONFIG_FEATURE_UDHCPC_SANITIZEOPT + bool "Do not pass malformed host and domain names" + default BUSYBOX_DEFAULT_FEATURE_UDHCPC_SANITIZEOPT + depends on BUSYBOX_CONFIG_UDHCPC + help + If selected, udhcpc will check some options (such as option 12 - + hostname) and if they don't look like valid hostnames + (for example, if they start with dash or contain spaces), + they will be replaced with string "bad" when exporting + to the environment. + config BUSYBOX_CONFIG_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default BUSYBOX_DEFAULT_FEATURE_UDHCP_PORT diff --git a/package/utils/busybox/config/shell/Config.in b/package/utils/busybox/config/shell/Config.in index c375f0c..69ecf14 100644 --- a/package/utils/busybox/config/shell/Config.in +++ b/package/utils/busybox/config/shell/Config.in @@ -73,6 +73,13 @@ config BUSYBOX_CONFIG_ASH_BUILTIN_TEST help Enable support for test builtin in ash. +config BUSYBOX_CONFIG_ASH_HELP + bool "help builtin" + default BUSYBOX_DEFAULT_ASH_HELP + depends on BUSYBOX_CONFIG_ASH + help + Enable help builtin in ash. + config BUSYBOX_CONFIG_ASH_CMDCMD bool "'command' command to override shell builtins" default BUSYBOX_DEFAULT_ASH_CMDCMD diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in index f78234d..8d1464d 100644 --- a/package/utils/busybox/config/util-linux/Config.in +++ b/package/utils/busybox/config/util-linux/Config.in @@ -11,6 +11,12 @@ config BUSYBOX_CONFIG_BLOCKDEV default BUSYBOX_DEFAULT_BLOCKDEV help Performs some ioctls with block devices. +config BUSYBOX_CONFIG_FATATTR + bool "fatattr" + default BUSYBOX_DEFAULT_FATATTR + select BUSYBOX_CONFIG_PLATFORM_LINUX + help + fatattr lists or changes the file attributes on a fat file system. config BUSYBOX_CONFIG_FSTRIM bool "fstrim" default BUSYBOX_DEFAULT_FSTRIM @@ -672,6 +678,15 @@ config BUSYBOX_CONFIG_SWAPONOFF space. If you are not using any swap space, you can leave this option disabled. +config BUSYBOX_CONFIG_FEATURE_SWAPON_DISCARD + bool "Support discard option -d" + default BUSYBOX_DEFAULT_FEATURE_SWAPON_DISCARD + depends on BUSYBOX_CONFIG_SWAPONOFF + help + Enable support for discarding swap area blocks at swapon and/or as + the kernel frees them. This option enables both the -d option on + 'swapon' and the 'discard' option for swap entries in /etc/fstab. + config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI bool "Support priority option -p" default BUSYBOX_DEFAULT_FEATURE_SWAPON_PRI |