diff options
17 files changed, 209 insertions, 141 deletions
diff --git a/config/busybox/Config.in b/config/busybox/Config.in index 2fb1dac8c..fb3929342 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -257,6 +257,26 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. +config BUSYBOX_PAM + bool "Support for 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_FEATURE_USE_SENDFILE + bool "Use sendfile system call" + default y + select BUSYBOX_PLATFORM_LINUX + help + When enabled, busybox will use the kernel sendfile() function + instead of read/write loops to copy data between file descriptors + (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_LONG_OPTS bool "Support for --long-options" default y @@ -416,10 +436,7 @@ config BUSYBOX_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> \ @@ -671,6 +688,14 @@ config BUSYBOX_DEBUG_PESSIMIZE in a much bigger executable that more closely matches the source code. +config BUSYBOX_UNIT_TEST + bool "Build unit tests" + default n + 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_WERROR bool "Abort compilation on any warning" default n diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index b05b80893..0ba3e7a66 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -74,6 +74,11 @@ config BUSYBOX_GROUPS default y help Print the group names associated with current user id. +config BUSYBOX_SHUF + bool "shuf" + default y + help + Generate random permutations config BUSYBOX_TEST bool "test" default y @@ -134,6 +139,11 @@ config BUSYBOX_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_UNLINK + bool "unlink" + default y + help + unlink deletes a file by calling unlink() config BUSYBOX_BASE64 bool "base64" default y @@ -778,12 +788,13 @@ config BUSYBOX_FEATURE_FANCY_TAIL default y depends on BUSYBOX_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_TEE bool "tee" @@ -883,6 +894,16 @@ config BUSYBOX_YES yes is used to repeatedly output a specific string, or the default string `y'. +comment "Common options" + +config BUSYBOX_FEATURE_VERBOSE + bool "Support verbose options (usually -v) for various applets" + default y + 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_CP || BUSYBOX_MV diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in index d9268828e..510cca5b1 100644 --- a/config/busybox/editors/Config.in +++ b/config/busybox/editors/Config.in @@ -192,6 +192,36 @@ config BUSYBOX_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_FEATURE_VI_UNDO + 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 + depends on BUSYBOX_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_FEATURE_VI_UNDO_QUEUE_MAX + int "Maximum undo character queue size" + default 256 + range 32 65536 + depends on BUSYBOX_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_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in index c3dd5caef..a980c79ed 100644 --- a/config/busybox/findutils/Config.in +++ b/config/busybox/findutils/Config.in @@ -90,6 +90,16 @@ config BUSYBOX_FEATURE_FIND_EXEC Support the 'find -exec' option for executing commands based upon the files matched. +config BUSYBOX_FEATURE_FIND_EXEC_PLUS + bool "Enable -exec ... {} +" + default y + depends on BUSYBOX_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_FEATURE_FIND_USER bool "Enable -user: username/uid matching" default y @@ -249,4 +259,11 @@ config BUSYBOX_FEATURE_XARGS_SUPPORT_ZERO_TERM instead of whitespace, and the quotes and backslash are not special. +config BUSYBOX_FEATURE_XARGS_SUPPORT_REPL_STR + bool "Enable -I STR: string to replace" + default y + depends on BUSYBOX_XARGS + help + Support -I STR and -i[STR] options. + endmenu diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in index 978ac3d2c..03c0488f8 100644 --- a/config/busybox/loginutils/Config.in +++ b/config/busybox/loginutils/Config.in @@ -129,10 +129,17 @@ config BUSYBOX_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. +config BUSYBOX_LAST_ID + int "Last valid uid or gid for adduser and addgroup" + depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP + default 60000 + help + Last valid uid or gid for adduser and addgroup + config BUSYBOX_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP - range 0 64900 + range 0 BUSYBOX_LAST_ID default 100 help First valid system uid or gid for adduser and addgroup @@ -140,7 +147,7 @@ config BUSYBOX_FIRST_SYSTEM_ID config BUSYBOX_LAST_SYSTEM_ID int "Last valid system uid or gid for adduser and addgroup" depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP - range 0 64900 + range BUSYBOX_FIRST_SYSTEM_ID BUSYBOX_LAST_ID default 999 help Last valid system uid or gid for adduser and addgroup @@ -227,13 +234,6 @@ config BUSYBOX_LOGIN_SESSION_AS_CHILD almost always would want this to be set to Y, else PAM session will not be cleaned up. -config BUSYBOX_PAM - bool "Support for PAM (Pluggable Authentication Modules)" - default n - depends on BUSYBOX_LOGIN - help - Use PAM in login(1) instead of direct access to password database. - config BUSYBOX_LOGIN_SCRIPTS bool "Support for login scripts" depends on BUSYBOX_LOGIN diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 0f967b71e..520255dd1 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -15,6 +15,39 @@ config BUSYBOX_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_CROND + bool "crond" + default y + select BUSYBOX_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_FEATURE_CROND_D + bool "Support option -d to redirect output to stderr" + depends on BUSYBOX_CROND + default y + help + -d N sets loglevel (0:most verbose) and directs all output to stderr. + +config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL + bool "Report command output via email (using sendmail)" + default y + depends on BUSYBOX_CROND + help + Command output will be sent to corresponding user via email. + +config BUSYBOX_FEATURE_CROND_DIR + string "crond spool directory" + default "/var/spool/cron" + depends on BUSYBOX_CROND || BUSYBOX_CRONTAB + help + Location of crond spool. config BUSYBOX_LESS bool "less" default y @@ -121,6 +154,21 @@ config BUSYBOX_SETSERIAL select BUSYBOX_PLATFORM_LINUX help Retrieve or set Linux serial port. +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_UBIATTACH bool "ubiattach" default y @@ -295,40 +343,6 @@ config BUSYBOX_CHRT manipulate real-time attributes of a process. This requires sched_{g,s}etparam support in your libc. -config BUSYBOX_CROND - bool "crond" - default y - select BUSYBOX_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_FEATURE_CROND_D - bool "Support option -d to redirect output to stderr" - depends on BUSYBOX_CROND - default y - help - -d sets loglevel to 0 (most verbose) and directs all output to stderr. - -config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL - bool "Report command output via email (using sendmail)" - default y - depends on BUSYBOX_CROND - help - Command output will be sent to corresponding user via email. - -config BUSYBOX_FEATURE_CROND_DIR - string "crond spool directory" - default "/var/spool/cron" - depends on BUSYBOX_CROND || BUSYBOX_CRONTAB - help - Location of crond spool. - config BUSYBOX_CRONTAB bool "crontab" default y @@ -695,22 +709,6 @@ config BUSYBOX_STRINGS 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 diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index 3e578664a..56928bf66 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -227,6 +227,13 @@ config BUSYBOX_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_FEATURE_FTP_AUTHENTICATION + bool "Enable authentication" + default y + depends on BUSYBOX_FTPD + help + Enable basic system login as seen in telnet etc. + config BUSYBOX_FTPGET bool "ftpget" default y @@ -267,14 +274,6 @@ config BUSYBOX_FEATURE_HTTPD_RANGES "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted downloads, seeking in multimedia players etc. -config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE - bool "Use sendfile system call" - default y - depends on BUSYBOX_HTTPD - help - When enabled, httpd will use the kernel sendfile() function - instead of read/write loop. - config BUSYBOX_FEATURE_HTTPD_SETUID bool "Enable -u <user> option" default y @@ -757,6 +756,14 @@ config BUSYBOX_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_FEATURE_NTPD_CONF + bool "Make ntpd understand /etc/ntp.conf" + default y + depends on BUSYBOX_NTPD + help + Make ntpd look in /etc/ntp.conf for peers. Only "server address" + is supported. + config BUSYBOX_PSCAN bool "pscan" default y diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in index 58a7d48d5..21d1d3a8f 100644 --- a/config/busybox/networking/udhcp/Config.in +++ b/config/busybox/networking/udhcp/Config.in @@ -90,6 +90,17 @@ config BUSYBOX_FEATURE_UDHCPC_ARPING will DHCPDECLINE the offer if the address is in use, and restart the discover process. +config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT + bool "Do not pass malformed host and domain names" + default y + depends on BUSYBOX_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_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default n diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in index 96eb7bc4e..97f2e6164 100644 --- a/config/busybox/shell/Config.in +++ b/config/busybox/shell/Config.in @@ -73,6 +73,13 @@ config BUSYBOX_ASH_BUILTIN_TEST help Enable support for test builtin in ash. +config BUSYBOX_ASH_HELP + bool "help builtin" + default y + depends on BUSYBOX_ASH + help + Enable help builtin in ash. + config BUSYBOX_ASH_CMDCMD bool "'command' command to override shell builtins" default y diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index e4b146131..4a8bd5e24 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -11,6 +11,12 @@ config BUSYBOX_BLOCKDEV default y help Performs some ioctls with block devices. +config BUSYBOX_FATATTR + bool "fatattr" + default y + select BUSYBOX_PLATFORM_LINUX + help + fatattr lists or changes the file attributes on a fat file system. config BUSYBOX_FSTRIM bool "fstrim" default y @@ -672,6 +678,15 @@ config BUSYBOX_SWAPONOFF space. If you are not using any swap space, you can leave this option disabled. +config BUSYBOX_FEATURE_SWAPON_DISCARD + bool "Support discard option -d" + default y + depends on BUSYBOX_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_FEATURE_SWAPON_PRI bool "Support priority option -p" default y diff --git a/patches/busybox-1.22.1/0001-lzop-add-overflow-check.patch b/patches/busybox-1.22.1/0001-lzop-add-overflow-check.patch deleted file mode 100644 index ae0620bcd..000000000 --- a/patches/busybox-1.22.1/0001-lzop-add-overflow-check.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Mon, 30 Jun 2014 10:14:34 +0200 -Subject: [PATCH] lzop: add overflow check - -See CVE-2014-4607 -http://www.openwall.com/lists/oss-security/2014/06/26/20 - -function old new delta -lzo1x_decompress_safe 1010 1031 +21 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - archival/libarchive/liblzo.h | 2 ++ - archival/libarchive/lzo1x_d.c | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/archival/libarchive/liblzo.h b/archival/libarchive/liblzo.h -index 843997cb9cfe..4596620fee23 100644 ---- a/archival/libarchive/liblzo.h -+++ b/archival/libarchive/liblzo.h -@@ -76,11 +76,13 @@ - # define TEST_IP (ip < ip_end) - # define NEED_IP(x) \ - if ((unsigned)(ip_end - ip) < (unsigned)(x)) goto input_overrun -+# define TEST_IV(x) if ((x) > (unsigned)0 - (511)) goto input_overrun - - # undef TEST_OP /* don't need both of the tests here */ - # define TEST_OP 1 - # define NEED_OP(x) \ - if ((unsigned)(op_end - op) < (unsigned)(x)) goto output_overrun -+# define TEST_OV(x) if ((x) > (unsigned)0 - (511)) goto output_overrun - - #define HAVE_ANY_OP 1 - -diff --git a/archival/libarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c -index 9bc1270da81f..40b167e688e2 100644 ---- a/archival/libarchive/lzo1x_d.c -+++ b/archival/libarchive/lzo1x_d.c -@@ -92,6 +92,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, - ip++; - NEED_IP(1); - } -+ TEST_IV(t); - t += 15 + *ip++; - } - /* copy literals */ -@@ -224,6 +225,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, - ip++; - NEED_IP(1); - } -+ TEST_IV(t); - t += 31 + *ip++; - } - #if defined(COPY_DICT) -@@ -265,6 +267,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, - ip++; - NEED_IP(1); - } -+ TEST_IV(t); - t += 7 + *ip++; - } - #if defined(COPY_DICT) diff --git a/patches/busybox-1.22.1/0200-reactivate-check-for-tty.patch b/patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch index 55869e9fe..55869e9fe 100644 --- a/patches/busybox-1.22.1/0200-reactivate-check-for-tty.patch +++ b/patches/busybox-1.23.1/0200-reactivate-check-for-tty.patch diff --git a/patches/busybox-1.22.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch index 98ad36e1d..98ad36e1d 100644 --- a/patches/busybox-1.22.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch +++ b/patches/busybox-1.23.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch diff --git a/patches/busybox-1.22.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch index d3027e0c2..d3027e0c2 100644 --- a/patches/busybox-1.22.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch +++ b/patches/busybox-1.23.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch diff --git a/patches/busybox-1.22.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch index 5d888347e..08f12b500 100644 --- a/patches/busybox-1.22.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch +++ b/patches/busybox-1.23.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch @@ -9,7 +9,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/trylink b/scripts/trylink -index e471699173bf..671b22b71d93 100755 +index 5da494fbba4c..66e66139b5bd 100755 --- a/scripts/trylink +++ b/scripts/trylink @@ -241,7 +241,12 @@ if test "$CONFIG_BUILD_LIBBUSYBOX" = y; then @@ -47,6 +47,6 @@ index e471699173bf..671b22b71d93 100755 + if test "$SKIP_STRIP" != "y"; then + $STRIP -s --remove-section=.note --remove-section=.comment $EXE + fi + # Let user see that we do something - list the names of created binaries: + echo "$EXE" - done <applet_lst.tmp - fi diff --git a/patches/busybox-1.22.1/series b/patches/busybox-1.23.1/series index e7012679c..84c80aa6e 100644 --- a/patches/busybox-1.22.1/series +++ b/patches/busybox-1.23.1/series @@ -1,11 +1,10 @@ # generated by git-ptx-patches #tag:base --start-number 1 #tag:upstream-stable --start-number 1 -0001-lzop-add-overflow-check.patch #tag:upstream-master --start-number 100 #tag:ptx --start-number 200 0200-reactivate-check-for-tty.patch 0201-Fix-the-format-warning-when-building-applets-usage_p.patch 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch -# c333ef9a178a9815e7c412dac8c8a0bc - git-ptx-patches magic +# 0036b420b1a49106a872780e90251289 - git-ptx-patches magic diff --git a/rules/busybox.make b/rules/busybox.make index 1222e1509..3073ac57a 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION := 1.22.1 -BUSYBOX_MD5 := 337d1a15ab1cb1d4ed423168b1eb7d7e +BUSYBOX_VERSION := 1.23.1 +BUSYBOX_MD5 := 5c94d6301a964cd91619bd4d74605245 BUSYBOX := busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX := tar.bz2 BUSYBOX_URL := http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) |