Bump version and update busybox Config.in files. Also use the HTTPS URL for downloading.
Signed-off-by: Clemens Gruber <[email protected]> --- config/busybox/Config.in | 22 ++++ config/busybox/archival/Config.in | 29 +++-- config/busybox/coreutils/Config.in | 39 ++++--- config/busybox/debianutils/Config.in | 5 - config/busybox/e2fsprogs/Config.in | 34 +++--- config/busybox/init/Config.in | 49 ++++++--- config/busybox/libbb/Config.in | 48 ++++++-- config/busybox/loginutils/Config.in | 106 +++++++++--------- config/busybox/miscutils/Config.in | 22 ++-- config/busybox/modutils/Config.in | 3 - config/busybox/networking/Config.in | 15 ++- config/busybox/printutils/Config.in | 2 - config/busybox/runit/Config.in | 65 +++++------ config/busybox/sysklogd/Config.in | 121 ++++++++++----------- config/busybox/util-linux/Config.in | 45 ++++++-- config/busybox/util-linux/volume_id/Config.in | 8 ++ .../0200-reactivate-check-for-tty.patch | 0 ...mat-warning-when-building-applets-usage_p.patch | 0 ...ystem-only-pass-real-libs-to-SELINUX_LIBS.patch | 0 ...link-honour-SKIP_STRIP-and-don-t-strip-if.patch | 0 patches/{busybox-1.24.2 => busybox-1.25.1}/series | 0 rules/busybox.make | 6 +- 22 files changed, 350 insertions(+), 269 deletions(-) rename patches/{busybox-1.24.2 => busybox-1.25.1}/0200-reactivate-check-for-tty.patch (100%) rename patches/{busybox-1.24.2 => busybox-1.25.1}/0201-Fix-the-format-warning-when-building-applets-usage_p.patch (100%) rename patches/{busybox-1.24.2 => busybox-1.25.1}/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (100%) rename patches/{busybox-1.24.2 => busybox-1.25.1}/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (100%) rename patches/{busybox-1.24.2 => busybox-1.25.1}/series (100%) diff --git a/config/busybox/Config.in b/config/busybox/Config.in index fb39293..60f4da2 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -116,9 +116,21 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE and have very little memory, this might not be a win. Otherwise, you probably want this. +config BUSYBOX_BUSYBOX + bool "Include busybox applet" + default y + help + The busybox applet provides general help regarding busybox and + allows the included applets to be listed. It's also required + if applet links are to be installed at runtime. + + If you can live without these features disabling this will save + some space. + config BUSYBOX_FEATURE_INSTALLER bool "Support --install [-s] to install applet links at runtime" default y + depends on BUSYBOX_BUSYBOX help Enable 'busybox --install [-s]' support. This will allow you to use busybox at runtime to create hard links or symlinks for all the @@ -688,6 +700,16 @@ config BUSYBOX_DEBUG_PESSIMIZE in a much bigger executable that more closely matches the source code. +config BUSYBOX_DEBUG_SANITIZE + bool "Enable runtime sanitizers (ASAN/LSAN/USAN/etc...)" + default n + help + Say Y here if you want to enable runtime sanitizers. These help + catch bad memory accesses (e.g. buffer overflows), but will make + the executable larger and slow down runtime a bit. + + If you aren't developing/testing busybox, say N here. + config BUSYBOX_UNIT_TEST bool "Build unit tests" default n diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in index b48eb3b..f8c0987 100644 --- a/config/busybox/archival/Config.in +++ b/config/busybox/archival/Config.in @@ -32,7 +32,7 @@ config BUSYBOX_FEATURE_SEAMLESS_GZ config BUSYBOX_FEATURE_SEAMLESS_Z bool "tar, rpm, modprobe etc understand .Z data" - default n + default n # it is ancient help Make tar, rpm, modprobe etc understand .Z data. @@ -41,23 +41,13 @@ config BUSYBOX_AR default n # needs to be improved to be able to replace binutils ar help ar is an archival utility program used to create, modify, and - extract contents from archives. An archive is a single file holding - a collection of other files in a structure that makes it possible to - retrieve the original individual files (called archive members). - The original files' contents, mode (permissions), timestamp, owner, - and group are preserved in the archive, and can be restored on - extraction. - - The stored filename is limited to 15 characters. (for more information - see long filename support). - ar has 60 bytes of overheads for every stored file. - - This implementation of ar can extract archives, it cannot create or - modify them. + extract contents from archives. In practice, it is used exclusively + for object module archives used by compilers. + On an x86 system, the ar applet adds about 1K. Unless you have a specific application which requires ar, you should - probably say N here. + 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)" @@ -77,7 +67,7 @@ config BUSYBOX_FEATURE_AR_CREATE This enables archive creation (-c and -r) with busybox ar. config BUSYBOX_UNCOMPRESS bool "uncompress" - default n + default n # ancient help uncompress is used to decompress archives created by compress. Not much used anymore, replaced by gzip/gunzip. @@ -88,6 +78,13 @@ config BUSYBOX_GUNZIP gunzip is used to decompress archives created by gzip. You can use the `-t' option to test the integrity of an archive, without decompressing it. + +config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_GUNZIP && BUSYBOX_LONG_OPTS + help + Enable use of long options. config BUSYBOX_BUNZIP2 bool "bunzip2" default y diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 6e9ae97..98140de 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -123,6 +123,29 @@ config BUSYBOX_SHUF default y help Generate random permutations +config BUSYBOX_STAT + bool "stat" + default y + help + display file or filesystem status. + +config BUSYBOX_FEATURE_STAT_FORMAT + bool "Enable custom formats (-c)" + default y + depends on BUSYBOX_STAT + help + Without this, stat will not support the '-c format' option where + users can pass a custom format string for output. This adds about + 7k to a nonstatic build on amd64. + +config BUSYBOX_FEATURE_STAT_FILESYSTEM + bool "Enable display of filesystem status (-f)" + default y + depends on BUSYBOX_STAT + select BUSYBOX_PLATFORM_LINUX # statfs() + help + Without this, stat will not support the '-f' option to display + information about filesystem status. config BUSYBOX_SYNC bool "sync" default y @@ -760,22 +783,6 @@ config BUSYBOX_FEATURE_SPLIT_FANCY Supports additional suffixes 'b' for 512 bytes, 'g' for 1GiB for the -b option. -config BUSYBOX_STAT - bool "stat" - default y - select BUSYBOX_PLATFORM_LINUX # statfs() - help - display file or filesystem status. - -config BUSYBOX_FEATURE_STAT_FORMAT - bool "Enable custom formats (-c)" - default y - depends on BUSYBOX_STAT - help - Without this, stat will not support the '-c format' option where - users can pass a custom format string for output. This adds about - 7k to a nonstatic build on amd64. - config BUSYBOX_STTY bool "stty" default y diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in index 89fcf27..632c36e 100644 --- a/config/busybox/debianutils/Config.in +++ b/config/busybox/debianutils/Config.in @@ -6,19 +6,16 @@ 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 help Display a dot to indicate pipe activity. - config BUSYBOX_RUN_PARTS bool "run-parts" default y @@ -49,7 +46,6 @@ config BUSYBOX_FEATURE_RUN_PARTS_FANCY Support additional options: -l --list print the names of the all matching files (not limited to executables), but don't actually run them. - config BUSYBOX_START_STOP_DAEMON bool "start-stop-daemon" default y @@ -74,7 +70,6 @@ config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS 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/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in index 6d2f3c4..19d1497 100644 --- a/config/busybox/e2fsprogs/Config.in +++ b/config/busybox/e2fsprogs/Config.in @@ -6,22 +6,11 @@ menu "Linux Ext2 FS Progs" - config BUSYBOX_CHATTR bool "chattr" default y help chattr changes the file attributes on a second extended file system. - -### config E2FSCK -### bool "e2fsck" -### default y -### help -### e2fsck is used to check Linux second extended file systems (ext2fs). -### e2fsck also supports ext2 filesystems countaining a journal (ext3). -### The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also -### provided. - config BUSYBOX_FSCK bool "fsck" default y @@ -29,13 +18,27 @@ config BUSYBOX_FSCK fsck is used to check and optionally repair one or more filesystems. In actuality, fsck is simply a front-end for the various file system checkers (fsck.fstype) available under Linux. - config BUSYBOX_LSATTR bool "lsattr" default y select BUSYBOX_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. +config BUSYBOX_TUNE2FS + bool "tune2fs" + default n # off: it is too limited compared to upstream version + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. + +### config E2FSCK +### bool "e2fsck" +### default y +### help +### e2fsck is used to check Linux second extended file systems (ext2fs). +### e2fsck also supports ext2 filesystems countaining a journal (ext3). +### The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also +### provided. ### config MKE2FS ### bool "mke2fs" @@ -44,13 +47,6 @@ config BUSYBOX_LSATTR ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. -config BUSYBOX_TUNE2FS - bool "tune2fs" - default n # off: it is too limited compared to upstream version - help - tune2fs allows the system administrator to adjust various tunable - filesystem parameters on Linux ext2/ext3 filesystems. - ### config E2LABEL ### bool "e2label" ### default y diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in index 60918a8..e6c9d33 100644 --- a/config/busybox/init/Config.in +++ b/config/busybox/init/Config.in @@ -76,10 +76,21 @@ config BUSYBOX_INIT help init is the first program run when the system boots. +config BUSYBOX_LINUXRC + bool "Support running init from within an initrd (not initramfs)" + default y + select BUSYBOX_FEATURE_SYSLOG + help + Legacy support for running init under the old-style initrd. Allows + the name linuxrc to act as init, and it doesn't assume init is PID 1. + + This does not apply to initramfs, which runs /init as PID 1 and + requires no special support. + config BUSYBOX_FEATURE_USE_INITTAB bool "Support reading an inittab file" default y - depends on BUSYBOX_INIT + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC help Allow init to read an inittab file when the system boot. @@ -106,7 +117,7 @@ config BUSYBOX_FEATURE_KILL_DELAY config BUSYBOX_FEATURE_INIT_SCTTY bool "Run commands with leading dash with controlling tty" default y - depends on BUSYBOX_INIT + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC help If this option is enabled, init will try to give a controlling tty to any command which has leading hyphen (often it's "-/bin/sh"). @@ -121,40 +132,29 @@ config BUSYBOX_FEATURE_INIT_SCTTY config BUSYBOX_FEATURE_INIT_SYSLOG bool "Enable init to write to syslog" default y - depends on BUSYBOX_INIT + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC config BUSYBOX_FEATURE_EXTRA_QUIET bool "Be _extra_ quiet on boot" default y - depends on BUSYBOX_INIT + 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)" default y - depends on BUSYBOX_INIT + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC help If this option is enabled and the file /.init_enable_core exists, then init will call setrlimit() to allow unlimited core file sizes. If this option is disabled, processes will not generate any core files. -config BUSYBOX_FEATURE_INITRD - bool "Support running init from within an initrd (not initramfs)" - default y - depends on BUSYBOX_INIT - help - Legacy support for running init under the old-style initrd. Allows - the name linuxrc to act as init, and it doesn't assume init is PID 1. - - This does not apply to initramfs, which runs /init as PID 1 and - requires no special support. - config BUSYBOX_INIT_TERMINAL_TYPE string "Initial terminal type" default "linux" - depends on BUSYBOX_INIT + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC help This is the initial value set by init for the TERM environment variable. This variable is used by programs which make use of @@ -162,6 +162,21 @@ config BUSYBOX_INIT_TERMINAL_TYPE Note that on Linux, init attempts to detect serial terminal and sets TERM to "vt102" if one is found. + +config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE + bool "Modify the command-line to \"init\"" + 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 + "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 diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index cfa4839..7ce8693 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -6,14 +6,38 @@ menu "Busybox Library Tuning" -config BUSYBOX_FEATURE_SYSTEMD - bool "Enable systemd support" - default y +config BUSYBOX_FEATURE_USE_BSS_TAIL + bool "Use the end of BSS page" + default n help - If you plan to use busybox daemons on a system where daemons - are controlled by systemd, enable this option. - If you don't use systemd, it is still safe to enable it, - but the downside is increased code size. + Attempt to reclaim a small unused part of BSS. + + Executables have the following parts: + = read-only executable code and constants, also known as "text" + = read-write data + = non-initialized (zeroed on demand) data, also known as "bss" + + At link time, "text" is padded to a full page. At runtime, all "text" + pages are mapped RO and executable. + "Data" starts on the next page boundary, but is not padded + to a full page at the end. "Bss" starts wherever "data" ends. + At runtime, "data" pages are mapped RW and they are file-backed + (this includes a small portion of "bss" which may live in the last + partial page of "data"). + Pages which are fully in "bss" are mapped to anonymous memory. + + "Bss" end is usually not page-aligned. There is an unused space + in the last page. Linker marks its start with the "_end" symbol. + + This option will attempt to use that space for bb_common_bufsiz1[] + array. If it fits after _end, it will be used, and COMMON_BUFSIZE + will be enlarged from its guaranteed minimum size of 1 kbyte. + This may require recompilation a second time, since value of _end + is known only after final link. + + If you are getting a build error like this: + appletlib.c:(.text.main+0xd): undefined reference to '_end' + disable this option. config BUSYBOX_FEATURE_RTMINMAX bool "Support RTMIN[+n] and RTMAX[-n] signal names" default y @@ -30,7 +54,7 @@ config BUSYBOX_PASSWORD_MINLEN config BUSYBOX_MD5_SMALL int "MD5: Trade bytes for speed (0:fast, 3:slow)" - default 1 + default 1 # all "fast or small" options default to small range 0 3 help Trade binary size versus speed for the md5sum algorithm. @@ -44,7 +68,7 @@ config BUSYBOX_MD5_SMALL config BUSYBOX_SHA3_SMALL int "SHA3: Trade bytes for speed (0:fast, 1:slow)" - default 1 + default 1 # all "fast or small" options default to small range 0 1 help Trade binary size versus speed for the sha3sum algorithm. @@ -54,7 +78,7 @@ config BUSYBOX_SHA3_SMALL config BUSYBOX_FEATURE_FAST_TOP bool "Faster /proc scanning code (+100 bytes)" - default y + default n # all "fast or small" options default to small help This option makes top (and ps) ~20% faster (or 20% less CPU hungry), but code size is slightly bigger. @@ -128,7 +152,7 @@ config BUSYBOX_FEATURE_EDITING_SAVE_ON_EXIT config BUSYBOX_FEATURE_REVERSE_SEARCH bool "Reverse history search" default y - depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY + depends on BUSYBOX_FEATURE_EDITING help Enable readline-like Ctrl-R combination for reverse history search. Increases code by about 0.5k. @@ -222,7 +246,7 @@ config BUSYBOX_FEATURE_SKIP_ROOTFS config BUSYBOX_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - default n + default y select BUSYBOX_PLATFORM_LINUX help Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in index 03c0488..fb3edd1 100644 --- a/config/busybox/loginutils/Config.in +++ b/config/busybox/loginutils/Config.in @@ -6,18 +6,6 @@ menu "Login/Password Management Utilities" -config BUSYBOX_ADD_SHELL - bool "add-shell" - default y if BUSYBOX_DESKTOP - help - Add shells to /etc/shells. - -config BUSYBOX_REMOVE_SHELL - bool "remove-shell" - default y if BUSYBOX_DESKTOP - help - Remove shells from /etc/shells. - config BUSYBOX_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" default y @@ -104,6 +92,38 @@ config BUSYBOX_USE_BB_CRYPT_SHA With this option off, login will fail password check for any user which has password encrypted with these algorithms. +config BUSYBOX_ADD_SHELL + bool "add-shell" + default y if BUSYBOX_DESKTOP + help + Add shells to /etc/shells. + +config BUSYBOX_REMOVE_SHELL + bool "remove-shell" + default y if BUSYBOX_DESKTOP + help + Remove shells from /etc/shells. +config BUSYBOX_ADDGROUP + bool "addgroup" + default y + help + Utility for creating a new group account. + +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" + default y + depends on BUSYBOX_ADDGROUP + help + If called with two non-option arguments, + addgroup will add an existing user to an + existing group. config BUSYBOX_ADDUSER bool "adduser" default y @@ -151,29 +171,33 @@ config BUSYBOX_LAST_SYSTEM_ID default 999 help Last valid system uid or gid for adduser and addgroup - -config BUSYBOX_ADDGROUP - bool "addgroup" +config BUSYBOX_CHPASSWD + bool "chpasswd" default y help - Utility for creating a new group account. + Reads a file of user name and password pairs from standard input + and uses this information to update a group of existing users. -config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS - bool "Enable long options" +config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO + string "Default password encryption method (passwd -a, cryptpw -m parameter)" + default "des" + depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW + help + Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". +config BUSYBOX_CRYPTPW + bool "cryptpw" default y - depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS help - Support long options for the addgroup applet. + Encrypts the given password with the crypt(3) libc function + using the given salt. -config BUSYBOX_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" +config BUSYBOX_MKPASSWD + bool "mkpasswd" default y - depends on BUSYBOX_ADDGROUP help - If called with two non-option arguments, - addgroup will add an existing user to an - existing group. - + Encrypts the given password with the crypt(3) libc function + using the given salt. Debian has this utility under mkpasswd + name. Busybox provides mkpasswd as an alias for cryptpw. config BUSYBOX_DELUSER bool "deluser" default y @@ -193,7 +217,6 @@ config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP help If called with two non-option arguments, deluser or delgroup will remove an user from a specified group. - config BUSYBOX_GETTY bool "getty" default y @@ -212,7 +235,6 @@ config BUSYBOX_GETTY printf "%s login: " "`hostname`" read -r login exec /bin/login "$login" - config BUSYBOX_LOGIN bool "login" default y @@ -258,7 +280,6 @@ config BUSYBOX_FEATURE_SECURETTY The file /etc/securetty is used by (some versions of) login(1). The file contains the device names of tty lines (one per line, without leading /dev/) on which root is allowed to login. - config BUSYBOX_PASSWD bool "passwd" default y @@ -278,29 +299,6 @@ config BUSYBOX_FEATURE_PASSWD_WEAK_CHECK depends on BUSYBOX_PASSWD help With this option passwd will refuse new passwords which are "weak". - -config BUSYBOX_CRYPTPW - bool "cryptpw" - default y - help - Encrypts the given password with the crypt(3) libc function - using the given salt. Debian has this utility under mkpasswd - name. Busybox provides mkpasswd as an alias for cryptpw. - -config BUSYBOX_CHPASSWD - bool "chpasswd" - default y - help - Reads a file of user name and password pairs from standard input - 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)" - default "des" - depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW - help - Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". - config BUSYBOX_SU bool "su" default y @@ -321,7 +319,6 @@ config BUSYBOX_FEATURE_SU_CHECKS_SHELLS bool "Enable su to check user's shell to be listed in /etc/shells" depends on BUSYBOX_SU default y - config BUSYBOX_SULOGIN bool "sulogin" default y @@ -329,7 +326,6 @@ config BUSYBOX_SULOGIN help sulogin is invoked when the system goes into single user mode (this is done through an entry in inittab). - config BUSYBOX_VLOCK bool "vlock" default y diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 616f62b..40b586f 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -246,6 +246,12 @@ config BUSYBOX_UBIUPDATEVOL select BUSYBOX_PLATFORM_LINUX help Update a UBI volume. +config BUSYBOX_UBIRENAME + bool "ubirename" + default y + select BUSYBOX_PLATFORM_LINUX + help + Utility to rename UBI volumes config BUSYBOX_WALL bool "wall" default y @@ -554,23 +560,13 @@ config BUSYBOX_LAST help 'last' displays a list of the last users that logged into the system. -choice - prompt "Choose last implementation" - depends on BUSYBOX_LAST - default BUSYBOX_FEATURE_LAST_FANCY - -config BUSYBOX_FEATURE_LAST_SMALL - bool "small" - help - This is a small version of last with just the basic set of - features. - config BUSYBOX_FEATURE_LAST_FANCY - bool "huge" + 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. -endchoice config BUSYBOX_HDPARM bool "hdparm" diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in index 7f2b355..2d953e6 100644 --- a/config/busybox/modutils/Config.in +++ b/config/busybox/modutils/Config.in @@ -44,9 +44,6 @@ config BUSYBOX_MODPROBE_SMALL - rmmod is an alias to modprobe -r - depmod generates modules.dep.bb - As of 2008-07, this code is experimental. It is 14kb smaller - than "non-small" modutils. - config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE bool "Accept module options on modprobe command line" default y diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index f695c89..5436a07 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -673,7 +673,7 @@ config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN config BUSYBOX_FEATURE_INETD_RPC bool "Support RPC services" - default y + default n # very rarely used, and needs Sun RPC support in libc depends on BUSYBOX_INETD select BUSYBOX_FEATURE_HAVE_RPC help @@ -730,6 +730,13 @@ config BUSYBOX_FEATURE_IP_RULE help Add support for rule commands to "ip". +config BUSYBOX_FEATURE_IP_NEIGH + bool "ip neighbor" + default y + depends on BUSYBOX_IP + help + Add support for neighbor commands to "ip". + config BUSYBOX_FEATURE_IP_SHORT_FORMS bool "Support short forms of ip commands" default y @@ -741,6 +748,7 @@ config BUSYBOX_FEATURE_IP_SHORT_FORMS ip route -> iproute ip tunnel -> iptunnel ip rule -> iprule + ip neigh -> ipneigh Say N unless you desparately need the short form of the ip object commands. @@ -780,6 +788,11 @@ config BUSYBOX_IPRULE default y depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_RULE +config BUSYBOX_IPNEIGH + bool + default y + depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_NEIGH + config BUSYBOX_IPCALC bool "ipcalc" default y diff --git a/config/busybox/printutils/Config.in b/config/busybox/printutils/Config.in index 52cc1db..91c3e77 100644 --- a/config/busybox/printutils/Config.in +++ b/config/busybox/printutils/Config.in @@ -6,13 +6,11 @@ menu "Print Utilities" - config BUSYBOX_LPD bool "lpd" default y help lpd is a print spooling daemon. - config BUSYBOX_LPR bool "lpr" default y diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in index e993a13..c3cf8d4 100644 --- a/config/busybox/runit/Config.in +++ b/config/busybox/runit/Config.in @@ -6,14 +6,43 @@ menu "Runit Utilities" +config BUSYBOX_CHPST + bool "chpst" + default y + help + chpst changes the process state according to the given options, and + execs specified program. +config BUSYBOX_SETUIDGID + bool "setuidgid" + default y + help + Sets soft resource limits as specified by options + +config BUSYBOX_ENVUIDGID + bool "envuidgid" + default y + help + Sets $UID to account's uid and $GID to account's gid + +config BUSYBOX_ENVDIR + bool "envdir" + default y + help + Sets various environment variables as specified by files + in the given directory + +config BUSYBOX_SOFTLIMIT + bool "softlimit" + default y + help + Sets soft resource limits as specified by options config BUSYBOX_RUNSV bool "runsv" default y help runsv starts and monitors a service and optionally an appendant log service. - config BUSYBOX_RUNSVDIR bool "runsvdir" default y @@ -30,7 +59,6 @@ config BUSYBOX_FEATURE_RUNSVDIR_LOG Enable feature where second parameter of runsvdir holds last error message (viewable via top/ps). Otherwise (feature is off or no parameter), error messages go to stderr only. - config BUSYBOX_SV bool "sv" default y @@ -45,7 +73,6 @@ config BUSYBOX_SV_DEFAULT_SERVICE_DIR help Default directory for services. Defaults to "/var/service" - config BUSYBOX_SVLOGD bool "svlogd" default y @@ -54,36 +81,4 @@ config BUSYBOX_SVLOGD filters log messages, and writes the data to one or more automatically rotated logs. -config BUSYBOX_CHPST - bool "chpst" - default y - help - chpst changes the process state according to the given options, and - execs specified program. - -config BUSYBOX_SETUIDGID - bool "setuidgid" - default y - help - Sets soft resource limits as specified by options - -config BUSYBOX_ENVUIDGID - bool "envuidgid" - default y - help - Sets $UID to account's uid and $GID to account's gid - -config BUSYBOX_ENVDIR - bool "envdir" - default y - help - Sets various environment variables as specified by files - in the given directory - -config BUSYBOX_SOFTLIMIT - bool "softlimit" - default y - help - Sets soft resource limits as specified by options - endmenu diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in index e6e9cbb..b5981b7 100644 --- a/config/busybox/sysklogd/Config.in +++ b/config/busybox/sysklogd/Config.in @@ -6,6 +6,64 @@ menu "System Logging Utilities" +config BUSYBOX_KLOGD + bool "klogd" + default y + help + klogd is a utility which intercepts and logs all + messages from the Linux kernel and sends the messages + out to the 'syslogd' utility so they can be logged. If + you wish to record the messages produced by the kernel, + you should enable this option. + +comment "klogd should not be used together with syslog to kernel printk buffer" + depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG + +config BUSYBOX_FEATURE_KLOGD_KLOGCTL + bool "Use the klogctl() interface" + default y + depends on BUSYBOX_KLOGD + select BUSYBOX_PLATFORM_LINUX + help + The klogd applet supports two interfaces for reading + kernel messages. Linux provides the klogctl() interface + which allows reading messages from the kernel ring buffer + independently from the file system. + + If you answer 'N' here, klogd will use the more portable + approach of reading them from /proc or a device node. + However, this method requires the file to be available. + + If in doubt, say 'Y'. +config BUSYBOX_LOGGER + bool "logger" + default y + select BUSYBOX_FEATURE_SYSLOG + help + The logger utility allows you to send arbitrary text + messages to the system log (i.e. the 'syslogd' utility) so + they can be logged. This is generally used to help locate + problems that occur within programs and scripts. +config BUSYBOX_LOGREAD + bool "logread" + default y + depends on BUSYBOX_FEATURE_IPC_SYSLOG + help + If you enabled Circular Buffer support, you almost + certainly want to enable this feature as well. This + utility will allow you to read the messages that are + stored in the syslogd circular buffer. + +config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING + bool "Double buffering" + default y + depends on BUSYBOX_LOGREAD + help + 'logread' ouput 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 + contention at some minor memory expense. config BUSYBOX_SYSLOGD bool "syslogd" @@ -28,7 +86,7 @@ config BUSYBOX_FEATURE_ROTATE_LOGFILE depends on BUSYBOX_SYSLOGD help This enables syslogd to rotate the message files - on his own. No need to use an external rotatescript. + on his own. No need to use an external rotate script. config BUSYBOX_FEATURE_REMOTE_LOG bool "Remote Log support" @@ -92,27 +150,6 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE This option sets the size of the circular buffer used to record system log messages. -config BUSYBOX_LOGREAD - bool "logread" - default y - depends on BUSYBOX_FEATURE_IPC_SYSLOG - help - If you enabled Circular Buffer support, you almost - certainly want to enable this feature as well. This - utility will allow you to read the messages that are - stored in the syslogd circular buffer. - -config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING - bool "Double buffering" - default y - depends on BUSYBOX_LOGREAD - help - 'logread' ouput 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 - contention at some minor memory expense. - config BUSYBOX_FEATURE_KMSG_SYSLOG bool "Linux kernel printk buffer support" default y @@ -126,44 +163,4 @@ config BUSYBOX_FEATURE_KMSG_SYSLOG NOTICE: Syslog facilities in log entries needs kernel 3.5+. -config BUSYBOX_KLOGD - bool "klogd" - default y - help - klogd is a utility which intercepts and logs all - messages from the Linux kernel and sends the messages - out to the 'syslogd' utility so they can be logged. If - you wish to record the messages produced by the kernel, - you should enable this option. - -comment "klogd should not be used together with syslog to kernel printk buffer" - depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG - -config BUSYBOX_FEATURE_KLOGD_KLOGCTL - bool "Use the klogctl() interface" - default y - depends on BUSYBOX_KLOGD - select BUSYBOX_PLATFORM_LINUX - help - The klogd applet supports two interfaces for reading - kernel messages. Linux provides the klogctl() interface - which allows reading messages from the kernel ring buffer - independently from the file system. - - If you answer 'N' here, klogd will use the more portable - approach of reading them from /proc or a device node. - However, this method requires the file to be available. - - If in doubt, say 'Y'. - -config BUSYBOX_LOGGER - bool "logger" - default y - select BUSYBOX_FEATURE_SYSLOG - help - The logger utility allows you to send arbitrary text - messages to the system log (i.e. the 'syslogd' utility) so - they can be logged. This is generally used to help locate - problems that occur within programs and scripts. - endmenu diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index be14882..bc168ce 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -6,6 +6,11 @@ menu "Linux System Utilities" +config BUSYBOX_BLKDISCARD + bool "blkdiscard" + default y + help + blkdiscard discards sectors on a given device. config BUSYBOX_BLOCKDEV bool "blockdev" default y @@ -174,11 +179,34 @@ config BUSYBOX_FEATURE_MOUNT_OTHERTAB default y help Support mount -T (specifying an alternate fstab) +config BUSYBOX_NSENTER + bool "nsenter" + default y + select BUSYBOX_PLATFORM_LINUX + help + Run program with namespaces of other processes. + +config BUSYBOX_FEATURE_NSENTER_LONG_OPTS + bool "Enable long options" + default y + depends on BUSYBOX_NSENTER && BUSYBOX_LONG_OPTS + help + Support long options for the nsenter applet. This makes + the busybox implementation more compatible with upstream. config BUSYBOX_REV bool "rev" default y help Reverse lines of a file or files. +config BUSYBOX_SETARCH + bool "setarch" + default y + select BUSYBOX_PLATFORM_LINUX + help + The linux32 utility is used to create a 32bit environment for the + specified program (usually a shell). It only makes sense to have + this util on a system that supports both 64bit and 32bit userland + (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...). config BUSYBOX_UEVENT bool "uevent" default y @@ -186,6 +214,13 @@ config BUSYBOX_UEVENT help uevent is a netlink listener for kernel uevent notifications sent via netlink. It is usually used for dynamic device creation. +config BUSYBOX_UNSHARE + bool "unshare" + default y + depends on BUSYBOX_LONG_OPTS && !BUSYBOX_NOMMU + select BUSYBOX_PLATFORM_LINUX + help + Run program with some namespaces unshared from parent. config BUSYBOX_ACPID bool "acpid" @@ -669,16 +704,6 @@ config BUSYBOX_SCRIPTREPLAY This program replays a typescript, using timing information given by script -t. -config BUSYBOX_SETARCH - bool "setarch" - default y - select BUSYBOX_PLATFORM_LINUX - help - The linux32 utility is used to create a 32bit environment for the - specified program (usually a shell). It only makes sense to have - this util on a system that supports both 64bit and 32bit userland - (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...). - config BUSYBOX_SWAPONOFF bool "swaponoff" default y diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in index d1deb37..70e5946 100644 --- a/config/busybox/util-linux/volume_id/Config.in +++ b/config/busybox/util-linux/volume_id/Config.in @@ -12,6 +12,14 @@ 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 diff --git a/patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch b/patches/busybox-1.25.1/0200-reactivate-check-for-tty.patch similarity index 100% rename from patches/busybox-1.24.2/0200-reactivate-check-for-tty.patch rename to patches/busybox-1.25.1/0200-reactivate-check-for-tty.patch diff --git a/patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.25.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch similarity index 100% rename from patches/busybox-1.24.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch rename to patches/busybox-1.25.1/0201-Fix-the-format-warning-when-building-applets-usage_p.patch diff --git a/patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.25.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch similarity index 100% rename from patches/busybox-1.24.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch rename to patches/busybox-1.25.1/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch diff --git a/patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.25.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch similarity index 100% rename from patches/busybox-1.24.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch rename to patches/busybox-1.25.1/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch diff --git a/patches/busybox-1.24.2/series b/patches/busybox-1.25.1/series similarity index 100% rename from patches/busybox-1.24.2/series rename to patches/busybox-1.25.1/series diff --git a/rules/busybox.make b/rules/busybox.make index 6d1815a..944fbcc 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION := 1.24.2 -BUSYBOX_MD5 := 2eaae519cac1143bcf583636a745381f +BUSYBOX_VERSION := 1.25.1 +BUSYBOX_MD5 := 4f4c5de50b479b11ff636d7d8eb902a2 BUSYBOX := busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX := tar.bz2 -BUSYBOX_URL := http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) +BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) BUSYBOX_SOURCE := $(SRCDIR)/$(BUSYBOX).$(BUSYBOX_SUFFIX) BUSYBOX_DIR := $(BUILDDIR)/$(BUSYBOX) BUSYBOX_KCONFIG := $(BUSYBOX_DIR)/Config.in -- 2.10.2 _______________________________________________ ptxdist mailing list [email protected]
