diff options
39 files changed, 817 insertions, 1415 deletions
diff --git a/config/busybox/Config.in b/config/busybox/Config.in index d5b208310..1094a8646 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -113,7 +113,7 @@ config BB_CONFIG_LOCALE_SUPPORT busybox to support locale settings. config BB_CONFIG_GETOPT_LONG - bool "Enable support for --long-options" + bool "Support for --long-options" default y help Enable this if you want busybox applets to use the gnu --long-option @@ -283,6 +283,17 @@ config BB_CONFIG_STATIC Most people will leave this set to 'N'. +config BB_CONFIG_NOMMU + bool "Force NOMMU build" + default n + help + Busybox tries to detect whether architecture it is being + built against supports MMU or not. If this detection fails, + or if you want to build NOMMU version of busybox for testing, + you may force NOMMU build here. + + Most people will leave this set to 'N'. + config BB_CONFIG_BUILD_LIBBUSYBOX bool "Build shared libbusybox" default n @@ -560,4 +571,4 @@ source config/busybox/shell/Config.in source config/busybox/sysklogd/Config.in source config/busybox/runit/Config.in source config/busybox/selinux/Config.in -source config/busybox/ipsvd/Config.in +source config/busybox/printutils/Config.in diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in index 900f24fb9..c01773834 100644 --- a/config/busybox/archival/Config.in +++ b/config/busybox/archival/Config.in @@ -30,7 +30,7 @@ config BB_CONFIG_AR probably say N here. config BB_CONFIG_FEATURE_AR_LONG_FILENAMES - bool "Enable support for long filenames (not need for debs)" + bool "Support for long filenames (not need for debs)" default n depends on BB_CONFIG_AR help @@ -100,7 +100,7 @@ config BB_CONFIG_DPKG_DEB probably say N here. config BB_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY - bool "extract only (-x)" + bool "Extract only (-x)" default n depends on BB_CONFIG_DPKG_DEB help @@ -167,6 +167,14 @@ config BB_CONFIG_FEATURE_TAR_CREATE If you enable this option you'll be able to create tar archives using the `-c' option. +config BB_CONFIG_FEATURE_TAR_GZIP + bool "Enable -z option" + default y + depends on BB_CONFIG_TAR + help + If you enable this option tar will be able to call gzip, + when creating or extracting tar gziped archives. + config BB_CONFIG_FEATURE_TAR_BZIP2 bool "Enable -j option to handle .tar.bz2 files" default n @@ -183,32 +191,32 @@ config BB_CONFIG_FEATURE_TAR_LZMA If you enable this option you'll be able to extract archives compressed with lzma. -config BB_CONFIG_FEATURE_TAR_FROM - bool "Enable -X (exclude from) and -T (include from) options)" +config BB_CONFIG_FEATURE_TAR_COMPRESS + bool "Enable -Z option" default n depends on BB_CONFIG_TAR help - If you enable this option you'll be able to specify - a list of files to include or exclude from an archive. + If you enable this option tar will be able to call uncompress, + when extracting .tar.Z archives. -config BB_CONFIG_FEATURE_TAR_GZIP - bool "Enable -z option" - default y - depends on BB_CONFIG_TAR +config BB_CONFIG_FEATURE_TAR_AUTODETECT + bool "Let tar autodetect gz/bz2 compresses tarballs" + default n + depends on BB_CONFIG_FEATURE_TAR_GZIP || BB_CONFIG_FEATURE_TAR_BZIP2 help - If you enable this option tar will be able to call gzip, - when creating or extracting tar gziped archives. + With this option tar can automatically detect gzip/bzip2 compressed + tarballs. Currently it works only on seekable streams. -config BB_CONFIG_FEATURE_TAR_COMPRESS - bool "Enable -Z option" +config BB_CONFIG_FEATURE_TAR_FROM + bool "Enable -X (exclude from) and -T (include from) options)" default n depends on BB_CONFIG_TAR help - If you enable this option tar will be able to call uncompress, - when extracting .tar.Z archives. + If you enable this option you'll be able to specify + a list of files to include or exclude from an archive. config BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY - bool "Enable support for old tar header format" + bool "Support for old tar header format" default N depends on BB_CONFIG_TAR help @@ -226,7 +234,7 @@ config BB_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY It is said to be fixed in newer Sun tar, but "old" tarballs still exist. config BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS - bool "Enable support for some GNU tar extensions" + bool "Support for GNU tar extensions (long filenames)" default y depends on BB_CONFIG_TAR help @@ -238,7 +246,16 @@ config BB_CONFIG_FEATURE_TAR_LONG_OPTIONS default n depends on BB_CONFIG_TAR && BB_CONFIG_GETOPT_LONG help - Enable use of long options, increases size by about 400 Bytes + Enable use of long options, increases size by about 400 Bytes + +config BB_CONFIG_FEATURE_TAR_UNAME_GNAME + bool "Enable use of user and group names" + default n + depends on BB_CONFIG_TAR + help + Enables use of user and group names in tar. This affects contents + listings (-t) and preserving permissions when unpacking (-p). + +200 bytes. config BB_CONFIG_UNCOMPRESS bool "uncompress" diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in index 0b85cdb21..0b40a0595 100644 --- a/config/busybox/console-tools/Config.in +++ b/config/busybox/console-tools/Config.in @@ -73,7 +73,7 @@ config BB_CONFIG_RESIZE terminal. config BB_CONFIG_FEATURE_RESIZE_PRINT - bool "print environment variables" + bool "Print environment variables" default n depends on BB_CONFIG_RESIZE help diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 90be19049..e60b713fc 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -489,6 +489,14 @@ config BB_CONFIG_RMDIR help rmdir is used to remove empty directories. +config BB_CONFIG_FEATURE_RMDIR_LONG_OPTIONS + bool "Enable long options" + default n + depends on BB_CONFIG_RMDIR && BB_CONFIG_GETOPT_LONG + help + Support long options for the rmdir applet, including + --ignore-fail-on-non-empty for compatibility with GNU rmdir. + config BB_CONFIG_SEQ bool "seq" default n @@ -521,7 +529,7 @@ config BB_CONFIG_SORT sort is used to sort lines of text in specified files. config BB_CONFIG_FEATURE_SORT_BIG - bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)" + bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)" default y depends on BB_CONFIG_SORT help @@ -539,7 +547,7 @@ config BB_CONFIG_SPLIT split a file into pieces. config BB_CONFIG_FEATURE_SPLIT_FANCY - bool "fancy extensions" + bool "Fancy extensions" default n depends on BB_CONFIG_SPLIT help @@ -580,6 +588,12 @@ config BB_CONFIG_SYNC help sync is used to flush filesystem buffers. +config BB_CONFIG_TAC + bool "tac" + default n + help + tac is used to concatenate and print files in reverse. + config BB_CONFIG_TAIL bool "tail" default n @@ -603,7 +617,7 @@ config BB_CONFIG_TEE to standard output and files. config BB_CONFIG_FEATURE_TEE_USE_BLOCK_IO - bool "Enable block i/o (larger/faster) instead of byte i/o." + bool "Enable block I/O (larger/faster) instead of byte I/O" default n depends on BB_CONFIG_TEE help diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in index 72ed8d548..eaa971f37 100644 --- a/config/busybox/debianutils/Config.in +++ b/config/busybox/debianutils/Config.in @@ -51,7 +51,7 @@ config BB_CONFIG_FEATURE_RUN_PARTS_FANCY config BB_CONFIG_START_STOP_DAEMON bool "start-stop-daemon" - default y + default n help start-stop-daemon is used to control the creation and termination of system-level processes, usually the ones @@ -59,7 +59,7 @@ config BB_CONFIG_START_STOP_DAEMON config BB_CONFIG_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" - default y + default n depends on BB_CONFIG_START_STOP_DAEMON help Support additional arguments. diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in index 0e556ea07..dc5be1ea7 100644 --- a/config/busybox/e2fsprogs/Config.in +++ b/config/busybox/e2fsprogs/Config.in @@ -13,13 +13,13 @@ config BB_CONFIG_CHATTR chattr changes the file attributes on a second extended file system. ### config E2FSCK -### bool "e2fsck" -### default n -### 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. +### bool "e2fsck" +### default n +### 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 BB_CONFIG_FSCK bool "fsck" @@ -36,33 +36,34 @@ config BB_CONFIG_LSATTR lsattr lists the file attributes on a second extended file system. ### config MKE2FS -### bool "mke2fs" -### default n -### help -### mke2fs is used to create an ext2/ext3 filesystem. The normal compat -### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. +### bool "mke2fs" +### default n +### help +### mke2fs is used to create an ext2/ext3 filesystem. The normal compat +### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. ### config TUNE2FS -### bool "tune2fs" -### default n -### help -### tune2fs allows the system administrator to adjust various tunable -### filesystem parameters on Linux ext2/ext3 filesystems. +### bool "tune2fs" +### default n +### help +### tune2fs allows the system administrator to adjust various tunable +### filesystem parameters on Linux ext2/ext3 filesystems. ### config E2LABEL -### bool "e2label" -### default n -### depends on TUNE2FS -### help -### e2label will display or change the filesystem label on the ext2 -### filesystem located on device. +### bool "e2label" +### default n +### depends on TUNE2FS +### help +### e2label will display or change the filesystem label on the ext2 +### filesystem located on device. +### NB: this one is now provided by util-linux/volume_id/* ### config FINDFS -### bool "findfs" -### default n -### depends on TUNE2FS -### help -### findfs will search the disks in the system looking for a filesystem -### which has a label matching label or a UUID equal to uuid. +### bool "findfs" +### default n +### depends on TUNE2FS +### help +### findfs will search the disks in the system looking for a filesystem +### which has a label matching label or a UUID equal to uuid. endmenu diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in index b385e48c4..85fd8b9ba 100644 --- a/config/busybox/init/Config.in +++ b/config/busybox/init/Config.in @@ -14,7 +14,7 @@ config BB_CONFIG_INIT init is the first program run when the system boots. config BB_CONFIG_DEBUG_INIT - bool "debugging aid" + bool "Debugging aid" default n depends on BB_CONFIG_INIT help @@ -28,16 +28,38 @@ config BB_CONFIG_FEATURE_USE_INITTAB help Allow init to read an inittab file when the system boot. +config BB_CONFIG_FEATURE_KILL_REMOVED + bool "Support killing processes that have been removed from inittab" + default y + depends on BB_CONFIG_FEATURE_USE_INITTAB + help + When respawn entries are removed from inittab and a SIGHUP is + sent to init, this feature will kill the processes that have + been removed. + +config BB_CONFIG_FEATURE_KILL_DELAY + int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED + range 0 1024 + default 0 + help + With nonzero setting, init sends TERM, forks, child waits N + seconds, sends KILL and exits. Setting it too high is unwise + (child will hang around for too long and can actually kill + wrong process!) + config BB_CONFIG_FEATURE_INIT_SCTTY - bool "Support running commands with a controlling-tty" + bool "Run commands with leading dash with controlling tty" default n depends on BB_CONFIG_INIT help - If this option is enabled a command starting with hyphen (-) - is run in its own session (setsid(2)) and possibly with a - controlling tty (TIOCSCTTY). This is not the traditional init - behavour, but is often what you want in an embedded system where - the console is only accessed during development or for maintenance. + 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"). + More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)". + If device attached to STDIN_FILENO can be a ctty but is not yet + a ctty for other session, it will become this process' ctty. + This is not the traditional init behavour, but is often what you want + in an embedded system where the console is only accessed during + development or for maintenance. NB: using cttyhack applet may work better. config BB_CONFIG_FEATURE_INIT_SYSLOG diff --git a/config/busybox/ipsvd/Config.in b/config/busybox/ipsvd/Config.in deleted file mode 100644 index 254cca985..000000000 --- a/config/busybox/ipsvd/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "ipsvd utilities" - depends on BUSYBOX - -config BB_CONFIG_TCPSVD - bool "tcpsvd" - default n - help - tcpsvd listens on a tcp port and runs a program for each new connection - -config BB_CONFIG_UDPSVD - bool "udpsvd" - default n - help - udpsvd listens on a udp port and runs a program for each new connection - -endmenu diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index c9d19fa93..3b1933e77 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -58,14 +58,6 @@ config BB_CONFIG_FEATURE_EDITING_MAX_LEN You may want to decrease this parameter if your target machine benefits from smaller stack usage. -config BB_CONFIG_FEATURE_EDITING_FANCY_KEYS - bool "Additional editing keys" - default n - depends on BB_CONFIG_FEATURE_EDITING - help - Enable additonal editing keys (Ctrl-E, Ctrl-U etc). - Arrow keys, Home/End/Delete and Ctrl-W work even without this option. - config BB_CONFIG_FEATURE_EDITING_VI bool "vi-style line editing commands" default n @@ -111,6 +103,21 @@ config BB_CONFIG_FEATURE_EDITING_FANCY_PROMPT Setting this option allows for prompts to use things like \w and \$ and escape codes. +config BB_CONFIG_FEATURE_VERBOSE_CP_MESSAGE + bool "Give more precise messages when copy fails (cp, mv etc)" + default n + help + Error messages with this feature enabled: + $ cp file /does_not_exist/file + cp: cannot create '/does_not_exist/file': Path does not exist + $ cp file /vmlinuz/file + cp: cannot stat '/vmlinuz/file': Path has non-directory component + If this feature is not enabled, they will be, respectively: + cp: cannot remove '/does_not_exist/file': No such file or directory + cp: cannot stat '/vmlinuz/file': Not a directory + respectively. + This will cost you ~60 bytes. + config BB_CONFIG_FEATURE_COPYBUF_KB int "Copy buffer size, in kilobytes" range 1 1024 diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in index 0fd986021..f83dae0ea 100644 --- a/config/busybox/loginutils/Config.in +++ b/config/busybox/loginutils/Config.in @@ -83,12 +83,31 @@ config BB_CONFIG_FEATURE_DEL_USER_FROM_GROUP If called with two non-option arguments, deluser or delgroup will remove an user from a specified group. +config BB_CONFIG_FEATURE_CHECK_NAMES + bool "Enable sanity check on user/group names in adduser and addgroup" + default n + depends on BB_CONFIG_ADDUSER || BB_CONFIG_ADDGROUP + help + Enable sanity check on user and group names in adduser and addgroup. + To avoid problems, the user or group name should consist only of + letters, digits, underscores, periods, at signs and dashes, + and not start with a dash (as defined by IEEE Std 1003.1-2001). + For compatibility with Samba machine accounts "$" is also supported + at the end of the user or group name. + config BB_CONFIG_ADDUSER bool "adduser" default n help Utility for creating a new user account. +config BB_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS + bool "Enable long options" + default n + depends on BB_CONFIG_ADDUSER && BB_CONFIG_GETOPT_LONG + help + Support long options for the adduser applet. + config BB_CONFIG_DELUSER bool "deluser" default n diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index 76be2a03a..25fb71981 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -20,6 +20,73 @@ config BB_CONFIG_BBCONFIG The bbconfig applet will print the config file with which busybox was built. +config BB_CONFIG_CHAT + bool "chat" + default n + help + Simple chat utility. + +config BB_CONFIG_FEATURE_CHAT_NOFAIL + bool "Enable NOFAIL expect strings" + depends on BB_CONFIG_CHAT + default y + help + When enabled expect strings which are started with a dash trigger + no-fail mode. That is when expectation is not met within timeout + the script is not terminated but sends next SEND string and waits + for next EXPECT string. This allows to compose far more flexible + scripts. + +config BB_CONFIG_FEATURE_CHAT_TTY_HIFI + bool "Force STDIN to be a TTY" + depends on BB_CONFIG_CHAT + default n + help + Original chat always treats STDIN as a TTY device and sets for it + so-called raw mode. This option turns on such behaviour. + +config BB_CONFIG_FEATURE_CHAT_IMPLICIT_CR + bool "Enable implicit Carriage Return" + depends on BB_CONFIG_CHAT + default y + help + When enabled make chat to terminate all SEND strings with a "\r" + unless "\c" is met anywhere in the string. + +config BB_CONFIG_FEATURE_CHAT_SWALLOW_OPTS + bool "Swallow options" + depends on BB_CONFIG_CHAT + default n + help + Busybox chat require no options. To make it not fail when used + in place of original chat (which has a bunch of options) turn + this on. + +config BB_CONFIG_FEATURE_CHAT_SEND_ESCAPES + bool "Support weird SEND escapes" + depends on BB_CONFIG_CHAT + default n + help + Original chat uses some escape sequences in SEND arguments which + are not sent to device but rather performs special actions. + E.g. "\K" means to send a break sequence to device. + "\d" delays execution for a second, "\p" -- for a 1/100 of second. + Before turning this option on think twice: do you really need them? + +config BB_CONFIG_FEATURE_CHAT_VAR_ABORT_LEN + bool "Support variable-length ABORT conditions" + depends on BB_CONFIG_CHAT + default n + help + Original chat uses fixed 50-bytes length ABORT conditions. Say N here. + +config BB_CONFIG_FEATURE_CHAT_CLR_ABORT + bool "Support revoking of ABORT conditions" + depends on BB_CONFIG_CHAT + default n + help + Support CLR_ABORT directive. + config BB_CONFIG_CHRT bool "chrt" default n @@ -40,15 +107,13 @@ config BB_CONFIG_CROND $ cat /var/spool/cron/crontabs/root # Run daily cron jobs at 4:40 every day: 40 4 * * * /etc/cron/daily > /dev/null 2>&1 - Note that Busybox binary must be setuid root for this applet to - work properly. config BB_CONFIG_DEBUG_CROND_OPTION - bool "Support debug option -d" + bool "Support option -d to redirect output to stderr" depends on BB_CONFIG_CROND default n help - Support option -d to enter debug mode. + -d sets loglevel to 0 (most verbose) and directs all output to stderr. config BB_CONFIG_FEATURE_CROND_CALL_SENDMAIL bool "Using /usr/sbin/sendmail?" @@ -64,6 +129,8 @@ config BB_CONFIG_CRONTAB help Crontab manipulates the crontab for a particular user. Only the superuser may specify a different user and/or crontab directory. + Note that Busybox binary must be setuid root for this applet to + work properly. config BB_CONFIG_DC bool "dc" @@ -127,6 +194,14 @@ config BB_CONFIG_EJECT help Used to eject cdroms. (defaults to /dev/cdrom) +config BB_CONFIG_FEATURE_EJECT_SCSI + bool "SCSI support" + default n + depends on BB_CONFIG_EJECT + help + Add the -s option to eject, this allows to eject SCSI-Devices and + usb-storage devices. + config BB_CONFIG_LAST bool "last" default n @@ -336,6 +411,12 @@ config BB_CONFIG_RX help Receive files using the Xmodem protocol. +config BB_CONFIG_SCRIPT + bool "script" + default n + help + The script makes typescript of terminal session. + config BB_CONFIG_STRINGS bool "strings" default n @@ -357,7 +438,7 @@ config BB_CONFIG_TASKSET This requires sched_{g,s}etaffinity support in your libc. config BB_CONFIG_FEATURE_TASKSET_FANCY - bool "fancy output" + bool "Fancy output" default y depends on BB_CONFIG_TASKSET help @@ -393,4 +474,3 @@ config BB_CONFIG_WATCHDOG hung, and will cause the hardware to reboot. endmenu - diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in index a94deebbb..60348e722 100644 --- a/config/busybox/modutils/Config.in +++ b/config/busybox/modutils/Config.in @@ -74,7 +74,7 @@ config BB_CONFIG_LSMOD lsmod is used to display a list of loaded modules. config BB_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT - bool "lsmod pretty output for 2.6.x Linux kernels " + bool "Pretty output for 2.6.x Linux kernels" default n depends on BB_CONFIG_LSMOD help diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index 681c6aea8..dba833bff 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -48,6 +48,32 @@ config BB_CONFIG_ARPING help Ping hosts by ARP packets. +config BB_CONFIG_BRCTL + bool "brctl" + default n + help + Manage ethernet bridges. + Supports addbr/delbr and addif/delif. + +#config FEATURE_BRCTL_SHOW +# bool "Support show, showmac and showstp" +# default n +# depends on BRCTL +# help +# Add support for option which print the current config: +# showmacs, showstp, show + +config BB_CONFIG_FEATURE_BRCTL_FANCY + bool "Fancy options" + default n + depends on BB_CONFIG_BRCTL + help + Add support for extended option like: + setageing, setfd, sethello, setmaxage, + setpathcost, setportprio, setbridgeprio, + stp + This adds about 600 bytes. + config BB_CONFIG_DNSD bool "dnsd" default n @@ -117,7 +143,7 @@ config BB_CONFIG_FEATURE_HTTPD_USE_SENDFILE instead of read/write loop. config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP - bool "Support reloading the global config file using hup signal" + bool "Support reloading of global config file on HUP signal" default n depends on BB_CONFIG_HTTPD help @@ -167,7 +193,7 @@ config BB_CONFIG_FEATURE_HTTPD_CGI when specific URLs are requested. config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR - bool "Enable support for running scripts through an interpreter" + bool "Support for running scripts through an interpreter" default n depends on BB_CONFIG_FEATURE_HTTPD_CGI help @@ -178,7 +204,7 @@ config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR *.php:/path/to/your/php config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV - bool "Support the REMOTE_PORT environment variable for CGI" + bool "Set REMOTE_PORT environment variable for CGI" default n depends on BB_CONFIG_FEATURE_HTTPD_CGI help @@ -186,17 +212,17 @@ config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV references that contain a unique port number. config BB_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR - bool "Enable the -e option for shell script CGI simplification." + bool "Enable -e option (useful for CGIs written as shell scripts)" default y depends on BB_CONFIG_HTTPD help - This option allows html encoding arbitrary - strings for display of the browser. Output goes to stdout. - For example, httpd -e "<Hello World>" as + This option allows html encoding of arbitrary strings for display + by the browser. Output goes to stdout. + For example, httpd -e "<Hello World>" produces "<Hello World>". config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES - bool "Enable support for custom error pages" + bool "Support for custom error pages" default n depends on BB_CONFIG_HTTPD help @@ -209,7 +235,7 @@ config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES message. config BB_CONFIG_FEATURE_HTTPD_PROXY - bool "Enable support for reverse proxy" + bool "Support for reverse proxy" default n depends on BB_CONFIG_HTTPD help @@ -267,6 +293,13 @@ config BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS Setting this will make ifconfig attempt to find the broadcast automatically if the value '+' is used. +config BB_CONFIG_IFENSLAVE + bool "ifenslave" + default n + help + Userspace application to bind several interfaces + to a logical interface (use with kernel bonding driver). + config BB_CONFIG_IFUPDOWN bool "ifupdown" default n @@ -331,14 +364,14 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN work. config BB_CONFIG_FEATURE_IFUPDOWN_IPV4 - bool "Enable support for IPv4" + bool "Support for IPv4" default y depends on BB_CONFIG_IFUPDOWN help If you want ifup/ifdown to talk IPv4, leave this on. config BB_CONFIG_FEATURE_IFUPDOWN_IPV6 - bool "Enable support for IPv6" + bool "Support for IPv6" default n depends on BB_CONFIG_IFUPDOWN && BB_CONFIG_FEATURE_IPV6 help @@ -346,7 +379,7 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IPV6 ### UNUSED ###config FEATURE_IFUPDOWN_IPX -### bool "Enable support for IPX" +### bool "Support for IPX" ### default n ### depends on IFUPDOWN ### help @@ -362,7 +395,7 @@ config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING a weird network setup you don't need it. config BB_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP - bool "Enable support for external dhcp clients" + bool "Support for external dhcp clients" default n depends on BB_CONFIG_IFUPDOWN help @@ -465,7 +498,7 @@ config BB_CONFIG_FEATURE_IP_RULE Add support for rule commands to "ip". config BB_CONFIG_FEATURE_IP_SHORT_FORMS - bool "Support short forms of ip commands." + bool "Support short forms of ip commands" default n depends on BB_CONFIG_IP help @@ -620,12 +653,6 @@ config BB_CONFIG_PING6 help This will give you a ping that can talk IPv6. -config BB_CONFIG_PSCAN - bool "pscan" - default n - help - Simple network port scanner. - config BB_CONFIG_FEATURE_FANCY_PING bool "Enable fancy ping output" default y @@ -634,12 +661,30 @@ config BB_CONFIG_FEATURE_FANCY_PING Make the output from the ping applet include statistics, and at the same time provide full support for ICMP packets. +config BB_CONFIG_PSCAN + bool "pscan" + default n + help + Simple network port scanner. + config BB_CONFIG_ROUTE bool "route" default n help Route displays or manipulates the kernel's IP routing tables. +config BB_CONFIG_SENDMAIL + bool "sendmail" + default n + help + Barebones sendmail. + +config BB_CONFIG_FETCHMAIL + bool "fetchmail" + default n + help + Barebones fetchmail. + config BB_CONFIG_SLATTACH bool "slattach" default n @@ -730,28 +775,41 @@ config BB_CONFIG_TFTP is usually used for simple, small transfers such as a root image for a network-enabled bootloader. +config BB_CONFIG_TFTPD + bool "tftpd" + default n + help + This enables the Trivial File Transfer Protocol server program. + It expects that stdin is a datagram socket and a packet + is already pending on it. It will exit after one transfer. + In other words: it should be run from inetd in nowait mode, + or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR" + config BB_CONFIG_FEATURE_TFTP_GET bool "Enable \"get\" command" default y - depends on BB_CONFIG_TFTP + depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD help Add support for the GET command within the TFTP client. This allows a client to retrieve a file from a TFTP server. + Also enable upload support in tftpd, if tftpd is selected. config BB_CONFIG_FEATURE_TFTP_PUT bool "Enable \"put\" command" default y - depends on BB_CONFIG_TFTP + depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD help Add support for the PUT command within the TFTP client. This allows a client to transfer a file to a TFTP server. + Also enable download support in tftpd, if tftpd is selected. config BB_CONFIG_FEATURE_TFTP_BLOCKSIZE - bool "Enable \"blocksize\" command" + bool "Enable \"blksize\" protocol option" default n - depends on BB_CONFIG_TFTP + depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD help - Allow the client to specify the desired block size for transfers. + Allow tftp to specify block size, and tftpd to understand + "blksize" option. config BB_CONFIG_DEBUG_TFTP bool "Enable debug" @@ -839,4 +897,16 @@ config BB_CONFIG_ZCIP See http://www.zeroconf.org for further details, and "zcip.script" in the busybox examples. +config BB_CONFIG_TCPSVD + bool "tcpsvd" + default n + help + tcpsvd listens on a TCP port and runs a program for each new connection + +config BB_CONFIG_UDPSVD + bool "udpsvd" + default n + help + udpsvd listens on an UDP port and runs a program for each new connection + endmenu diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in index c448759e7..a65d67f2c 100644 --- a/config/busybox/networking/udhcp/Config.in +++ b/config/busybox/networking/udhcp/Config.in @@ -42,6 +42,15 @@ config BB_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY to send SIGUSR1 for the initial writing, or updating. Any timed rewriting remains undisturbed +config BB_CONFIG_DHCPD_LEASES_FILE + string "Absolute path to lease file" + default "/var/lib/misc/udhcpd.leases" + depends on BB_CONFIG_APP_UDHCPD + help + The udhcpd stores address in lease files. Normaly it is save + to leave it untouched. + + config BB_CONFIG_APP_UDHCPC bool "udhcp Client (udhcpc)" default n @@ -63,6 +72,13 @@ config BB_CONFIG_FEATURE_UDHCPC_ARPING is really available. The client will DHCPDECLINE the offer if the address is in use, and restart the discover process. +config BB_CONFIG_FEATURE_UDHCP_PORT + bool "Enable '-P port' option for udhcpd and udhcpc" + default n + depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC + help + At the cost of ~300 bytes, enables -P port option. + This feature is typically not needed. config BB_CONFIG_FEATURE_UDHCP_DEBUG bool "Compile udhcp with noisy debugging messages" @@ -83,6 +99,16 @@ config BB_CONFIG_FEATURE_RFC3397 If selected, both client and server will support passing of domain search lists via option 119, specified in RFC3397. +config BB_CONFIG_DHCPC_DEFAULT_SCRIPT + string "Absolute path to config script" + default "/usr/share/udhcpc/default.script" + depends on BB_CONFIG_APP_UDHCPC + help + This script is called after udhcpc receives and answer. See + examples/udhcp for a working example. Normaly it is save + to leave this untouched. + + config BB_CONFIG_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 1ef1d3ee2..502db1a27 100644 --- a/config/busybox/procps/Config.in +++ b/config/busybox/procps/Config.in @@ -100,6 +100,21 @@ config BB_CONFIG_FEATURE_PS_WIDE If given once, 132 chars are printed and given more than one, the length is unlimited. +config BB_CONFIG_FEATURE_PS_TIME + bool "Enable time and elapsed time output" + default n + depends on BB_CONFIG_PS && BB_CONFIG_DESKTOP + help + Support -o time and -o etime output specifiers. + +config BB_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS + bool "Support Linux prior to 2.4.0 and non-ELF systems" + default n + depends on BB_CONFIG_FEATURE_PS_TIME + 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 BB_CONFIG_RENICE bool "renice" default n diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in index 5ac1c66fd..8807e679d 100644 --- a/config/busybox/sysklogd/Config.in +++ b/config/busybox/sysklogd/Config.in @@ -43,6 +43,14 @@ config BB_CONFIG_FEATURE_REMOTE_LOG measure to prevent system logs from being tampered with by an intruder. +config BB_CONFIG_FEATURE_SYSLOGD_DUP + bool "Support -D (drop dups) option" + default n + depends on BB_CONFIG_SYSLOGD + help + Option -D instructs syslogd to drop consecutive messages + which are totally the same. + config BB_CONFIG_FEATURE_IPC_SYSLOG bool "Circular Buffer support" default n @@ -77,7 +85,7 @@ config BB_CONFIG_LOGREAD stored in the syslogd circular buffer. config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING - bool "logread double buffering" + bool "Double buffering" default n depends on BB_CONFIG_LOGREAD help diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in index f3df2454b..32e55fcda 100644 --- a/config/busybox/util-linux/Config.in +++ b/config/busybox/util-linux/Config.in @@ -19,7 +19,7 @@ config BB_CONFIG_DMESG wish to enable the 'dmesg' utility. config BB_CONFIG_FEATURE_DMESG_PRETTY - bool "pretty dmesg output" + bool "Pretty dmesg output" default y depends on BB_CONFIG_DMESG help @@ -94,7 +94,7 @@ config BB_CONFIG_FDISK 'disk slices' that are defined on a hard drive. config BB_CONFIG_FDISK_SUPPORT_LARGE_DISKS - bool "support over 4GB disks" + bool "Support over 4GB disks" default y depends on BB_CONFIG_FDISK help @@ -151,6 +151,17 @@ config BB_CONFIG_FEATURE_FDISK_ADVANCED partition, and similarly evil things. Unless you have a very good reason you would be wise to leave this disabled. +config BB_CONFIG_FINDFS + bool "findfs" + default n + select BB_CONFIG_VOLUMEID + help + This is similar to the findfs program that is part of the e2fsprogs + package. However, the e2fsprogs version only support ext2/3. This + version supports those in addition to FAT, swap, and ReiserFS. + WARNING: + With all submodules selected, it will add ~8k to busybox. + config BB_CONFIG_FREERAMDISK bool "freeramdisk" default n @@ -211,13 +222,6 @@ config BB_CONFIG_HEXDUMP The hexdump utility is used to display binary data in a readable way that is comparable to the output from most hex editors. -config BB_CONFIG_HD - bool "hd" - default n - select BB_CONFIG_HEXDUMP - help - hd is an alias to hexdump -C. - config BB_CONFIG_FEATURE_HEXDUMP_REVERSE bool "Support -R, reverse of 'hexdump -Cv'" default n @@ -228,6 +232,13 @@ config BB_CONFIG_FEATURE_HEXDUMP_REVERSE NB: this option is non-standard. It's unwise to use it in scripts aimed to be portable. +config BB_CONFIG_HD + bool "hd" + default n + select BB_CONFIG_HEXDUMP + help + hd is an alias to hexdump -C. + config BB_CONFIG_HWCLOCK bool "hwclock" default n @@ -302,6 +313,15 @@ config BB_CONFIG_FEATURE_MDEV_CONF For more information, please see docs/mdev.txt +config BB_CONFIG_FEATURE_MDEV_RENAME + bool "Support subdirs/symlinks" + default n + depends on BB_CONFIG_FEATURE_MDEV_CONF + help + Add support for renaming devices and creating symlinks. + + For more information, please see docs/mdev.txt + config BB_CONFIG_FEATURE_MDEV_EXEC bool "Support command execution at device addition/removal" default n @@ -337,7 +357,7 @@ config BB_CONFIG_MKSWAP the swap space using the 'swapon' utility. config BB_CONFIG_FEATURE_MKSWAP_V0 - bool "version 0 support" + bool "Version 0 support" default n depends on BB_CONFIG_MKSWAP # depends on MKSWAP && DEPRECATED @@ -359,7 +379,7 @@ config BB_CONFIG_MORE config BB_CONFIG_FEATURE_USE_TERMIOS bool "Use termios to manipulate the screen" default y - depends on BB_CONFIG_MORE + depends on BB_CONFIG_MORE || BB_CONFIG_TOP help This option allows utilities such as 'more' and 'top' to determine the size of the screen. If you leave this disabled, your utilities @@ -367,6 +387,216 @@ config BB_CONFIG_FEATURE_USE_TERMIOS will be unable to determine the current screen size, and will be unable to move the cursor. +config BB_CONFIG_VOLUMEID + bool "Routines for detecting label and uuid on common filesystems" + default n + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_EXT + bool "Ext filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_REISERFS + bool "Reiser filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_FAT + bool "fat filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_HFS + bool "hfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_JFS + bool "jfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_UFS +### bool "ufs filesystem" +### default n +### depends on VOLUMEID +### help +### TODO + +config BB_CONFIG_FEATURE_VOLUMEID_XFS + bool "xfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_NTFS + bool "ntfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_ISO9660 + bool "iso9660 filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_UDF + bool "udf filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_LUKS + bool "luks filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_LINUXSWAP + bool "linux swap filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_LVM +### bool "lvm" +### default n +### depends on VOLUMEID +### help +### TODO + +config BB_CONFIG_FEATURE_VOLUMEID_CRAMFS + bool "cramfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HPFS +### bool "hpfs filesystem" +### default n +### depends on VOLUMEID +### help +### TODO + +config BB_CONFIG_FEATURE_VOLUMEID_ROMFS + bool "romfs filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +config BB_CONFIG_FEATURE_VOLUMEID_SYSV + bool "sysv filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_MINIX +### bool "minix filesystem" +### default n +### depends on VOLUMEID +### help +### TODO + +### These only detect partition tables - not used (yet?) +### config FEATURE_VOLUMEID_MAC +### bool "mac filesystem" +### default n +### depends on VOLUMEID +### help +### TODO +### +### config FEATURE_VOLUMEID_MSDOS +### bool "msdos filesystem" +### default n +### depends on VOLUMEID +### help +### TODO + +config BB_CONFIG_FEATURE_VOLUMEID_OCFS2 + bool "ocfs2 filesystem" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HIGHPOINTRAID +### bool "highpoint raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_ISWRAID +### bool "intel raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_LSIRAID +### bool "lsi raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_VIARAID +### bool "via raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_SILICONRAID +### bool "silicon raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_NVIDIARAID +### bool "nvidia raid" +### default n +### depends on VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_PROMISERAID +### bool "promise raid" +### default n +### depends on VOLUMEID +### help +### TODO + +config BB_CONFIG_FEATURE_VOLUMEID_LINUXRAID + bool "linuxraid" + default n + depends on BB_CONFIG_VOLUMEID + help + TODO + config BB_CONFIG_MOUNT bool "mount" default n @@ -378,15 +608,42 @@ config BB_CONFIG_MOUNT NFS filesystems. Most people using BusyBox will also want to enable the 'mount' utility. +config BB_CONFIG_FEATURE_MOUNT_FAKE + bool "Support option -f" + default n + depends on BB_CONFIG_MOUNT + help + Enable support for faking a file system mount. + +config BB_CONFIG_FEATURE_MOUNT_VERBOSE + bool "Support option -v" + default n + depends on BB_CONFIG_MOUNT + help + Enable multi-level -v[vv...] verbose messages. Useful if you + debug mount problems and want to see what is exactly passed + to the kernel. + config BB_CONFIG_FEATURE_MOUNT_HELPERS bool "Support mount helpers" default n depends on BB_CONFIG_MOUNT help Enable mounting of virtual file systems via external helpers. - E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call - obexfs -b00.11.22.33.44.55 /mnt - The idea is to use such virtual filesystems in /etc/fstab + E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call + "obexfs -b00.11.22.33.44.55 /mnt" + Also "mount -t sometype [-o opts] fs /mnt" will try + "sometype [-o opts] fs /mnt" if simple mount syscall fails. + The idea is to use such virtual filesystems in /etc/fstab. + +config BB_CONFIG_FEATURE_MOUNT_LABEL + bool "Support specifiying devices by label or UUID" + default n + depends on BB_CONFIG_MOUNT + select BB_CONFIG_VOLUMEID + help + This allows for specifying a device by label or uuid, rather than by + name. This feature utilizes the same functionality as findfs. config BB_CONFIG_FEATURE_MOUNT_NFS bool "Support mounting NFS file systems" @@ -448,6 +705,12 @@ config BB_CONFIG_READPROFILE help This allows you to parse /proc/profile for basic profiling. +config BB_CONFIG_RTCWAKE + bool "rtcwake" + default n + help + Enter a system sleep state until specified wakeup time. + config BB_CONFIG_SETARCH bool "setarch" default n @@ -497,7 +760,7 @@ config BB_CONFIG_UMOUNT also want to enable 'umount'. config BB_CONFIG_FEATURE_UMOUNT_ALL - bool "umount -a option" + bool "Support option -a" default n depends on BB_CONFIG_UMOUNT help @@ -526,6 +789,7 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT bool "Support for the old /etc/mtab file" default n depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT + select BB_CONFIG_FEATURE_MOUNT_FAKE help Historically, Unix systems kept track of the currently mounted partitions in the file "/etc/mtab". These days, the kernel exports @@ -546,4 +810,3 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT your kernel. endmenu - diff --git a/patches/busybox-1.10.0/generic/busybox-1.10.0-tail.patch b/patches/busybox-1.10.0/generic/busybox-1.10.0-tail.patch new file mode 100644 index 000000000..5a5ed1da4 --- /dev/null +++ b/patches/busybox-1.10.0/generic/busybox-1.10.0-tail.patch @@ -0,0 +1,77 @@ +Subject: busybox 1.10.0 fixes +From: http://busybox.net/downloads/fixes-1.10.0 + +--- + coreutils/tail.c | 22 +++++++++------------- + testsuite/tail/tail-n-works | 8 ++++---- + testsuite/tail/tail-works | 8 ++++---- + 3 files changed, 17 insertions(+), 21 deletions(-) + +Index: busybox-1.10.0/coreutils/tail.c +=================================================================== +--- busybox-1.10.0.orig/coreutils/tail.c ++++ busybox-1.10.0/coreutils/tail.c +@@ -163,8 +163,6 @@ int tail_main(int argc, char **argv) + fmt = header_fmt + 1; /* Skip header leading newline on first output. */ + i = 0; + do { +- off_t current; +- + if (nfiles > header_threshhold) { + tail_xprint_header(fmt, argv[i]); + fmt = header_fmt; +@@ -173,19 +171,17 @@ int tail_main(int argc, char **argv) + /* Optimizing count-bytes case if the file is seekable. + * Beware of backing up too far. + * Also we exclude files with size 0 (because of /proc/xxx) */ +- current = lseek(fds[i], 0, SEEK_END); +- if (current > 0) { +- if (!from_top) { ++ if (COUNT_BYTES && !from_top) { ++ off_t current = lseek(fds[i], 0, SEEK_END); ++ if (current > 0) { + if (count == 0) + continue; /* showing zero lines is easy :) */ +- if (COUNT_BYTES) { +- current -= count; +- if (current < 0) +- current = 0; +- xlseek(fds[i], current, SEEK_SET); +- bb_copyfd_size(fds[i], STDOUT_FILENO, count); +- continue; +- } ++ current -= count; ++ if (current < 0) ++ current = 0; ++ xlseek(fds[i], current, SEEK_SET); ++ bb_copyfd_size(fds[i], STDOUT_FILENO, count); ++ continue; + } + } + +Index: busybox-1.10.0/testsuite/tail/tail-n-works +=================================================================== +--- busybox-1.10.0.orig/testsuite/tail/tail-n-works ++++ busybox-1.10.0/testsuite/tail/tail-n-works +@@ -1,4 +1,4 @@ +-[ -n "$d" ] || d=.. +-tail -n 2 "$d/README" > logfile.gnu +-busybox tail -n 2 "$d/README" > logfile.bb +-cmp logfile.gnu logfile.bb ++echo -ne "abc\ndef\n123\n" >input ++echo -ne "def\n123\n" >logfile.ok ++busybox tail -n 2 input > logfile.bb ++cmp logfile.ok logfile.bb +Index: busybox-1.10.0/testsuite/tail/tail-works +=================================================================== +--- busybox-1.10.0.orig/testsuite/tail/tail-works ++++ busybox-1.10.0/testsuite/tail/tail-works +@@ -1,4 +1,4 @@ +-[ -n "$d" ] || d=.. +-tail -n 2 "$d/README" > logfile.gnu +-busybox tail -n 2 "$d/README" > logfile.bb +-cmp logfile.gnu logfile.bb ++echo -ne "abc\ndef\n123\n" >input ++echo -ne "def\n123\n" >logfile.ok ++busybox tail -2 input > logfile.bb ++cmp logfile.ok logfile.bb diff --git a/patches/busybox-1.10.0/generic/busybox-1.10.0-taskset.patch b/patches/busybox-1.10.0/generic/busybox-1.10.0-taskset.patch new file mode 100644 index 000000000..3a8bb2e39 --- /dev/null +++ b/patches/busybox-1.10.0/generic/busybox-1.10.0-taskset.patch @@ -0,0 +1,39 @@ +Subject: busybox 1.10.0 fixes +From: http://busybox.net/downloads/fixes-1.10.0 + +--- + miscutils/taskset.c | 5 +++++ + testsuite/taskset.tests | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +Index: busybox-1.10.0/miscutils/taskset.c +=================================================================== +--- busybox-1.10.0.orig/miscutils/taskset.c ++++ busybox-1.10.0/miscutils/taskset.c +@@ -50,6 +50,11 @@ int taskset_main(int argc ATTRIBUTE_UNUS + char *pid_str; + char *aff = aff; /* for compiler */ + ++ /* NB: we mimic util-linux's taskset: -p does not take ++ * an argument, i.e., "-pN" is NOT valid, only "-p N"! ++ * Indeed, util-linux-2.13-pre7 uses: ++ * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */ ++ + opt_complementary = "-1"; /* at least 1 arg */ + opt_p = getopt32(argv, "+p"); + argv += optind; +Index: busybox-1.10.0/testsuite/taskset.tests +=================================================================== +--- busybox-1.10.0.orig/testsuite/taskset.tests ++++ busybox-1.10.0/testsuite/taskset.tests +@@ -7,8 +7,8 @@ + a="taskset" + + # testing "test name" "opts" "expected result" "file inp" "stdin" +-testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" "" +-testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" "" ++testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" "" ++testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" "" + testing "taskset (set_aff, needs CAP_SYS_NICE)" \ + "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \ + "0\n" "" "" diff --git a/patches/busybox-1.10.0/generic/busybox-1.10.0-udhcp.patch b/patches/busybox-1.10.0/generic/busybox-1.10.0-udhcp.patch new file mode 100644 index 000000000..3140b620b --- /dev/null +++ b/patches/busybox-1.10.0/generic/busybox-1.10.0-udhcp.patch @@ -0,0 +1,24 @@ +Subject: busybox 1.10.0 fixes +From: http://busybox.net/downloads/fixes-1.10.0 + +--- + networking/udhcp/clientsocket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: busybox-1.10.0/networking/udhcp/clientsocket.c +=================================================================== +--- busybox-1.10.0.orig/networking/udhcp/clientsocket.c ++++ busybox-1.10.0/networking/udhcp/clientsocket.c +@@ -22,11 +22,11 @@ + */ + + #include <features.h> ++#include <asm/types.h> + #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) + #include <netpacket/packet.h> + #include <net/ethernet.h> + #else +-#include <asm/types.h> + #include <linux/if_packet.h> + #include <linux/if_ether.h> + #endif diff --git a/patches/busybox-1.10.0/generic/series b/patches/busybox-1.10.0/generic/series new file mode 100644 index 000000000..7ba0623f8 --- /dev/null +++ b/patches/busybox-1.10.0/generic/series @@ -0,0 +1,3 @@ +busybox-1.10.0-tail.patch +busybox-1.10.0-taskset.patch +busybox-1.10.0-udhcp.patch diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-allno.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-allno.patch deleted file mode 100644 index c57f8ad9a..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-allno.patch +++ /dev/null @@ -1,33 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - Makefile.help | 1 - - applets/applet_tables.c | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -Index: busybox-1.9.0/Makefile.help -=================================================================== ---- busybox-1.9.0.orig/Makefile.help -+++ busybox-1.9.0/Makefile.help -@@ -16,7 +16,6 @@ help: - @echo 'Configuration:' - @echo ' allnoconfig - disable all symbols in .config' - @echo ' allyesconfig - enable all symbols in .config (see defconfig)' -- @echo ' allbareconfig - enable all applets without any sub-features' - @echo ' config - text based configurator (of last resort)' - @echo ' defconfig - set .config to largest generic configuration' - @echo ' menuconfig - interactive curses-based configurator' -Index: busybox-1.9.0/applets/applet_tables.c -=================================================================== ---- busybox-1.9.0.orig/applets/applet_tables.c -+++ busybox-1.9.0/applets/applet_tables.c -@@ -71,7 +71,7 @@ int main(int argc, char **argv) - - puts("/* This is a generated file, don't edit */"); - -- puts("const char applet_names[] ALIGN1 ="); -+ puts("const char applet_names[] ALIGN1 = \"\" \n"); - for (i = 0; i < NUM_APPLETS; i++) { - printf("\"%s\" \"\\0\"\n", applets[i].name); - } diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-fsck.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-fsck.patch deleted file mode 100644 index c76295ba0..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-fsck.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - e2fsprogs/fsck.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: busybox-1.9.0/e2fsprogs/fsck.c -=================================================================== ---- busybox-1.9.0.orig/e2fsprogs/fsck.c -+++ busybox-1.9.0/e2fsprogs/fsck.c -@@ -665,6 +665,12 @@ static void execute(const char *type, co - for (i = num_args+1; i < argc; i++) - free(argv[i]); - -+ /* No pid, so don't record an instance */ -+ if (pid < 0) { -+ free(inst); -+ return; -+ } -+ - inst->pid = pid; - inst->prog = argv[0]; - inst->type = xstrdup(type); diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-hush_nommu_tick.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-hush_nommu_tick.patch deleted file mode 100644 index ac5cfc38a..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-hush_nommu_tick.patch +++ /dev/null @@ -1,594 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - include/libbb.h | 3 - shell/hush.c | 256 ++++++++++++++++++++++++++++---------------------------- - 2 files changed, 135 insertions(+), 124 deletions(-) - -Index: busybox-1.9.0/include/libbb.h -=================================================================== ---- busybox-1.9.0.orig/include/libbb.h -+++ busybox-1.9.0/include/libbb.h -@@ -641,6 +641,9 @@ enum { - void re_exec(char **argv) ATTRIBUTE_NORETURN; - void forkexit_or_rexec(char **argv); - extern bool re_execed; -+ int BUG_fork_is_unavailable_on_nommu(void); -+ int BUG_daemon_is_unavailable_on_nommu(void); -+ void BUG_bb_daemonize_is_unavailable_on_nommu(void); - # define fork() BUG_fork_is_unavailable_on_nommu() - # define daemon(a,b) BUG_daemon_is_unavailable_on_nommu() - # define bb_daemonize(a) BUG_bb_daemonize_is_unavailable_on_nommu() -Index: busybox-1.9.0/shell/hush.c -=================================================================== ---- busybox-1.9.0.orig/shell/hush.c -+++ busybox-1.9.0/shell/hush.c -@@ -80,18 +80,28 @@ - #include <glob.h> /* glob, of course */ - #include <getopt.h> /* should be pretty obvious */ - /* #include <dmalloc.h> */ -+extern char **environ; -+#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ - --extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */ - --#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ -+#if !BB_MMU && ENABLE_HUSH_TICK -+//#undef ENABLE_HUSH_TICK -+//#define ENABLE_HUSH_TICK 0 -+#warning On NOMMU, hush command substitution is dangerous. -+#warning Dont use it for commands which produce lots of output. -+#warning For more info see shell/hush.c, generate_stream_from_list(). -+#endif - -+#if !BB_MMU && ENABLE_HUSH_JOB -+#undef ENABLE_HUSH_JOB -+#define ENABLE_HUSH_JOB 0 -+#endif - --#if !BB_MMU --/* A bit drastic. Can allow some simpler commands -- * by analysing command in generate_stream_from_list() -- */ --#undef ENABLE_HUSH_TICK --#define ENABLE_HUSH_TICK 0 -+#if !ENABLE_HUSH_INTERACTIVE -+#undef ENABLE_FEATURE_EDITING -+#define ENABLE_FEATURE_EDITING 0 -+#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT -+#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0 - #endif - - -@@ -178,13 +188,6 @@ void xxfree(void *ptr) - #endif - - --#if !ENABLE_HUSH_INTERACTIVE --#undef ENABLE_FEATURE_EDITING --#define ENABLE_FEATURE_EDITING 0 --#undef ENABLE_FEATURE_EDITING_FANCY_PROMPT --#define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0 --#endif -- - #define SPECIAL_VAR_SYMBOL 3 - - #define PARSEFLAG_EXIT_FROM_LOOP 1 -@@ -510,10 +513,10 @@ static int free_pipe_list(struct pipe *h - static int free_pipe(struct pipe *pi, int indent); - /* really run the final data structures: */ - static int setup_redirects(struct child_prog *prog, int squirrel[]); --static int run_list_real(struct pipe *pi); -+static int run_list(struct pipe *pi); - static void pseudo_exec_argv(char **argv) ATTRIBUTE_NORETURN; - static void pseudo_exec(struct child_prog *child) ATTRIBUTE_NORETURN; --static int run_pipe_real(struct pipe *pi); -+static int run_pipe(struct pipe *pi); - /* extended glob support: */ - static char **globhack(const char *src, char **strings); - static int glob_needed(const char *s); -@@ -1418,7 +1421,7 @@ static void restore_redirects(int squirr - } - } - --/* Called after [v]fork() in run_pipe_real(), or from builtin_exec(). -+/* Called after [v]fork() in run_pipe(), or from builtin_exec(). - * Never returns. - * XXX no exit() here. If you don't exec, use _exit instead. - * The at_exit handlers apparently confuse the calling process, -@@ -1440,9 +1443,8 @@ static void pseudo_exec_argv(char **argv - /* If a variable is assigned in a forest, and nobody listens, - * was it ever really set? - */ -- if (argv[0] == NULL) { -+ if (!argv[0]) - _exit(EXIT_SUCCESS); -- } - - argv = expand_strvec_to_strvec(argv); - -@@ -1486,15 +1488,15 @@ static void pseudo_exec_argv(char **argv - _exit(1); - } - --/* Called after [v]fork() in run_pipe_real() -+/* Called after [v]fork() in run_pipe() - */ - static void pseudo_exec(struct child_prog *child) - { - // FIXME: buggy wrt NOMMU! Must not modify any global data --// until it does exec/_exit, but currently it does. -- if (child->argv) { -+// until it does exec/_exit, but currently it does -+// (puts malloc'ed stuff into environment) -+ if (child->argv) - pseudo_exec_argv(child->argv); -- } - - if (child->group) { - #if !BB_MMU -@@ -1503,11 +1505,12 @@ static void pseudo_exec(struct child_pro - int rcode; - - #if ENABLE_HUSH_INTERACTIVE -- debug_printf_exec("pseudo_exec: setting interactive_fd=0\n"); -- interactive_fd = 0; /* crucial!!!! */ -+// run_list_level now takes care of it? -+// debug_printf_exec("pseudo_exec: setting interactive_fd=0\n"); -+// interactive_fd = 0; /* crucial!!!! */ - #endif -- debug_printf_exec("pseudo_exec: run_list_real\n"); -- rcode = run_list_real(child->group); -+ debug_printf_exec("pseudo_exec: run_list\n"); -+ rcode = run_list(child->group); - /* OK to leak memory by not calling free_pipe_list, - * since this process is about to exit */ - _exit(rcode); -@@ -1649,6 +1652,7 @@ static int checkjobs(struct pipe* fg_pip - // + killall -STOP cat - - wait_more: -+// TODO: safe_waitpid? - while ((childpid = waitpid(-1, &status, attributes)) > 0) { - const int dead = WIFEXITED(status) || WIFSIGNALED(status); - -@@ -1673,7 +1677,7 @@ static int checkjobs(struct pipe* fg_pip - if (dead) { - fg_pipe->progs[i].pid = 0; - fg_pipe->running_progs--; -- if (i == fg_pipe->num_progs-1) -+ if (i == fg_pipe->num_progs - 1) - /* last process gives overall exitstatus */ - rcode = WEXITSTATUS(status); - } else { -@@ -1754,13 +1758,13 @@ static int checkjobs_and_fg_shell(struct - } - #endif - --/* run_pipe_real() starts all the jobs, but doesn't wait for anything -+/* run_pipe() starts all the jobs, but doesn't wait for anything - * to finish. See checkjobs(). - * - * return code is normally -1, when the caller has to wait for children - * to finish to determine the exit status of the pipe. If the pipe - * is a simple builtin command, however, the action is done by the -- * time run_pipe_real returns, and the exit code is provided as the -+ * time run_pipe returns, and the exit code is provided as the - * return value. - * - * The input of the pipe is always stdin, the output is always -@@ -1773,11 +1777,11 @@ static int checkjobs_and_fg_shell(struct - * Returns -1 only if started some children. IOW: we have to - * mask out retvals of builtins etc with 0xff! - */ --static int run_pipe_real(struct pipe *pi) -+static int run_pipe(struct pipe *pi) - { - int i; -- int nextin, nextout; -- int pipefds[2]; /* pipefds[0] is for reading */ -+ int nextin; -+ int pipefds[2]; /* pipefds[0] is for reading */ - struct child_prog *child; - const struct built_in_command *x; - char *p; -@@ -1786,9 +1790,8 @@ static int run_pipe_real(struct pipe *pi - int rcode; - const int single_fg = (pi->num_progs == 1 && pi->followup != PIPE_BG); - -- debug_printf_exec("run_pipe_real start: single_fg=%d\n", single_fg); -+ debug_printf_exec("run_pipe start: single_fg=%d\n", single_fg); - -- nextin = 0; - #if ENABLE_HUSH_JOB - pi->pgrp = -1; - #endif -@@ -1803,11 +1806,11 @@ static int run_pipe_real(struct pipe *pi - if (single_fg && child->group && child->subshell == 0) { - debug_printf("non-subshell grouping\n"); - setup_redirects(child, squirrel); -- debug_printf_exec(": run_list_real\n"); -- rcode = run_list_real(child->group); -+ debug_printf_exec(": run_list\n"); -+ rcode = run_list(child->group) & 0xff; - restore_redirects(squirrel); -- debug_printf_exec("run_pipe_real return %d\n", rcode); -- return rcode; // do we need to add '... & 0xff' ? -+ debug_printf_exec("run_pipe return %d\n", rcode); -+ return rcode; - } - - if (single_fg && child->argv != NULL) { -@@ -1849,7 +1852,7 @@ static int run_pipe_real(struct pipe *pi - rcode = x->function(argv_expanded) & 0xff; - free(argv_expanded); - restore_redirects(squirrel); -- debug_printf_exec("run_pipe_real return %d\n", rcode); -+ debug_printf_exec("run_pipe return %d\n", rcode); - return rcode; - } - } -@@ -1866,20 +1869,21 @@ static int run_pipe_real(struct pipe *pi - rcode = run_nofork_applet_prime(&nofork_save, a, argv_expanded) & 0xff; - free(argv_expanded); - restore_redirects(squirrel); -- debug_printf_exec("run_pipe_real return %d\n", rcode); -+ debug_printf_exec("run_pipe return %d\n", rcode); - return rcode; - } - } - #endif - } - -- /* Going to fork a child per each pipe member */ -- pi->running_progs = 0; -- - /* Disable job control signals for shell (parent) and - * for initial child code after fork */ - set_jobctrl_sighandler(SIG_IGN); - -+ /* Going to fork a child per each pipe member */ -+ pi->running_progs = 0; -+ nextin = 0; -+ - for (i = 0; i < pi->num_progs; i++) { - child = &(pi->progs[i]); - if (child->argv) -@@ -1888,42 +1892,34 @@ static int run_pipe_real(struct pipe *pi - debug_printf_exec(": pipe member with no argv\n"); - - /* pipes are inserted between pairs of commands */ -- if ((i + 1) < pi->num_progs) { -- pipe(pipefds); -- nextout = pipefds[1]; -- } else { -- nextout = 1; -- pipefds[0] = -1; -- } -+ pipefds[0] = 0; -+ pipefds[1] = 1; -+ if ((i + 1) < pi->num_progs) -+ xpipe(pipefds); - -- /* XXX test for failed fork()? */ --#if BB_MMU -- child->pid = fork(); --#else -- child->pid = vfork(); --#endif -+ child->pid = BB_MMU ? fork() : vfork(); - if (!child->pid) { /* child */ -- /* Every child adds itself to new process group -- * with pgid == pid of first child in pipe */ - #if ENABLE_HUSH_JOB -+ /* Every child adds itself to new process group -+ * with pgid == pid_of_first_child_in_pipe */ - if (run_list_level == 1 && interactive_fd) { -+ pid_t pgrp; - /* Don't do pgrp restore anymore on fatal signals */ - set_fatal_sighandler(SIG_DFL); -- if (pi->pgrp < 0) /* true for 1st process only */ -- pi->pgrp = getpid(); -- if (setpgid(0, pi->pgrp) == 0 && pi->followup != PIPE_BG) { -+ pgrp = pi->pgrp; -+ if (pgrp < 0) /* true for 1st process only */ -+ pgrp = getpid(); -+ if (setpgid(0, pgrp) == 0 && pi->followup != PIPE_BG) { - /* We do it in *every* child, not just first, - * to avoid races */ -- tcsetpgrp(interactive_fd, pi->pgrp); -+ tcsetpgrp(interactive_fd, pgrp); - } - } - #endif -- /* in non-interactive case fatal sigs are already SIG_DFL */ - xmove_fd(nextin, 0); -- xmove_fd(nextout, 1); -- if (pipefds[0] != -1) { -- close(pipefds[0]); /* opposite end of our output pipe */ -- } -+ xmove_fd(pipefds[1], 1); /* write end */ -+ if (pipefds[0] > 1) -+ close(pipefds[0]); /* read end */ - /* Like bash, explicit redirects override pipes, - * and the pipe fd is available for dup'ing. */ - setup_redirects(child, NULL); -@@ -1932,26 +1928,35 @@ static int run_pipe_real(struct pipe *pi - set_jobctrl_sighandler(SIG_DFL); - set_misc_sighandler(SIG_DFL); - signal(SIGCHLD, SIG_DFL); -- pseudo_exec(child); -+ pseudo_exec(child); /* does not return */ - } - -- pi->running_progs++; -- -+ if (child->pid < 0) { /* [v]fork failed */ -+ /* Clearly indicate, was it fork or vfork */ -+ bb_perror_msg(BB_MMU ? "fork" : "vfork"); -+ } else { -+ pi->running_progs++; - #if ENABLE_HUSH_JOB -- /* Second and next children need to know pid of first one */ -- if (pi->pgrp < 0) -- pi->pgrp = child->pid; -+ /* Second and next children need to know pid of first one */ -+ if (pi->pgrp < 0) -+ pi->pgrp = child->pid; - #endif -- if (nextin != 0) -- close(nextin); -- if (nextout != 1) -- close(nextout); -+ } - -- /* If there isn't another process, nextin is garbage -- but it doesn't matter */ -+ if (i) -+ close(nextin); -+ if ((i + 1) < pi->num_progs) -+ close(pipefds[1]); /* write end */ -+ /* Pass read (output) pipe end to next iteration */ - nextin = pipefds[0]; - } -- debug_printf_exec("run_pipe_real return -1\n"); -+ -+ if (!pi->running_progs) { -+ debug_printf_exec("run_pipe return 1 (all forks failed, no children)\n"); -+ return 1; -+ } -+ -+ debug_printf_exec("run_pipe return -1 (%u children started)\n", pi->running_progs); - return -1; - } - -@@ -2020,7 +2025,7 @@ static void debug_print_tree(struct pipe - - /* NB: called by pseudo_exec, and therefore must not modify any - * global data until exec/_exit (we can be a child after vfork!) */ --static int run_list_real(struct pipe *pi) -+static int run_list(struct pipe *pi) - { - struct pipe *rpipe; - #if ENABLE_HUSH_LOOPS -@@ -2029,7 +2034,6 @@ static int run_list_real(struct pipe *pi - char **for_list = NULL; - int flag_rep = 0; - #endif -- int save_num_progs; - int flag_skip = 1; - int rcode = 0; /* probably for gcc only */ - int flag_restore = 0; -@@ -2041,7 +2045,7 @@ static int run_list_real(struct pipe *pi - reserved_style rword; - reserved_style skip_more_for_this_rword = RES_XXXX; - -- debug_printf_exec("run_list_real start lvl %d\n", run_list_level + 1); -+ debug_printf_exec("run_list start lvl %d\n", run_list_level + 1); - - #if ENABLE_HUSH_LOOPS - /* check syntax for "for" */ -@@ -2050,7 +2054,7 @@ static int run_list_real(struct pipe *pi - && (rpipe->next == NULL) - ) { - syntax("malformed for"); /* no IN or no commands after IN */ -- debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level); -+ debug_printf_exec("run_list lvl %d return 1\n", run_list_level); - return 1; - } - if ((rpipe->res_word == RES_IN && rpipe->next->res_word == RES_IN && rpipe->next->progs[0].argv != NULL) -@@ -2058,7 +2062,7 @@ static int run_list_real(struct pipe *pi - ) { - /* TODO: what is tested in the first condition? */ - syntax("malformed for"); /* 2nd condition: not followed by IN */ -- debug_printf_exec("run_list_real lvl %d return 1\n", run_list_level); -+ debug_printf_exec("run_list lvl %d return 1\n", run_list_level); - return 1; - } - } -@@ -2106,9 +2110,10 @@ static int run_list_real(struct pipe *pi - signal_SA_RESTART(SIGTSTP, handler_ctrl_z); - signal(SIGINT, handler_ctrl_c); - } --#endif -+#endif /* JOB */ - - for (; pi; pi = flag_restore ? rpipe : pi->next) { -+//why? int save_num_progs; - rword = pi->res_word; - #if ENABLE_HUSH_LOOPS - if (rword == RES_WHILE || rword == RES_UNTIL || rword == RES_FOR) { -@@ -2181,12 +2186,12 @@ static int run_list_real(struct pipe *pi - #endif - if (pi->num_progs == 0) - continue; -- save_num_progs = pi->num_progs; /* save number of programs */ -- debug_printf_exec(": run_pipe_real with %d members\n", pi->num_progs); -- rcode = run_pipe_real(pi); -+//why? save_num_progs = pi->num_progs; -+ debug_printf_exec(": run_pipe with %d members\n", pi->num_progs); -+ rcode = run_pipe(pi); - if (rcode != -1) { - /* We only ran a builtin: rcode was set by the return value -- * of run_pipe_real(), and we don't need to wait for anything. */ -+ * of run_pipe(), and we don't need to wait for anything. */ - } else if (pi->followup == PIPE_BG) { - /* What does bash do with attempts to background builtins? */ - /* Even bash 3.2 doesn't do that well with nested bg: -@@ -2199,7 +2204,6 @@ static int run_list_real(struct pipe *pi - rcode = EXIT_SUCCESS; - } else { - #if ENABLE_HUSH_JOB -- /* Paranoia, just "interactive_fd" should be enough? */ - if (run_list_level == 1 && interactive_fd) { - /* waits for completion, then fg's main shell */ - rcode = checkjobs_and_fg_shell(pi); -@@ -2213,7 +2217,7 @@ static int run_list_real(struct pipe *pi - } - debug_printf_exec(": setting last_return_code=%d\n", rcode); - last_return_code = rcode; -- pi->num_progs = save_num_progs; /* restore number of programs */ -+//why? pi->num_progs = save_num_progs; - #if ENABLE_HUSH_IF - if (rword == RES_IF || rword == RES_ELIF) - next_if_code = rcode; /* can be overwritten a number of times */ -@@ -2244,7 +2248,7 @@ static int run_list_real(struct pipe *pi - signal(SIGINT, SIG_IGN); - } - #endif -- debug_printf_exec("run_list_real lvl %d return %d\n", run_list_level + 1, rcode); -+ debug_printf_exec("run_list lvl %d return %d\n", run_list_level + 1, rcode); - return rcode; - } - -@@ -2318,19 +2322,19 @@ static int free_pipe_list(struct pipe *h - } - - /* Select which version we will use */ --static int run_list(struct pipe *pi) -+static int run_and_free_list(struct pipe *pi) - { - int rcode = 0; -- debug_printf_exec("run_list entered\n"); -- if (fake_mode == 0) { -- debug_printf_exec(": run_list_real with %d members\n", pi->num_progs); -- rcode = run_list_real(pi); -+ debug_printf_exec("run_and_free_list entered\n"); -+ if (!fake_mode) { -+ debug_printf_exec(": run_list with %d members\n", pi->num_progs); -+ rcode = run_list(pi); - } - /* free_pipe_list has the side effect of clearing memory. -- * In the long run that function can be merged with run_list_real, -+ * In the long run that function can be merged with run_list, - * but doing that now would hobble the debugging effort. */ -- free_pipe_list(pi, 0); -- debug_printf_exec("run_list return %d\n", rcode); -+ free_pipe_list(pi, /* indent: */ 0); -+ debug_printf_exec("run_nad_free_list return %d\n", rcode); - return rcode; - } - -@@ -3224,15 +3228,17 @@ static FILE *generate_stream_from_list(s - int pid, channel[2]; - - xpipe(channel); -- pid = fork(); -- if (pid < 0) { -- bb_perror_msg_and_die("fork"); -- } else if (pid == 0) { -+/* *** NOMMU WARNING *** */ -+/* By using vfork here, we suspend parent till child exits or execs. -+ * If child will not do it before it fills the pipe, it can block forever -+ * in write(STDOUT_FILENO), and parent (shell) will be also stuck. -+ */ -+ pid = BB_MMU ? fork() : vfork(); -+ if (pid < 0) -+ bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork"); -+ if (pid == 0) { /* child */ - close(channel[0]); -- if (channel[1] != 1) { -- dup2(channel[1], 1); -- close(channel[1]); -- } -+ xmove_fd(channel[1], 1); - /* Prevent it from trying to handle ctrl-z etc */ - #if ENABLE_HUSH_JOB - run_list_level = 1; -@@ -3244,11 +3250,12 @@ static FILE *generate_stream_from_list(s - * everywhere outside actual command execution. */ - /*set_jobctrl_sighandler(SIG_IGN);*/ - set_misc_sighandler(SIG_DFL); -- _exit(run_list_real(head)); /* leaks memory */ -+ _exit(run_list(head)); /* leaks memory */ - } - close(channel[1]); - pf = fdopen(channel[0], "r"); - return pf; -+ /* head is freed by the caller */ - } - - /* Return code is exit status of the process that is run. */ -@@ -3272,7 +3279,8 @@ static int process_command_subs(o_string - b_free(&result); - - p = generate_stream_from_list(inner.list_head); -- if (p == NULL) return 1; -+ if (p == NULL) -+ return 1; - close_on_exec_on(fileno(p)); - setup_file_in_str(&pipe_str, p); - -@@ -3297,7 +3305,7 @@ static int process_command_subs(o_string - * at the same time. That would be a lot of work, and contrary - * to the KISS philosophy of this program. */ - retcode = fclose(p); -- free_pipe_list(inner.list_head, 0); -+ free_pipe_list(inner.list_head, /* indent: */ 0); - debug_printf("closed FILE from child, retcode=%d\n", retcode); - return retcode; - } -@@ -3677,8 +3685,8 @@ static int parse_and_run_stream(struct i - done_word(&temp, &ctx); - done_pipe(&ctx, PIPE_SEQ); - debug_print_tree(ctx.list_head, 0); -- debug_printf_exec("parse_stream_outer: run_list\n"); -- run_list(ctx.list_head); -+ debug_printf_exec("parse_stream_outer: run_and_free_list\n"); -+ run_and_free_list(ctx.list_head); - } else { - if (ctx.old_flag != 0) { - free(ctx.stack); -@@ -3687,7 +3695,7 @@ static int parse_and_run_stream(struct i - temp.nonnull = 0; - temp.o_quote = 0; - inp->p = NULL; -- free_pipe_list(ctx.list_head, 0); -+ free_pipe_list(ctx.list_head, /* indent: */ 0); - } - b_free(&temp); - } while (rcode != -1 && !(parse_flag & PARSEFLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */ -@@ -3901,15 +3909,15 @@ int hush_main(int argc, char **argv) - - if (argv[optind] == NULL) { - opt = parse_and_run_file(stdin); -- goto final_return; -+ } else { -+ debug_printf("\nrunning script '%s'\n", argv[optind]); -+ global_argv = argv + optind; -+ global_argc = argc - optind; -+ input = xfopen(argv[optind], "r"); -+ fcntl(fileno(input), F_SETFD, FD_CLOEXEC); -+ opt = parse_and_run_file(input); - } - -- debug_printf("\nrunning script '%s'\n", argv[optind]); -- global_argv = argv + optind; -- global_argc = argc - optind; -- input = xfopen(argv[optind], "r"); -- opt = parse_and_run_file(input); -- - final_return: - - #if ENABLE_FEATURE_CLEAN_UP diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-iproute.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-iproute.patch deleted file mode 100644 index 2bdb6006a..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-iproute.patch +++ /dev/null @@ -1,33 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - networking/libiproute/iproute.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -Index: busybox-1.9.0/networking/libiproute/iproute.c -=================================================================== ---- busybox-1.9.0.orig/networking/libiproute/iproute.c -+++ busybox-1.9.0/networking/libiproute/iproute.c -@@ -841,15 +841,17 @@ int do_iproute(char **argv) - /*0-3*/ "add\0""append\0""change\0""chg\0" - /*4-7*/ "delete\0""get\0""list\0""show\0" - /*8..*/ "prepend\0""replace\0""test\0""flush\0"; -- int command_num = 6; -+ int command_num; - unsigned flags = 0; - int cmd = RTM_NEWROUTE; - -+ if (!*argv) -+ return iproute_list_or_flush(argv, 0); -+ - /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */ - /* It probably means that it is using "first match" rule */ -- if (*argv) { -- command_num = index_in_substrings(ip_route_commands, *argv); -- } -+ command_num = index_in_substrings(ip_route_commands, *argv); -+ - switch (command_num) { - case 0: /* add */ - flags = NLM_F_CREATE|NLM_F_EXCL; diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-mkswap.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-mkswap.patch deleted file mode 100644 index dc18b292e..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-mkswap.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - util-linux/mkswap.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: busybox-1.9.0/util-linux/mkswap.c -=================================================================== ---- busybox-1.9.0.orig/util-linux/mkswap.c -+++ busybox-1.9.0/util-linux/mkswap.c -@@ -64,9 +64,10 @@ int mkswap_main(int argc, char **argv) - // Figure out how big the device is and announce our intentions. - - fd = xopen(argv[1], O_RDWR); -- len = fdlength(fd); -+ len = lseek(fd, 0, SEEK_END); -+ lseek(fd, 0, SEEK_SET); - pagesize = getpagesize(); -- printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n", -+ printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", - len - pagesize); - mkswap_selinux_setcontext(fd, argv[1]); - diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-msh.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-msh.patch deleted file mode 100644 index 2d03a2df7..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-msh.patch +++ /dev/null @@ -1,94 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - include/libbb.h | 5 ++--- - libbb/lineedit.c | 4 ++-- - shell/msh.c | 17 +++++++++++------ - 3 files changed, 15 insertions(+), 11 deletions(-) - -Index: busybox-1.9.0/include/libbb.h -=================================================================== ---- busybox-1.9.0.orig/include/libbb.h -+++ busybox-1.9.0/include/libbb.h -@@ -953,10 +953,9 @@ enum { - }; - line_input_t *new_line_input_t(int flags); - /* Returns: -- * -1 on read errors or EOF, or on bare Ctrl-D. -- * 0 on ctrl-C, -+ * -1 on read errors or EOF, or on bare Ctrl-D, -+ * 0 on ctrl-C (the line entered is still returned in 'command'), - * >0 length of input string, including terminating '\n' -- * [is this true? stores "" in 'command' if return value is 0 or -1] - */ - int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state); - #else -Index: busybox-1.9.0/libbb/lineedit.c -=================================================================== ---- busybox-1.9.0.orig/libbb/lineedit.c -+++ busybox-1.9.0/libbb/lineedit.c -@@ -1315,8 +1315,8 @@ static void win_changed(int nsig) - #define CTRL(a) ((a) & ~0x40) - - /* Returns: -- * -1 on read errors or EOF, or on bare Ctrl-D. -- * 0 on ctrl-C, -+ * -1 on read errors or EOF, or on bare Ctrl-D, -+ * 0 on ctrl-C (the line entered is still returned in 'command'), - * >0 length of input string, including terminating '\n' - */ - int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st) -Index: busybox-1.9.0/shell/msh.c -=================================================================== ---- busybox-1.9.0.orig/shell/msh.c -+++ busybox-1.9.0/shell/msh.c -@@ -2825,11 +2825,13 @@ static int forkexec(struct op *t, int *p - - if (pin != NULL) { - xmove_fd(pin[0], 0); -- if (pin[1] != 0) close(pin[1]); -+ if (pin[1] != 0) -+ close(pin[1]); - } - if (pout != NULL) { - xmove_fd(pout[1], 1); -- if (pout[1] != 1) close(pout[0]); -+ if (pout[1] != 1) -+ close(pout[0]); - } - - iopp = t->ioact; -@@ -4162,7 +4164,7 @@ static int grave(int quoted) - return 0; - } - if (i != 0) { -- waitpid(i, NULL, 0); -+ waitpid(i, NULL, 0); // safe_waitpid? - global_env.iop->argp->aword = ++cp; - close(pf[1]); - PUSHIO(afile, remap(pf[0]), -@@ -4181,7 +4183,8 @@ static int grave(int quoted) - * echo "$files" >zz - */ - xmove_fd(pf[1], 1); -- if (pf[0] != 1) close(pf[0]); -+ if (pf[0] != 1) -+ close(pf[0]); - - argument_list[0] = (char *) DEFAULT_SHELL; - argument_list[1] = (char *) "-c"; -@@ -4834,9 +4837,11 @@ static int filechar(struct ioarg *ap) - static int position = 0, size = 0; - - while (size == 0 || position >= size) { -- read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state); -- size = strlen(filechar_cmdbuf); -+ size = read_line_input(current_prompt, filechar_cmdbuf, BUFSIZ, line_input_state); -+ if (size < 0) /* Error/EOF */ -+ exit(0); - position = 0; -+ /* if Ctrl-C, size == 0 and loop will repeat */ - } - c = filechar_cmdbuf[position]; - position++; diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-nameif.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-nameif.patch deleted file mode 100644 index 921e3e898..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-nameif.patch +++ /dev/null @@ -1,41 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - networking/nameif.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -Index: busybox-1.9.0/networking/nameif.c -=================================================================== ---- busybox-1.9.0.orig/networking/nameif.c -+++ busybox-1.9.0/networking/nameif.c -@@ -50,18 +50,18 @@ typedef struct ethtable_s { - #define ETHTOOL_BUSINFO_LEN 32 - /* these strings are set to whatever the driver author decides... */ - struct ethtool_drvinfo { -- __u32 cmd; -- char driver[32]; /* driver short name, "tulip", "eepro100" */ -- char version[32]; /* driver version string */ -- char fw_version[32]; /* firmware version string, if applicable */ -- char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */ -+ uint32_t cmd; -+ char driver[32]; /* driver short name, "tulip", "eepro100" */ -+ char version[32]; /* driver version string */ -+ char fw_version[32]; /* firmware version string, if applicable */ -+ char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */ - /* For PCI devices, use pci_dev->slot_name. */ -- char reserved1[32]; -- char reserved2[16]; -- __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ -- __u32 testinfo_len; -- __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ -- __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ -+ char reserved1[32]; -+ char reserved2[16]; -+ uint32_t n_stats; /* number of u64's from ETHTOOL_GSTATS */ -+ uint32_t testinfo_len; -+ uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ -+ uint32_t regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ - }; - #define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */ - #endif diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-stty.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-stty.patch deleted file mode 100644 index 67ef27867..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-stty.patch +++ /dev/null @@ -1,46 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - coreutils/stty.c | 24 ++++-------------------- - 1 file changed, 4 insertions(+), 20 deletions(-) - -Index: busybox-1.9.0/coreutils/stty.c -=================================================================== ---- busybox-1.9.0.orig/coreutils/stty.c -+++ busybox-1.9.0/coreutils/stty.c -@@ -780,30 +780,14 @@ static const struct suffix_mult stty_suf - - static const struct mode_info *find_mode(const char *name) - { -- int i = 0; -- const char *m = mode_name; -- -- while (*m) { -- if (strcmp(name, m) == 0) -- return &mode_info[i]; -- m += strlen(m) + 1; -- i++; -- } -- return NULL; -+ int i = index_in_strings(mode_name, name); -+ return i >= 0 ? &mode_info[i] : NULL; - } - - static const struct control_info *find_control(const char *name) - { -- int i = 0; -- const char *m = mode_name; -- -- while (*m) { -- if (strcmp(name, m) == 0) -- return &control_info[i]; -- m += strlen(m) + 1; -- i++; -- } -- return NULL; -+ int i = index_in_strings(control_name, name); -+ return i >= 0 ? &control_info[i] : NULL; - } - - enum { diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-test.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-test.patch deleted file mode 100644 index d6fe23afc..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-test.patch +++ /dev/null @@ -1,129 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - coreutils/test.c | 49 +++++++++++++++++++++++++++---------------------- - testsuite/test.tests | 26 ++++++++++++++++++++++++++ - 2 files changed, 53 insertions(+), 22 deletions(-) - -Index: busybox-1.9.0/coreutils/test.c -=================================================================== ---- busybox-1.9.0.orig/coreutils/test.c -+++ busybox-1.9.0/coreutils/test.c -@@ -555,7 +555,7 @@ int test_main(int argc, char **argv) - { - int res; - const char *arg0; -- bool _off; -+ bool negate = 0; - - arg0 = bb_basename(argv[0]); - if (arg0[0] == '[') { -@@ -578,9 +578,8 @@ int test_main(int argc, char **argv) - INIT_S(); - - res = setjmp(leaving); -- if (res) { -+ if (res) - goto ret; -- } - - /* resetting ngroups is probably unnecessary. it will - * force a new call to getgroups(), which prevents using -@@ -592,34 +591,40 @@ int test_main(int argc, char **argv) - */ - ngroups = 0; - -+ //argc--; -+ argv++; -+ - /* Implement special cases from POSIX.2, section 4.62.4 */ -- if (argc == 1) { -+ if (!argv[0]) { /* "test" */ - res = 1; - goto ret; - } -- if (argc == 2) { -- res = (*argv[1] == '\0'); -+ if (LONE_CHAR(argv[0], '!') && argv[1]) { -+ negate = 1; -+ //argc--; -+ argv++; -+ } -+ if (!argv[1]) { /* "test [!] arg" */ -+ res = (*argv[0] == '\0'); - goto ret; - } -- -- /* remember if we saw argc==4 which wants *no* '!' test */ -- _off = argc - 4; -- if (_off ? (LONE_CHAR(argv[1], '!')) -- : (argv[1][0] != '!' || argv[1][1] != '\0') -- ) { -- if (argc == 3) { -- res = (*argv[2] != '\0'); -- goto ret; -- } -- -- t_lex(argv[2 + _off]); -+ if (argv[2] && !argv[3]) { -+ t_lex(argv[1]); - if (t_wp_op && t_wp_op->op_type == BINOP) { -- t_wp = &argv[1 + _off]; -- res = (binop() == _off); -+ /* "test [!] arg1 <binary_op> arg2" */ -+ t_wp = &argv[0]; -+ res = (binop() == 0); - goto ret; - } - } -- t_wp = &argv[1]; -+ -+ /* Some complex expression. Undo '!' removal */ -+ if (negate) { -+ negate = 0; -+ //argc++; -+ argv--; -+ } -+ t_wp = &argv[0]; - res = !oexpr(t_lex(*t_wp)); - - if (*t_wp != NULL && *++t_wp != NULL) { -@@ -628,5 +633,5 @@ int test_main(int argc, char **argv) - } - ret: - DEINIT_S(); -- return res; -+ return negate ? !res : res; - } -Index: busybox-1.9.0/testsuite/test.tests -=================================================================== ---- /dev/null -+++ busybox-1.9.0/testsuite/test.tests -@@ -0,0 +1,26 @@ -+#!/bin/sh -+ -+# Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com> -+# Licensed under GPL v2, see file LICENSE for details. -+ -+. testing.sh -+ -+# testing "test name" "options" "expected result" "file input" "stdin" -+# file input will be file called "input" -+# test can create a file "actual" instead of writing to stdout -+ -+# Need to call 'busybox test', otherwise shell builtin is used -+ -+testing "test ! a = b -a ! c = c: should be false" \ -+ "busybox test ! a = b -a ! c = c; echo \$?" \ -+ "1\n" \ -+ "" \ -+ "" \ -+ -+testing "test ! a = b -a ! c = d: should be true" \ -+ "busybox test ! a = b -a ! c = d; echo \$?" \ -+ "0\n" \ -+ "" \ -+ "" \ -+ -+exit $FAILCOUNT diff --git a/patches/busybox-1.9.0/generic/busybox-1.9.0-zcip.patch b/patches/busybox-1.9.0/generic/busybox-1.9.0-zcip.patch deleted file mode 100644 index 90f003997..000000000 --- a/patches/busybox-1.9.0/generic/busybox-1.9.0-zcip.patch +++ /dev/null @@ -1,78 +0,0 @@ -Subject: busybox 1.9.0 fixes -From: http://busybox.net/downloads/fixes-1.9.0 - ---- - networking/zcip.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -Index: busybox-1.9.0/networking/zcip.c -=================================================================== ---- busybox-1.9.0.orig/networking/zcip.c -+++ busybox-1.9.0/networking/zcip.c -@@ -180,7 +180,7 @@ int zcip_main(int argc, char **argv) - char *r_opt; - unsigned opts; - -- /* Ugly trick, but I want these zeroed in one go */ -+ // ugly trick, but I want these zeroed in one go - struct { - const struct in_addr null_ip; - const struct ether_addr null_addr; -@@ -214,8 +214,17 @@ int zcip_main(int argc, char **argv) - // exactly 2 args; -v accumulates and implies -f - opt_complementary = "=2:vv:vf"; - opts = getopt32(argv, "fqr:v", &r_opt, &verbose); -+#if !BB_MMU -+ // on NOMMU reexec early (or else we will rerun things twice) -+ if (!FOREGROUND) -+ bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); -+#endif -+ // open an ARP socket -+ // (need to do it before openlog to prevent openlog from taking -+ // fd 3 (sock_fd==3)) -+ xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd); - if (!FOREGROUND) { -- /* Do it early, before all bb_xx_msg calls */ -+ // do it before all bb_xx_msg calls - openlog(applet_name, 0, LOG_DAEMON); - logmode |= LOGMODE_SYSLOG; - } -@@ -226,11 +235,6 @@ int zcip_main(int argc, char **argv) - bb_error_msg_and_die("invalid link address"); - } - } -- // On NOMMU reexec early (or else we will rerun things twice) --#if !BB_MMU -- if (!FOREGROUND) -- bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); --#endif - argc -= optind; - argv += optind; - -@@ -249,8 +253,6 @@ int zcip_main(int argc, char **argv) - //TODO: are we leaving sa_family == 0 (AF_UNSPEC)?! - safe_strncpy(saddr.sa_data, intf, sizeof(saddr.sa_data)); - -- // open an ARP socket -- xmove_fd(xsocket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ARP)), sock_fd); - // bind to the interface's ARP socket - xbind(sock_fd, &saddr, sizeof(saddr)); - -@@ -290,7 +292,7 @@ int zcip_main(int argc, char **argv) - // restarting after address conflicts: - // - start with some address we want to try - // - short random delay -- // - arp probes to see if another host else uses it -+ // - arp probes to see if another host uses it - // - arp announcements that we're claiming it - // - use it - // - defend it, within limits -@@ -321,7 +323,7 @@ int zcip_main(int argc, char **argv) - switch (safe_poll(fds, 1, timeout_ms)) { - - default: -- /*bb_perror_msg("poll"); - done in safe_poll */ -+ //bb_perror_msg("poll"); - done in safe_poll - return EXIT_FAILURE; - - // timeout diff --git a/patches/busybox-1.9.0/generic/series b/patches/busybox-1.9.0/generic/series deleted file mode 100644 index 2a6390bef..000000000 --- a/patches/busybox-1.9.0/generic/series +++ /dev/null @@ -1,10 +0,0 @@ -busybox-1.9.0-allno.patch -busybox-1.9.0-fsck.patch -busybox-1.9.0-hush_nommu_tick.patch -busybox-1.9.0-iproute.patch -busybox-1.9.0-mkswap.patch -busybox-1.9.0-msh.patch -busybox-1.9.0-nameif.patch -busybox-1.9.0-stty.patch -busybox-1.9.0-test.patch -busybox-1.9.0-zcip.patch diff --git a/patches/busybox-1.9.1/generic/busybox-1.9.1-httpd-POST.patch b/patches/busybox-1.9.1/generic/busybox-1.9.1-httpd-POST.patch deleted file mode 100644 index 9642a5d05..000000000 --- a/patches/busybox-1.9.1/generic/busybox-1.9.1-httpd-POST.patch +++ /dev/null @@ -1,20 +0,0 @@ -Subject: busybox 1.9.1 fixes -From: http://busybox.net/downloads/fixes-1.9.1 - ---- - networking/httpd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: busybox-1.9.1/networking/httpd.c -=================================================================== ---- busybox-1.9.1.orig/networking/httpd.c -+++ busybox-1.9.1/networking/httpd.c -@@ -1950,7 +1950,7 @@ static void handle_incoming_and_exit(con - if ((STRNCASECMP(iobuf, "Content-length:") == 0)) { - /* extra read only for POST */ - if (prequest != request_GET) { -- tptr = iobuf + sizeof("Content-length:") - 1; -+ tptr = tptr = skip_whitespace(iobuf + sizeof("Content-length:") - 1); - if (!tptr[0]) - send_headers_and_exit(HTTP_BAD_REQUEST); - errno = 0; diff --git a/patches/busybox-1.9.1/generic/busybox-1.9.1-init.patch b/patches/busybox-1.9.1/generic/busybox-1.9.1-init.patch deleted file mode 100644 index 2d68f330c..000000000 --- a/patches/busybox-1.9.1/generic/busybox-1.9.1-init.patch +++ /dev/null @@ -1,36 +0,0 @@ -Subject: busybox 1.9.1 fixes -From: http://busybox.net/downloads/fixes-1.9.1 - ---- - init/init.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -Index: busybox-1.9.1/init/init.c -=================================================================== ---- busybox-1.9.1.orig/init/init.c -+++ busybox-1.9.1/init/init.c -@@ -225,8 +225,22 @@ static void console_init(void) - } - messageD(L_LOG, "console='%s'", s); - } else { -- /* Make sure fd 0,1,2 are not closed */ -- bb_sanitize_stdio(); -+ /* Make sure fd 0,1,2 are not closed -+ * (so that they won't be used by future opens) */ -+ -+ /* bb_sanitize_stdio(); - WRONG. -+ * Fail if "/dev/null" doesnt exist, and for init -+ * this is a real possibility! Open code it instead. */ -+ -+ int fd = open(bb_dev_null, O_RDWR); -+ if (fd < 0) { -+ /* Give me _ANY_ open descriptor! */ -+ fd = xopen("/", O_RDONLY); /* we don't believe this can fail */ -+ } -+ while ((unsigned)fd < 2) -+ fd = dup(fd); -+ if (fd > 2) -+ close (fd); - } - - s = getenv("TERM"); diff --git a/patches/busybox-1.9.1/generic/busybox-1.9.1-lineedit.patch b/patches/busybox-1.9.1/generic/busybox-1.9.1-lineedit.patch deleted file mode 100644 index b412de48d..000000000 --- a/patches/busybox-1.9.1/generic/busybox-1.9.1-lineedit.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: busybox 1.9.1 fixes -From: http://busybox.net/downloads/fixes-1.9.1 - ---- - libbb/lineedit.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -Index: busybox-1.9.1/libbb/lineedit.c -=================================================================== ---- busybox-1.9.1.orig/libbb/lineedit.c -+++ busybox-1.9.1/libbb/lineedit.c -@@ -246,7 +246,15 @@ static void input_backward(unsigned num) - if (cmdedit_x >= num) { - cmdedit_x -= num; - if (num <= 4) { -- printf("\b\b\b\b" + (4-num)); -+ /* This is longer by 5 bytes on x86. -+ * Also gets mysteriously -+ * miscompiled for some ARM users. -+ * printf(("\b\b\b\b" + 4) - num); -+ * return; -+ */ -+ do { -+ bb_putchar('\b'); -+ } while (--num); - return; - } - printf("\033[%uD", num); diff --git a/patches/busybox-1.9.1/generic/busybox-1.9.1-patch_permissions.patch b/patches/busybox-1.9.1/generic/busybox-1.9.1-patch_permissions.patch deleted file mode 100644 index 9ad8e6550..000000000 --- a/patches/busybox-1.9.1/generic/busybox-1.9.1-patch_permissions.patch +++ /dev/null @@ -1,58 +0,0 @@ -Subject: busybox 1.9.1 fixes -From: http://busybox.net/downloads/fixes-1.9.1 - ---- - editors/patch.c | 17 +++++++---------- - 1 file changed, 7 insertions(+), 10 deletions(-) - -Index: busybox-1.9.1/editors/patch.c -=================================================================== ---- busybox-1.9.1.orig/editors/patch.c -+++ busybox-1.9.1/editors/patch.c -@@ -71,12 +71,6 @@ static char *extract_filename(char *line - return xstrdup(filename_start_ptr); - } - --static int file_doesnt_exist(const char *filename) --{ -- struct stat statbuf; -- return stat(filename, &statbuf); --} -- - int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int patch_main(int argc, char **argv) - { -@@ -84,7 +78,8 @@ int patch_main(int argc, char **argv) - char *patch_line; - int ret; - FILE *patch_file = NULL; -- -+ struct stat saved_stat; -+ - { - char *p, *i; - ret = getopt32(argv, "p:i:", &p, &i); -@@ -134,8 +129,9 @@ int patch_main(int argc, char **argv) - } - new_filename = extract_filename(patch_line, patch_level); - free(patch_line); -- -- if (file_doesnt_exist(new_filename)) { -+ -+ /* Get access rights from the file to be patched, -1 file does not exist */ -+ if (stat(new_filename, &saved_stat)) { - char *line_ptr; - /* Create leading directories */ - line_ptr = strrchr(new_filename, '/'); -@@ -155,9 +151,10 @@ int patch_main(int argc, char **argv) - backup_filename); - } - dst_stream = xfopen(new_filename, "w"); -+ fchmod(fileno(dst_stream), saved_stat.st_mode); - } - -- if ((backup_filename == NULL) || file_doesnt_exist(original_filename)) { -+ if ((backup_filename == NULL) || stat(original_filename, &saved_stat)) { - src_stream = NULL; - } else { - if (strcmp(original_filename, new_filename) == 0) { diff --git a/patches/busybox-1.9.1/generic/busybox-1.9.1-udhcp.patch b/patches/busybox-1.9.1/generic/busybox-1.9.1-udhcp.patch deleted file mode 100644 index 340d6b451..000000000 --- a/patches/busybox-1.9.1/generic/busybox-1.9.1-udhcp.patch +++ /dev/null @@ -1,20 +0,0 @@ -Subject: busybox 1.9.1 fixes -From: http://busybox.net/downloads/fixes-1.9.1 - ---- - networking/udhcp/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: busybox-1.9.1/networking/udhcp/files.c -=================================================================== ---- busybox-1.9.1.orig/networking/udhcp/files.c -+++ busybox-1.9.1/networking/udhcp/files.c -@@ -167,7 +167,7 @@ static int read_opt(const char *const_li - if (!opt) - return 0; - -- idx = index_in_strings(opt, dhcp_option_strings); /* NB: was strcasecmp! */ -+ idx = index_in_strings(dhcp_option_strings, opt); /* NB: was strcasecmp! */ - if (idx < 0) - return 0; - option = &dhcp_options[idx]; diff --git a/patches/busybox-1.9.1/generic/series b/patches/busybox-1.9.1/generic/series deleted file mode 100644 index 7ab40b0d3..000000000 --- a/patches/busybox-1.9.1/generic/series +++ /dev/null @@ -1,5 +0,0 @@ -busybox-1.9.1-lineedit.patch -busybox-1.9.1-init.patch -busybox-1.9.1-patch_permissions.patch -busybox-1.9.1-httpd-POST.patch -busybox-1.9.1-udhcp.patch diff --git a/rules/busybox.make b/rules/busybox.make index f7e7d28b7..1f6bee7a6 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION = 1.9.1 +BUSYBOX_VERSION = 1.10.0 BUSYBOX = busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX = tar.bz2 BUSYBOX_URL = http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) |