diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2012-08-30 10:20:41 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2012-08-30 10:20:41 +0200 |
| commit | 46b42b19c7dec20400c1c7621d09277bf3d92874 (patch) | |
| tree | a049bdbc56c981896da1131fcfb23ca178b1f255 /package/busybox | |
| parent | 8865b970f9db91f24472c596117c785cb76cdb2b (diff) | |
update busybox to latest stable version, refresh all Config.in files
Diffstat (limited to 'package/busybox')
27 files changed, 2385 insertions, 2069 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 65f7a95ef..5180e6ede 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.19.4 +PKG_VERSION:= 1.20.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9c0cae5a0379228e7b55e5b29528df8e +PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_BUILDDEP:= libtirpc diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 5a0e5a285..3a5e340ae 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -32,7 +32,7 @@ config BUSYBOX_EXTRA_COMPAT config BUSYBOX_INCLUDE_SUSv2 bool "Enable obsolete features removed before SUSv3" - default y + default n help This option will enable backwards compatibility with SuSv2, specifically, old-style numeric options ('command -1 <file>') @@ -83,20 +83,21 @@ config BUSYBOX_FEATURE_BUFFERS_GO_IN_BSS endchoice config BUSYBOX_SHOW_USAGE - bool "Show terse applet usage messages" + bool "Show applet usage messages" default y help - All BusyBox applets will show help messages when invoked with - wrong arguments. You can turn off printing these terse usage - messages if you say no here. - This will save you up to 7k. + Enabling this option, BusyBox applets will show terse help messages + when invoked with wrong arguments. + If you do not want to show any (helpful) usage message when + issuing wrong command syntax, you can say 'N' here, + saving approximately 7k. config BUSYBOX_FEATURE_VERBOSE_USAGE bool "Show verbose applet usage messages" default y - select BUSYBOX_SHOW_USAGE + depends on BUSYBOX_SHOW_USAGE help - All BusyBox applets will show more verbose help messages when + All BusyBox applets will show verbose help messages when busybox is invoked with --help. This will add a lot of text to the busybox binary. In the default configuration, this will add about 13k, but it can add much more depending on your configuration. @@ -106,8 +107,8 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE default y depends on BUSYBOX_SHOW_USAGE help - Store usage messages in compressed form, uncompress them on-the-fly - when <applet> --help is called. + Store usage messages in .bz compressed form, uncompress them + on-the-fly when <applet> --help is called. If you have a really tiny busybox with few applets enabled (and bunzip2 isn't one of them), the overhead of the decompressor might @@ -153,8 +154,8 @@ config BUSYBOX_UNICODE_USING_LOCALE config BUSYBOX_FEATURE_CHECK_UNICODE_IN_ENV bool "Check $LANG environment variable" - default y - depends on BUSYBOX_FEATURE_ASSUME_UNICODE && !BUSYBOX_LOCALE_SUPPORT + default n + depends on BUSYBOX_UNICODE_SUPPORT && !BUSYBOX_UNICODE_USING_LOCALE help With this option on, Unicode support is activated only if LANG variable has the value of the form "xxxx.utf8" @@ -240,8 +241,9 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN default n depends on BUSYBOX_UNICODE_SUPPORT help - With this option on, invalid UTF-8 bytes are not substituted - with the selected substitution character. + With this option on, on line-editing input (such as used by shells) + invalid UTF-8 bytes are not substituted with the selected + substitution character. For example, this means that entering 'l', 's', ' ', 0xff, [Enter] at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. @@ -275,6 +277,26 @@ config BUSYBOX_FEATURE_CLEAN_UP Don't enable this unless you have a really good reason to clean things up manually. +config BUSYBOX_FEATURE_UTMP + bool "Support utmp file" + default y + help + The file /var/run/utmp is used to track who is currently logged in. + With this option on, certain applets (getty, login, telnetd etc) + will create and delete entries there. + "who" applet requires this option. + +config BUSYBOX_FEATURE_WTMP + bool "Support wtmp file" + default y + depends on BUSYBOX_FEATURE_UTMP + help + The file /var/run/wtmp is used to track when users have logged into + and logged out of the system. + With this option on, certain applets (getty, login, telnetd etc) + will append new entries there. + "last" applet requires this option. + config BUSYBOX_FEATURE_PIDFILE bool "Support writing pidfiles" default y @@ -284,7 +306,7 @@ config BUSYBOX_FEATURE_PIDFILE config BUSYBOX_FEATURE_SUID bool "Support for SUID/SGID handling" - default n + default y help With this option you can install the busybox binary belonging to root with the suid bit set, enabling some applets to perform @@ -299,21 +321,39 @@ config BUSYBOX_FEATURE_SUID symlinks pointing to each binary), and only set the suid bit on the one that needs it. - The applets currently marked to need the suid bit are: + The applets which require root rights (need suid bit or + to be run by root) and will refuse to execute otherwise: + crontab, login, passwd, su, vlock, wall. + + The applets which will use root rights if they have them + (via suid bit, or because run by root), but would try to work + without root right nevertheless: + findfs, ping[6], traceroute[6], mount. - crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, - traceroute, vlock. + Note that if you DONT select this option, but DO make busybox + suid root, ALL applets will run under root, which is a huge + security hole (think "cp /some/file /etc/passwd"). config BUSYBOX_FEATURE_SUID_CONFIG bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default n if BUSYBOX_FEATURE_SUID + default y depends on BUSYBOX_FEATURE_SUID help Allow the SUID / SGID state of an applet to be determined at runtime by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) The format of this file is as follows: - <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) + APPLET = [Ssx-][Ssx-][x-] [USER.GROUP] + + s: USER or GROUP is allowed to execute APPLET. + APPLET will run under USER or GROUP + (reagardless of who's running it). + S: USER or GROUP is NOT allowed to execute APPLET. + APPLET will run under USER or GROUP. + This option is not very sensical. + x: USER/GROUP/others are allowed to execute APPLET. + No UID/GID change will be done when it is run. + -: USER/GROUP/others are not allowed to execute APPLET. An example might help: @@ -323,7 +363,8 @@ config BUSYBOX_FEATURE_SUID_CONFIG su = ssx # exactly the same mount = sx- root.disk # applet mount can be run by root and members - # of group disk and runs with euid=0 + # of group disk (but not anyone else) + # and runs with euid=0 (egid is not changed) cp = --- # disable applet cp for everyone @@ -349,7 +390,7 @@ config BUSYBOX_FEATURE_SUID_CONFIG_QUIET config BUSYBOX_SELINUX bool "Support NSA Security Enhanced Linux" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Enable support for SELinux in applets ls, ps, and id. Also provide the option of compiling in SELinux applets. @@ -430,7 +471,10 @@ config BUSYBOX_PIE default n depends on !BUSYBOX_STATIC help - (TODO: what is it and why/when is it useful?) + Hardened code option. PIE binaries are loaded at a different + address at each invocation. This has some overhead, + particularly on x86-32 which is short on registers. + Most people will leave this set to 'N'. config BUSYBOX_NOMMU @@ -480,7 +524,7 @@ config BUSYBOX_BUILD_LIBBUSYBOX config BUSYBOX_FEATURE_INDIVIDUAL bool "Produce a binary for each applet, linked against libbusybox" - default n + default y depends on BUSYBOX_BUILD_LIBBUSYBOX help If your CPU architecture doesn't allow for sharing text/rodata @@ -498,7 +542,7 @@ config BUSYBOX_FEATURE_INDIVIDUAL config BUSYBOX_FEATURE_SHARED_BUSYBOX bool "Produce additional busybox binary linked against libbusybox" - default n + default y depends on BUSYBOX_BUILD_LIBBUSYBOX help Build busybox, dynamically linked against libbusybox.so.N.N.N. @@ -527,7 +571,6 @@ config BUSYBOX_FEATURE_SHARED_BUSYBOX config BUSYBOX_LFS bool "Build with Large File Support (for accessing files > 2 GB)" default y - select BUSYBOX_FDISK_SUPPORT_LARGE_DISKS help If you want to build BusyBox with large file support, then enable this option. This will have no effect if your kernel or your C @@ -549,12 +592,39 @@ config BUSYBOX_CROSS_COMPILER_PREFIX Native builds leave this empty. +config BUSYBOX_SYSROOT + string "Path to sysroot" + default "" + help + If you want to build BusyBox with a cross compiler, then you + might also need to specify where /usr/include and /usr/lib + will be found. + + For example, BusyBox can be built against an installed + Android NDK, platform version 9, for ARM ABI with + + CONFIG_SYSROOT=/opt/android-ndk/platforms/android-9/arch-arm + + Native builds leave this empty. + config BUSYBOX_EXTRA_CFLAGS string "Additional CFLAGS" default "" help Additional CFLAGS to pass to the compiler verbatim. +config BUSYBOX_EXTRA_LDFLAGS + string "Additional LDFLAGS" + default "" + help + Additional LDFLAGS to pass to the linker verbatim. + +config BUSYBOX_EXTRA_LDLIBS + string "Additional LDLIBS" + default "" + help + Additional LDLIBS to pass to the linker with -l. + endmenu menu 'Debugging Options' @@ -631,25 +701,13 @@ config BUSYBOX_EFENCE endchoice -### config PARSE -### bool "Uniform config file parser debugging applet: parse" - endmenu menu 'Installation Options ("make install" behavior)' -config BUSYBOX_INSTALL_NO_USR - bool "Don't use /usr" - default n - depends on BUSYBOX_FEATURE_INSTALLER - help - Disable use of /usr. busybox --install and "make install" - will install applets only to /bin and /sbin, - never to /usr/bin or /usr/sbin. - choice prompt "What kind of applet links to install" - default BUSYBOX_INSTALL_APPLET_SYMLINKS + default INSTALL_APPLET_SYMLINKS help Choose what kind of links to applets are created by "make install". @@ -673,7 +731,6 @@ config BUSYBOX_INSTALL_APPLET_SCRIPT_WRAPPERS config BUSYBOX_INSTALL_APPLET_DONT bool "not installed" - depends on BUSYBOX_FEATURE_INSTALLER || BUSYBOX_FEATURE_SH_STANDALONE || BUSYBOX_FEATURE_PREFER_APPLETS help Do not install applet links. Useful when you plan to use busybox --install for installing links, or plan to use @@ -701,8 +758,8 @@ config BUSYBOX_INSTALL_SH_APPLET_HARDLINK config BUSYBOX_INSTALL_SH_APPLET_SCRIPT_WRAPPER bool "as script wrapper" help - Install /bin/sh applet as script wrapper that call the busybox - binary. + Install /bin/sh applet as script wrapper that calls + the busybox binary. endchoice diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index aac6578f3..eaa576bff 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Archival Utilities" + config BUSYBOX_FEATURE_SEAMLESS_XZ bool "Make tar, rpm, modprobe etc understand .xz data" default y @@ -30,15 +32,15 @@ config BUSYBOX_FEATURE_SEAMLESS_GZ Make tar, rpm, modprobe etc understand .gz data. config BUSYBOX_FEATURE_SEAMLESS_Z - bool "Make tar and gunzip understand .Z data" + bool "tar, rpm, modprobe etc understand .Z data" default n help - Make tar and gunzip understand .Z data. + Make tar, rpm, modprobe etc understand .Z data. config BUSYBOX_AR bool "ar" - default y depends on !ADK_PACKAGE_BINUTILS + default n # needs to be improved to be able to replace binutils ar help ar is an archival utility program used to create, modify, and extract contents from archives. An archive is a single file holding @@ -61,7 +63,7 @@ config BUSYBOX_AR config BUSYBOX_FEATURE_AR_LONG_FILENAMES bool "Support for long filenames (not needed for debs)" - default n + default y depends on BUSYBOX_AR help By default the ar format can only store the first 15 characters @@ -71,7 +73,7 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES config BUSYBOX_FEATURE_AR_CREATE bool "Support archive creation" - default n + default y depends on BUSYBOX_AR help This enables archive creation (-c and -r) with busybox ar. @@ -79,7 +81,7 @@ config BUSYBOX_FEATURE_AR_CREATE config BUSYBOX_BUNZIP2 bool "bunzip2" depends on !ADK_PACKAGE_BZIP2 - default y + default n help bunzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -93,7 +95,7 @@ config BUSYBOX_BUNZIP2 config BUSYBOX_BZIP2 bool "bzip2" depends on !ADK_PACKAGE_BZIP2 - default y + default n help bzip2 is a compression utility using the Burrows-Wheeler block sorting text compression algorithm, and Huffman coding. Compression @@ -121,7 +123,7 @@ config BUSYBOX_CPIO config BUSYBOX_FEATURE_CPIO_O bool "Support for archive creation" - default n + default y depends on BUSYBOX_CPIO help This implementation of cpio can create cpio archives in the "newc" @@ -129,7 +131,7 @@ config BUSYBOX_FEATURE_CPIO_O config BUSYBOX_FEATURE_CPIO_P bool "Support for passthrough mode" - default n + default y depends on BUSYBOX_FEATURE_CPIO_O help Passthrough mode. Rarely used. @@ -184,11 +186,23 @@ config BUSYBOX_GZIP config BUSYBOX_FEATURE_GZIP_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_GZIP && BUSYBOX_LONG_OPTS help Enable use of long options, increases size by about 106 Bytes +config BUSYBOX_GZIP_FAST + int "Trade memory for gzip speed (0:small,slow - 2:fast,big)" + default 0 + range 0 2 + depends on BUSYBOX_GZIP + help + Enable big memory options for gzip. + 0: small buffers, small hash-tables + 1: larger buffers, larger hash-tables + 2: larger buffers, largest hash-tables + Larger models may give slightly better compression + config BUSYBOX_LZOP bool "lzop" default n @@ -196,7 +210,7 @@ config BUSYBOX_LZOP Lzop compression/decompresion. config BUSYBOX_LZOP_COMPR_HIGH - bool "lzop complession levels 7,8,9 (not very useful)" + bool "lzop compression levels 7,8,9 (not very useful)" default n depends on BUSYBOX_LZOP help @@ -216,7 +230,7 @@ config BUSYBOX_RPM2CPIO depends on !ADK_PACKAGE_RPM default n help - Converts an RPM file into a CPIO archive. + Converts a RPM file into a CPIO archive. config BUSYBOX_RPM bool "rpm" @@ -227,14 +241,13 @@ config BUSYBOX_RPM config BUSYBOX_TAR bool "tar" + depends on !ADK_PACKAGE_TAR default y help tar is an archiving program. It's commonly used with gzip to create compressed archives. It's probably the most widely used UNIX archive program. -if BUSYBOX_TAR - config BUSYBOX_FEATURE_TAR_CREATE bool "Enable archive creation" default y @@ -246,7 +259,7 @@ config BUSYBOX_FEATURE_TAR_CREATE config BUSYBOX_FEATURE_TAR_AUTODETECT bool "Autodetect compressed tarballs" default y - depends on BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA + depends on BUSYBOX_TAR && (BUSYBOX_FEATURE_SEAMLESS_Z || BUSYBOX_FEATURE_SEAMLESS_GZ || BUSYBOX_FEATURE_SEAMLESS_BZ2 || BUSYBOX_FEATURE_SEAMLESS_LZMA || BUSYBOX_FEATURE_SEAMLESS_XZ) help With this option tar can automatically detect compressed tarballs. Currently it works only on files (not pipes etc). @@ -261,8 +274,8 @@ config BUSYBOX_FEATURE_TAR_FROM config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY bool "Support for old tar header format" - default n - depends on BUSYBOX_TAR + default y + depends on BUSYBOX_TAR || BUSYBOX_DPKG help This option is required to unpack archives created in the old GNU format; help to kill this old format by @@ -270,8 +283,8 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" - default n - depends on BUSYBOX_TAR + default y + depends on BUSYBOX_TAR || BUSYBOX_DPKG help This option is required to unpack archives created by some old version of Sun's tar (it was calculating checksum using signed @@ -281,14 +294,14 @@ config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY config BUSYBOX_FEATURE_TAR_GNU_EXTENSIONS bool "Support for GNU tar extensions (long filenames)" default y - depends on BUSYBOX_TAR + depends on BUSYBOX_TAR || BUSYBOX_DPKG help With this option busybox supports GNU long filenames and linknames. config BUSYBOX_FEATURE_TAR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_TAR && BUSYBOX_LONG_OPTS help Enable use of long options, increases size by about 400 Bytes @@ -313,7 +326,7 @@ config BUSYBOX_FEATURE_TAR_UNAME_GNAME config BUSYBOX_FEATURE_TAR_NOPRESERVE_TIME bool "Enable -m (do not preserve time) option" - default n + default y depends on BUSYBOX_TAR help With this option busybox supports GNU tar -m @@ -327,8 +340,6 @@ config BUSYBOX_FEATURE_TAR_SELINUX With this option busybox supports restoring SELinux labels when extracting files from tar archives. -endif #tar - config BUSYBOX_UNCOMPRESS bool "uncompress" default n @@ -338,20 +349,16 @@ config BUSYBOX_UNCOMPRESS config BUSYBOX_UNLZMA bool "unlzma" - depends on !ADK_PACKAGE_XZ - default y + default n help unlzma is a compression utility using the Lempel-Ziv-Markov chain compression algorithm, and range coding. Compression is generally considerably better than that achieved by the bzip2 compressors. - The BusyBox unlzma applet is limited to de-compression only. + The BusyBox unlzma applet is limited to decompression only. On an x86 system, this applet adds about 4K. - Unless you have a specific application which requires unlzma, you - should probably say N here. - config BUSYBOX_FEATURE_LZMA_FAST bool "Optimize unlzma for speed" default n @@ -371,12 +378,13 @@ config BUSYBOX_LZMA config BUSYBOX_UNXZ bool "unxz" depends on !ADK_PACKAGE_XZ - default y + default n help unxz is a unlzma successor. config BUSYBOX_XZ bool "Provide xz alias which supports only unpacking" + depends on !ADK_PACKAGE_XZ default n depends on BUSYBOX_UNXZ help diff --git a/package/busybox/config/console-tools/Config.in b/package/busybox/config/console-tools/Config.in index 03d277111..5a1dc29c4 100644 --- a/package/busybox/config/console-tools/Config.in +++ b/package/busybox/config/console-tools/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,10 +6,11 @@ menu "Console Utilities" + config BUSYBOX_CHVT bool "chvt" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) @@ -16,7 +18,7 @@ config BUSYBOX_CHVT config BUSYBOX_FGCONSOLE bool "fgconsole" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program prints active (foreground) console number. @@ -29,30 +31,30 @@ config BUSYBOX_CLEAR config BUSYBOX_DEALLOCVT bool "deallocvt" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program deallocates unused virtual consoles. config BUSYBOX_DUMPKMAP bool "dumpkmap" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. config BUSYBOX_KBD_MODE bool "kbd_mode" - default y if ADK_TARGET_WITH_INPUT default n - depends on BUSYBOX_PLATFORM_LINUX + default y if ADK_TARGET_WITH_INPUT + select BUSYBOX_PLATFORM_LINUX help This program reports and sets keyboard mode. config BUSYBOX_LOADFONT bool "loadfont" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program loads a console font from standard input. @@ -60,15 +62,15 @@ config BUSYBOX_LOADKMAP bool "loadkmap" default y if ADK_TARGET_WITH_INPUT default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This program loads a keyboard translation table from standard input. config BUSYBOX_OPENVT bool "openvt" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program is used to start a command on an unused virtual terminal. @@ -82,14 +84,14 @@ config BUSYBOX_RESET config BUSYBOX_RESIZE bool "resize" - default n + default y help This program is used to (re)set the width and height of your current terminal. config BUSYBOX_FEATURE_RESIZE_PRINT bool "Print environment variables" - default n + default y depends on BUSYBOX_RESIZE help Prints the newly set size (number of columns and rows) of @@ -99,15 +101,15 @@ config BUSYBOX_FEATURE_RESIZE_PRINT config BUSYBOX_SETCONSOLE bool "setconsole" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program redirects the system console to another device, like the current tty while logged in via telnet. config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_SETCONSOLE && BUSYBOX_LONG_OPTS help Support long options for the setconsole applet. @@ -115,13 +117,13 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS config BUSYBOX_SETFONT bool "setfont" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Allows to load console screen map. Useful for i18n. config BUSYBOX_FEATURE_SETFONT_TEXTUAL_MAP bool "Support reading textual screen maps" - default n + default y depends on BUSYBOX_SETFONT help Support reading textual screen maps. @@ -136,23 +138,23 @@ config BUSYBOX_DEFAULT_SETFONT_DIR config BUSYBOX_SETKEYCODES bool "setkeycodes" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. config BUSYBOX_SETLOGCONS bool "setlogcons" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This program redirects the output console of kernel messages. config BUSYBOX_SHOWKEY bool "showkey" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help Shows keys pressed. diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 1b2d9d5fd..6393c1c14 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,12 +6,6 @@ menu "Coreutils" -config BUSYBOX_BASE64 - bool "base64" - default y - help - Base64 encode and decode - config BUSYBOX_BASENAME bool "basename" default y @@ -18,23 +13,146 @@ config BUSYBOX_BASENAME basename is used to strip the directory and suffix from filenames, leaving just the filename itself. Enable this option if you wish to enable the 'basename' utility. - -config BUSYBOX_CAL - bool "cal" - default n - help - cal is used to display a monthly calender. - config BUSYBOX_CAT bool "cat" default y help cat is used to concatenate files and print them to the standard output. Enable this option if you wish to enable the 'cat' utility. +config BUSYBOX_DATE + bool "date" + default y + help + date is used to set the system date or display the + current time in the given format. + +config BUSYBOX_FEATURE_DATE_ISOFMT + bool "Enable ISO date format output (-I)" + default y + depends on BUSYBOX_DATE + help + Enable option (-I) to output an ISO-8601 compliant + date/time string. + +# defaults to "no": stat's nanosecond field is a bit non-portable +config BUSYBOX_FEATURE_DATE_NANO + bool "Support %[num]N nanosecond format specifier" + default n + depends on BUSYBOX_DATE # syscall(__NR_clock_gettime) + select BUSYBOX_PLATFORM_LINUX + help + Support %[num]N format specifier. Adds ~250 bytes of code. + +config BUSYBOX_FEATURE_DATE_COMPAT + bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" + default y + depends on BUSYBOX_DATE + help + System time can be set by 'date -s DATE' and simply 'date DATE', + but formats of DATE string are different. 'date DATE' accepts + a rather weird MMDDhhmm[[YY]YY][.ss] format with completely + unnatural placement of year between minutes and seconds. + date -s (and other commands like touch -d) use more sensible + formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). + + With this option off, 'date DATE' is 'date -s DATE' support + the same format. With it on, 'date DATE' additionally supports + MMDDhhmm[[YY]YY][.ss] format. +config BUSYBOX_HOSTID + bool "hostid" + default y + help + hostid prints the numeric identifier (in hexadecimal) for + the current host. +config BUSYBOX_ID + bool "id" + default y + help + id displays the current user and group ID names. +config BUSYBOX_GROUPS + bool "groups" + default y + help + Print the group names associated with current user id. +config BUSYBOX_TEST + bool "test" + default y + help + test is used to check file types and compare values, + returning an appropriate exit code. The bash shell + has test built in, ash can build it in optionally. + +config BUSYBOX_FEATURE_TEST_64 + bool "Extend test to 64 bit" + default y + depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH + help + Enable 64-bit support in test. +config BUSYBOX_TOUCH + bool "touch" + default y + help + touch is used to create or change the access and/or + modification timestamp of specified files. + +config BUSYBOX_FEATURE_TOUCH_SUSV3 + bool "Add support for SUSV3 features (-d -t -r)" + default y + depends on BUSYBOX_TOUCH + help + Enable touch to use a reference file or a given date/time argument. +config BUSYBOX_TR + bool "tr" + default y + help + tr is used to squeeze, and/or delete characters from standard + input, writing to standard output. + +config BUSYBOX_FEATURE_TR_CLASSES + bool "Enable character classes (such as [:upper:])" + default y + depends on BUSYBOX_TR + help + Enable character classes, enabling commands such as: + tr [:upper:] [:lower:] to convert input into lowercase. + +config BUSYBOX_FEATURE_TR_EQUIV + bool "Enable equivalence classes" + default y + depends on BUSYBOX_TR + help + Enable equivalence classes, which essentially add the enclosed + character to the current set. For instance, tr [=a=] xyz would + replace all instances of 'a' with 'xyz'. This option is mainly + useful for cases when no other way of expressing a character + is possible. +config BUSYBOX_BASE64 + bool "base64" + default y + help + Base64 encode and decode +config BUSYBOX_WHO + bool "who" + default y + depends on BUSYBOX_FEATURE_UTMP + help + who is used to show who is logged on. +config BUSYBOX_USERS + bool "users" + default y + depends on BUSYBOX_FEATURE_UTMP + help + Print users currently logged on. + +config BUSYBOX_CAL + bool "cal" + default y + help + cal is used to display a monthly calender. config BUSYBOX_CATV bool "catv" - default n + default y help Display nonprinting characters as escape sequences (like some implementations' cat -v option). @@ -60,7 +178,7 @@ config BUSYBOX_CHOWN config BUSYBOX_FEATURE_CHOWN_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_CHOWN && BUSYBOX_LONG_OPTS help Enable use of long options @@ -74,7 +192,7 @@ config BUSYBOX_CHROOT config BUSYBOX_CKSUM bool "cksum" - default n + default y help cksum is used to calculate the CRC32 checksum of a file. @@ -93,7 +211,7 @@ config BUSYBOX_CP config BUSYBOX_FEATURE_CP_LONG_OPTIONS bool "Enable long options for cp" - default n + default y depends on BUSYBOX_CP && BUSYBOX_LONG_OPTS help Enable long options for cp. @@ -106,45 +224,6 @@ config BUSYBOX_CUT cut is used to print selected parts of lines from each file to stdout. -config BUSYBOX_DATE - bool "date" - default y - help - date is used to set the system date or display the - current time in the given format. - -config BUSYBOX_FEATURE_DATE_ISOFMT - bool "Enable ISO date format output (-I)" - default y - depends on BUSYBOX_DATE - help - Enable option (-I) to output an ISO-8601 compliant - date/time string. - -# defaults to "no": stat's nanosecond field is a bit non-portable -config BUSYBOX_FEATURE_DATE_NANO - bool "Support %[num]N nanosecond format specifier" - default n - depends on BUSYBOX_DATE && BUSYBOX_PLATFORM_LINUX # syscall(__NR_clock_gettime) - help - Support %[num]N format specifier. Adds ~250 bytes of code. - -config BUSYBOX_FEATURE_DATE_COMPAT - bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" - default y - depends on BUSYBOX_DATE - help - System time can be set by 'date -s DATE' and simply 'date DATE', - but formats of DATE string are different. 'date DATE' accepts - a rather weird MMDDhhmm[[YY]YY][.ss] format with completely - unnatural placement of year between minutes and seconds. - date -s (and other commands like touch -d) use more sensible - formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). - - With this option off, 'date DATE' is 'date -s DATE' support - the same format. With it on, 'date DATE' additionally supports - MMDDhhmm[[YY]YY][.ss] format. - config BUSYBOX_DD bool "dd" default y @@ -169,7 +248,7 @@ config BUSYBOX_FEATURE_DD_SIGNAL_HANDLING config BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE bool "Enable the third status line upon signal" - default n + default y depends on BUSYBOX_DD && BUSYBOX_FEATURE_DD_SIGNAL_HANDLING help Displays a coreutils-like third status line with transferred bytes, @@ -177,7 +256,7 @@ config BUSYBOX_FEATURE_DD_THIRD_STATUS_LINE config BUSYBOX_FEATURE_DD_IBS_OBS bool "Enable ibs, obs and conv options" - default n + default y depends on BUSYBOX_DD help Enables support for writing a certain number of bytes in and out, @@ -192,7 +271,7 @@ config BUSYBOX_DF config BUSYBOX_FEATURE_DF_FANCY bool "Enable -a, -i, -B" - default n + default y depends on BUSYBOX_DF help This option enables -a, -i and -B. @@ -210,7 +289,7 @@ config BUSYBOX_DIRNAME config BUSYBOX_DOS2UNIX bool "dos2unix/unix2dos" - default n + default y help dos2unix is used to convert a text file from DOS format to UNIX format, and vice versa. @@ -261,20 +340,20 @@ config BUSYBOX_ENV config BUSYBOX_FEATURE_ENV_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_ENV && BUSYBOX_LONG_OPTS help Support long options for the env applet. config BUSYBOX_EXPAND bool "expand" - default n + default y help By default, convert all tabs to spaces. config BUSYBOX_FEATURE_EXPAND_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_EXPAND && BUSYBOX_LONG_OPTS help Support long options for the expand applet. @@ -288,7 +367,7 @@ config BUSYBOX_EXPR config BUSYBOX_EXPR_MATH_SUPPORT_64 bool "Extend Posix numbers support to 64 bit" - default n + default y depends on BUSYBOX_EXPR help Enable 64-bit math support in the expr applet. This will make @@ -303,13 +382,13 @@ config BUSYBOX_FALSE config BUSYBOX_FOLD bool "fold" - default n + default y help Wrap text to fit a specific width. config BUSYBOX_FSYNC bool "fsync" - default n + default y help fsync is used to flush file-related cached blocks to disk. @@ -322,24 +401,11 @@ config BUSYBOX_HEAD config BUSYBOX_FEATURE_FANCY_HEAD bool "Enable head options (-c, -q, and -v)" - default n + default y depends on BUSYBOX_HEAD help This enables the head options (-c, -q, and -v). -config BUSYBOX_HOSTID - bool "hostid" - default n - help - hostid prints the numeric identifier (in hexadecimal) for - the current host. - -config BUSYBOX_ID - bool "id" - default y - help - id displays the current user and group ID names. - config BUSYBOX_INSTALL bool "install" default y @@ -348,16 +414,16 @@ config BUSYBOX_INSTALL config BUSYBOX_FEATURE_INSTALL_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_INSTALL && BUSYBOX_LONG_OPTS help Support long options for the install applet. -config BUSYBOX_LENGTH - bool "length" - default n - help - length is used to print out the length of a specified string. +####config LENGTH +#### bool "length" +#### default y +#### help +#### length is used to print out the length of a specified string. config BUSYBOX_LN bool "ln" @@ -367,7 +433,7 @@ config BUSYBOX_LN config BUSYBOX_LOGNAME bool "logname" - default n + default y help logname is used to print the current user's login name. @@ -421,14 +487,14 @@ config BUSYBOX_FEATURE_LS_USERNAME config BUSYBOX_FEATURE_LS_COLOR bool "Allow use of color to identify file types" - default n + default y depends on BUSYBOX_LS && BUSYBOX_LONG_OPTS help This enables the --color option to ls. config BUSYBOX_FEATURE_LS_COLOR_IS_DEFAULT bool "Produce colored ls output by default" - default n + default y depends on BUSYBOX_FEATURE_LS_COLOR help Saying yes here will turn coloring on by default, @@ -451,7 +517,7 @@ config BUSYBOX_MKDIR config BUSYBOX_FEATURE_MKDIR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_MKDIR && BUSYBOX_LONG_OPTS help Support long options for the mkdir applet. @@ -478,20 +544,20 @@ config BUSYBOX_MV config BUSYBOX_FEATURE_MV_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_MV && BUSYBOX_LONG_OPTS help Support long options for the mv applet. config BUSYBOX_NICE bool "nice" - default n + default y help nice runs a program with modified scheduling priority. config BUSYBOX_NOHUP bool "nohup" - default n + default y help run a command immune to hangups, with output to a non-tty. @@ -503,7 +569,7 @@ config BUSYBOX_OD config BUSYBOX_PRINTENV bool "printenv" - default n + default y help printenv is used to print all or part of environment. @@ -536,7 +602,7 @@ config BUSYBOX_FEATURE_READLINK_FOLLOW config BUSYBOX_REALPATH bool "realpath" - default n + default y help Return the canonicalized absolute pathname. This isn't provided by GNU shellutils, but where else does it belong. @@ -555,7 +621,7 @@ config BUSYBOX_RMDIR config BUSYBOX_FEATURE_RMDIR_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_RMDIR && BUSYBOX_LONG_OPTS help Support long options for the rmdir applet, including @@ -569,19 +635,19 @@ config BUSYBOX_SEQ config BUSYBOX_SHA1SUM bool "sha1sum" - default n + default y help Compute and check SHA1 message digest config BUSYBOX_SHA256SUM bool "sha256sum" - default n + default y help Compute and check SHA256 message digest config BUSYBOX_SHA512SUM bool "sha512sum" - default n + default y help Compute and check SHA512 message digest @@ -601,7 +667,7 @@ config BUSYBOX_SLEEP config BUSYBOX_FEATURE_FANCY_SLEEP bool "Enable multiple arguments and s/m/h/d suffixes" - default n + default y depends on BUSYBOX_SLEEP help Allow sleep to pause for specified minutes, hours, and days. @@ -639,7 +705,7 @@ config BUSYBOX_SPLIT config BUSYBOX_FEATURE_SPLIT_FANCY bool "Fancy extensions" - default n + default y depends on BUSYBOX_SPLIT help Add support for features not required by SUSv3. @@ -649,13 +715,13 @@ config BUSYBOX_FEATURE_SPLIT_FANCY config BUSYBOX_STAT bool "stat" default y - depends on BUSYBOX_PLATFORM_LINUX # statfs() + select BUSYBOX_PLATFORM_LINUX # statfs() help display file or filesystem status. config BUSYBOX_FEATURE_STAT_FORMAT bool "Enable custom formats (-c)" - default n + default y depends on BUSYBOX_STAT help Without this, stat will not support the '-c format' option where @@ -664,13 +730,13 @@ config BUSYBOX_FEATURE_STAT_FORMAT config BUSYBOX_STTY bool "stty" - default n + default y help stty is used to change and print terminal line settings. config BUSYBOX_SUM bool "sum" - default n + default y help checksum and count the blocks in a file @@ -705,7 +771,6 @@ config BUSYBOX_FEATURE_FANCY_TAIL -s SEC Wait SEC seconds between reads with -f -v Always output headers giving file names - config BUSYBOX_TEE bool "tee" default y @@ -715,59 +780,11 @@ config BUSYBOX_TEE config BUSYBOX_FEATURE_TEE_USE_BLOCK_IO bool "Enable block I/O (larger/faster) instead of byte I/O" - default n + default y depends on BUSYBOX_TEE help Enable this option for a faster tee, at expense of size. -config BUSYBOX_TEST - bool "test" - default y - help - test is used to check file types and compare values, - returning an appropriate exit code. The bash shell - has test built in, ash can build it in optionally. - -config BUSYBOX_FEATURE_TEST_64 - bool "Extend test to 64 bit" - default n - depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH - help - Enable 64-bit support in test. - -config BUSYBOX_TOUCH - bool "touch" - default y - help - touch is used to create or change the access and/or - modification timestamp of specified files. - -config BUSYBOX_TR - bool "tr" - default y - help - tr is used to squeeze, and/or delete characters from standard - input, writing to standard output. - -config BUSYBOX_FEATURE_TR_CLASSES - bool "Enable character classes (such as [:upper:])" - default y - depends on BUSYBOX_TR - help - Enable character classes, enabling commands such as: - tr [:upper:] [:lower:] to convert input into lowercase. - -config BUSYBOX_FEATURE_TR_EQUIV - bool "Enable equivalence classes" - default y - depends on BUSYBOX_TR - help - Enable equivalence classes, which essentially add the enclosed - character to the current set. For instance, tr [=a=] xyz would - replace all instances of 'a' with 'xyz'. This option is mainly - useful for cases when no other way of expressing a character - is possible. - config BUSYBOX_TRUE bool "true" default y @@ -789,13 +806,13 @@ config BUSYBOX_UNAME config BUSYBOX_UNEXPAND bool "unexpand" - default n + default y help By default, convert only leading sequences of blanks to tabs. config BUSYBOX_FEATURE_UNEXPAND_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_UNEXPAND && BUSYBOX_LONG_OPTS help Support long options for the unexpand applet. @@ -808,19 +825,19 @@ config BUSYBOX_UNIQ config BUSYBOX_USLEEP bool "usleep" - default n + default y help usleep is used to pause for a specified number of microseconds. config BUSYBOX_UUDECODE bool "uudecode" - default n + default y help uudecode is used to decode a uuencoded file. config BUSYBOX_UUENCODE bool "uuencode" - default n + default y help uuencode is used to uuencode a file. @@ -833,18 +850,11 @@ config BUSYBOX_WC config BUSYBOX_FEATURE_WC_LARGE bool "Support very large files in wc" - default n + default y depends on BUSYBOX_WC help Use "unsigned long long" in wc for counter variables. -config BUSYBOX_WHO - bool "who" - default n - select BUSYBOX_FEATURE_UTMP - help - who is used to show who is logged on. - config BUSYBOX_WHOAMI bool "whoami" default y @@ -898,7 +908,7 @@ comment "Common options for md5sum, sha1sum, sha256sum, sha512sum" config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK bool "Enable -c, -s and -w options" - default n + default y depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM help Enabling the -c options allows files to be checked diff --git a/package/busybox/config/debianutils/Config.in b/package/busybox/config/debianutils/Config.in index 891d194e0..55ff438ad 100644 --- a/package/busybox/config/debianutils/Config.in +++ b/package/busybox/config/debianutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Debian Utilities" + config BUSYBOX_MKTEMP bool "mktemp" default y @@ -13,7 +15,7 @@ config BUSYBOX_MKTEMP config BUSYBOX_PIPE_PROGRESS bool "pipe_progress" - default n + default y help Display a dot to indicate pipe activity. @@ -34,14 +36,14 @@ config BUSYBOX_RUN_PARTS config BUSYBOX_FEATURE_RUN_PARTS_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_RUN_PARTS && BUSYBOX_LONG_OPTS help Support long options for the run-parts applet. config BUSYBOX_FEATURE_RUN_PARTS_FANCY bool "Support additional arguments" - default n + default y depends on BUSYBOX_RUN_PARTS help Support additional options: @@ -58,7 +60,7 @@ config BUSYBOX_START_STOP_DAEMON config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY bool "Support additional arguments" - default n + default y depends on BUSYBOX_START_STOP_DAEMON help Support additional arguments. @@ -68,7 +70,7 @@ config BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY config BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_START_STOP_DAEMON && BUSYBOX_LONG_OPTS help Support long options for the start-stop-daemon applet. @@ -81,4 +83,3 @@ config BUSYBOX_WHICH print out their pathnames. endmenu - diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in index ab5012e66..830994b89 100644 --- a/package/busybox/config/e2fsprogs/Config.in +++ b/package/busybox/config/e2fsprogs/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,15 +6,16 @@ menu "Linux Ext2 FS Progs" + config BUSYBOX_CHATTR bool "chattr" - default n + default y help chattr changes the file attributes on a second extended file system. ### config E2FSCK ### bool "e2fsck" -### default n +### default y ### help ### e2fsck is used to check Linux second extended file systems (ext2fs). ### e2fsck also supports ext2 filesystems countaining a journal (ext3). @@ -30,27 +32,28 @@ config BUSYBOX_FSCK config BUSYBOX_LSATTR bool "lsattr" - default n + default y + select BUSYBOX_PLATFORM_LINUX help lsattr lists the file attributes on a second extended file system. ### config MKE2FS ### bool "mke2fs" -### default n +### default y ### 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. +config BUSYBOX_TUNE2FS + bool "tune2fs" + default n # off: it is too limited compared to upstream version + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. ### config E2LABEL ### bool "e2label" -### default n +### default y ### depends on BUSYBOX_TUNE2FS ### help ### e2label will display or change the filesystem label on the ext2 @@ -59,7 +62,7 @@ config BUSYBOX_LSATTR ### NB: this one is now provided by util-linux/volume_id/* ### config FINDFS ### bool "findfs" -### default n +### default y ### depends on BUSYBOX_TUNE2FS ### help ### findfs will search the disks in the system looking for a filesystem diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in index e7e376c0d..2146bb9a9 100644 --- a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in +++ b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,21 +6,22 @@ menu "Linux Ext2 FS Progs" + config BUSYBOX_CHATTR bool "chattr" default n help chattr changes the file attributes on a second extended file system. -#config BUSYBOX_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. -# +config BUSYBOX_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. + config BUSYBOX_FSCK bool "fsck" default n @@ -34,34 +36,34 @@ config BUSYBOX_LSATTR help lsattr lists the file attributes on a second extended file system. -#config BUSYBOX_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. +config BUSYBOX_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. -#config BUSYBOX_TUNE2FS -# bool "tune2fs" -# default n -# help -## tune2fs allows the system administrator to adjust various tunable -# filesystem parameters on Linux ext2/ext3 filesystems. +config BUSYBOX_TUNE2FS + bool "tune2fs" + default n + help + tune2fs allows the system administrator to adjust various tunable + filesystem parameters on Linux ext2/ext3 filesystems. -#config BUSYBOX_E2LABEL -# bool "e2label" -# default n -# depends on BUSYBOX_TUNE2FS -# help -# e2label will display or change the filesystem label on the ext2 -# filesystem located on device. +config BUSYBOX_E2LABEL + bool "e2label" + default n + depends on BUSYBOX_TUNE2FS + help + e2label will display or change the filesystem label on the ext2 + filesystem located on device. -#config BUSYBOX_FINDFS -# bool "findfs" -# default n -# depends on BUSYBOX_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. +config BUSYBOX_FINDFS + bool "findfs" + default n + depends on BUSYBOX_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/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 1a86ce9bd..f6e29ac34 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,75 +6,12 @@ menu "Editors" -config BUSYBOX_AWK - bool "awk" - default y - help - Awk is used as a pattern scanning and processing language. This is - the BusyBox implementation of that programming language. - -config BUSYBOX_FEATURE_AWK_LIBM - bool "Enable math functions (requires libm)" - default n - depends on BUSYBOX_AWK - help - Enable math functions of the Awk programming language. - NOTE: This will require libm to be present for linking. - -config BUSYBOX_CMP - bool "cmp" - default y - help - cmp is used to compare two files and returns the result - to standard output. - -config BUSYBOX_DIFF - bool "diff" - depends on !ADK_PACKAGE_DIFFUTILS - default n - help - diff compares two files or directories and outputs the - differences between them in a form that can be given to - the patch command. - -config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS - help - Enable use of long options. - -config BUSYBOX_FEATURE_DIFF_DIR - bool "Enable directory support" - default y - depends on BUSYBOX_DIFF - help - This option enables support for directory and subdirectory - comparison. - -config BUSYBOX_ED - bool "ed" - default n - help - The original 1970's Unix text editor, from the days of teletypes. - Small, simple, evil. Part of SUSv3. If you're not already using - this, you don't need it. - config BUSYBOX_PATCH bool "patch" depends on !ADK_PACKAGE_PATCH default n help Apply a unified diff formatted patch. - -config BUSYBOX_SED - bool "sed" - depends on !ADK_PACKAGE_SED - default y - help - sed is used to perform text transformations on a file - or input from a pipeline. - config BUSYBOX_VI bool "vi" default y @@ -94,7 +32,7 @@ config BUSYBOX_FEATURE_VI_MAX_LEN config BUSYBOX_FEATURE_VI_8BIT bool "Allow vi to display 8-bit chars (otherwise shows dots)" - default y + default n depends on BUSYBOX_VI help If your terminal can display characters with high bit set, @@ -126,6 +64,13 @@ config BUSYBOX_FEATURE_VI_SEARCH Select this if you wish to be able to do search and replace in busybox vi. +config BUSYBOX_FEATURE_VI_REGEX_SEARCH + bool "Enable regex in search and replace" + default n # Uses GNU regex, which may be unavailable. FIXME + depends on BUSYBOX_FEATURE_VI_SEARCH + help + Use extended regex search. + config BUSYBOX_FEATURE_VI_USE_SIGNALS bool "Catch signals" default y @@ -178,8 +123,8 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL help If terminal size can't be retrieved and $LINES/$COLUMNS are not set, this option makes vi perform a last-ditch effort to find it: - vi positions cursor to 999,999 and asks terminal to report real - cursor position using "ESC [ 6 n" escape sequence, then reads stdin. + position cursor to 999,999 and ask terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then read stdin. This is not clean but helps a lot on serial lines and such. @@ -191,6 +136,68 @@ config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR This will make the cursor movement faster, but requires more memory and it makes the applet a tiny bit larger. +config BUSYBOX_AWK + bool "awk" + default y + help + Awk is used as a pattern scanning and processing language. This is + the BusyBox implementation of that programming language. + +config BUSYBOX_FEATURE_AWK_LIBM + bool "Enable math functions (requires libm)" + default y + depends on BUSYBOX_AWK + help + Enable math functions of the Awk programming language. + NOTE: This will require libm to be present for linking. + +config BUSYBOX_CMP + bool "cmp" + default y + help + cmp is used to compare two files and returns the result + to standard output. + +config BUSYBOX_DIFF + bool "diff" + depends on !ADK_PACKAGE_DIFFUTILS + default n + help + diff compares two files or directories and outputs the + differences between them in a form that can be given to + the patch command. + +config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS + help + Enable use of long options. + +config BUSYBOX_FEATURE_DIFF_DIR + bool "Enable directory support" + default y + depends on BUSYBOX_DIFF + help + This option enables support for directory and subdirectory + comparison. + +config BUSYBOX_ED + bool "ed" + default y + help + The original 1970's Unix text editor, from the days of teletypes. + Small, simple, evil. Part of SUSv3. If you're not already using + this, you don't need it. + +config BUSYBOX_SED + bool "sed" + depends on !ADK_PACKAGE_SED + default y + help + sed is used to perform text transformations on a file + or input from a pipeline. + config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index e60537448..072f01bfc 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -12,14 +13,6 @@ config BUSYBOX_FIND help find is used to search your system to find specified files. -config BUSYBOX_FEATURE_FIND_EMPTY - bool "Enable -empty option matching empty files and directories" - default y - depends on BUSYBOX_FIND - help - Support the 'find -empty' option for searching empty files - and directories. - config BUSYBOX_FEATURE_FIND_PRINT0 bool "Enable -print0: NUL-terminated output" default y @@ -69,11 +62,11 @@ config BUSYBOX_FEATURE_FIND_XDEV This option allows find to restrict searches to a single filesystem. config BUSYBOX_FEATURE_FIND_MAXDEPTH - bool "Enable -maxdepth N" + bool "Enable -mindepth N and -maxdepth N" default y depends on BUSYBOX_FIND help - This option enables -maxdepth N option. + This option enables -mindepth N and -maxdepth N option. config BUSYBOX_FEATURE_FIND_NEWER bool "Enable -newer: compare file modification times" @@ -81,7 +74,7 @@ config BUSYBOX_FEATURE_FIND_NEWER depends on BUSYBOX_FIND help Support the 'find -newer' option for finding any files which have - a modified time that is more recent than the specified FILE. + modification time that is more recent than the specified FILE. config BUSYBOX_FEATURE_FIND_INUM bool "Enable -inum: inode number matching" @@ -90,6 +83,14 @@ config BUSYBOX_FEATURE_FIND_INUM help Support the 'find -inum' option for searching by inode number. +config BUSYBOX_FEATURE_FIND_EMPTY + bool "Enable -empty option matching empty files and directories" + default y + depends on BUSYBOX_FIND + help + Support the 'find -empty' option for searching empty files + and directories. + config BUSYBOX_FEATURE_FIND_EXEC bool "Enable -exec: execute commands" default y @@ -182,11 +183,10 @@ config BUSYBOX_FEATURE_FIND_CONTEXT config BUSYBOX_FEATURE_FIND_LINKS bool "Enable -links: link count matching" - default n + default y depends on BUSYBOX_FIND help Support the 'find -links' option for matching number of links. - config BUSYBOX_GREP bool "grep" depends on !ADK_PACKAGE_GREP @@ -220,7 +220,6 @@ config BUSYBOX_FEATURE_GREP_CONTEXT Print the specified number of leading (-B) and/or trailing (-A) context surrounding our matching lines. Print the specified number of context lines (-C). - config BUSYBOX_XARGS bool "xargs" default y @@ -230,7 +229,7 @@ config BUSYBOX_XARGS config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION bool "Enable -p: prompt and confirmation" - default n + default y depends on BUSYBOX_XARGS help Support -p: prompt the user whether to run each command @@ -238,14 +237,14 @@ config BUSYBOX_FEATURE_XARGS_SUPPORT_CONFIRMATION config BUSYBOX_FEATURE_XARGS_SUPPORT_QUOTES bool "Enable single and double quotes and backslash" - default n + default y depends on BUSYBOX_XARGS help Support quoting in the input. config BUSYBOX_FEATURE_XARGS_SUPPORT_TERMOPT bool "Enable -x: exit if -s or -n is exceeded" - default n + default y depends on BUSYBOX_XARGS help Support -x: exit if the command size (see the -s or -n option) diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in index 3858d14c5..d8b4a449e 100644 --- a/package/busybox/config/init/Config.in +++ b/package/busybox/config/init/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -20,9 +21,9 @@ config BUSYBOX_BOOTCHARTD and stopped using bootchartd stop. config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER - bool "bootchartd" + bool "Compatible, bloated header" default y - depends on BOOTCHARTD + depends on BUSYBOX_BOOTCHARTD help Create extended header file compatible with "big" bootchartd. "Big" bootchartd is a shell script and it dumps some @@ -37,13 +38,37 @@ config BUSYBOX_FEATURE_BOOTCHARTD_BLOATED_HEADER makes bootchartd applet to dump a subset of it. config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE - bool "bootchartd" + bool "Support bootchartd.conf" default y - depends on BOOTCHARTD + depends on BUSYBOX_BOOTCHARTD help Enable reading and parsing of $PWD/bootchartd.conf and /etc/bootchartd.conf files. +config BUSYBOX_HALT + bool "poweroff, halt, and reboot" + default y + help + Stop all processes and either halt, reboot, or power off the system. + +config BUSYBOX_FEATURE_CALL_TELINIT + bool "Call telinit on shutdown and reboot" + default n + depends on BUSYBOX_HALT && !BUSYBOX_INIT + help + Call an external program (normally telinit) to facilitate + a switch to a proper runlevel. + This option is only available if you selected halt and friends, + but did not select init. + +config BUSYBOX_TELINIT_PATH + string "Path to telinit executable" + default "/sbin/telinit" + depends on BUSYBOX_FEATURE_CALL_TELINIT + help + When busybox halt and friends have to call external telinit + to facilitate proper shutdown, this path is to be used when + locating telinit executable. config BUSYBOX_INIT bool "init" default y @@ -64,8 +89,8 @@ config BUSYBOX_FEATURE_KILL_REMOVED depends on BUSYBOX_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. + sent to init, this option will make init kill the processes + that have been removed. config BUSYBOX_FEATURE_KILL_DELAY int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED @@ -126,32 +151,6 @@ config BUSYBOX_FEATURE_INITRD This does not apply to initramfs, which runs /init as PID 1 and requires no special support. -config BUSYBOX_HALT - bool "poweroff, halt, and reboot" - default y - help - Stop all processes and either halt, reboot, or power off the system. - -config BUSYBOX_FEATURE_CALL_TELINIT - bool "Call telinit on shutdown and reboot" - default n - depends on BUSYBOX_HALT && !BUSYBOX_INIT - help - Call an external program (normally telinit) to facilitate - a switch to a proper runlevel. - - This option is only available if you selected halt and friends, - but did not select init. - -config BUSYBOX_TELINIT_PATH - string "Path to telinit executable" - default "/sbin/telinit" - depends on BUSYBOX_FEATURE_CALL_TELINIT - help - When busybox halt and friends have to call external telinit - to facilitate proper shutdown, this path is to be used when - locating telinit executable. - config BUSYBOX_INIT_TERMINAL_TYPE string "Initial terminal type" default "linux" @@ -163,7 +162,6 @@ config BUSYBOX_INIT_TERMINAL_TYPE Note that on Linux, init attempts to detect serial terminal and sets TERM to "vt102" if one is found. - config BUSYBOX_MESG bool "mesg" default n @@ -171,4 +169,16 @@ config BUSYBOX_MESG Mesg controls access to your terminal by others. It is typically used to allow or disallow other users to write to your terminal +config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP + bool "Enable writing to tty only by group, not by everybody" + default y + depends on BUSYBOX_MESG + help + Usually, ttys are owned by group "tty", and "write" tool is + setgid to this group. This way, "mesg y" only needs to enable + "write by owning group" bit in tty mode. + + If you set this option to N, "mesg y" will enable writing + by anybody at all. This is not recommended. + endmenu diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index c42a93bbb..ff06540cc 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,21 @@ menu "Busybox Library Tuning" +config BUSYBOX_FEATURE_SYSTEMD + bool "Enable systemd support" + default n + help + If you plan to use busybox daemons on a system where daemons + are controlled by systemd, enable this option. + If you don't use systemd, it is still safe to enable it, + but the downside is increased code size. +config BUSYBOX_FEATURE_RTMINMAX + bool "Support RTMIN[+n] and RTMAX[-n] signal names" + default y + help + Support RTMIN[+n] and RTMAX[-n] signal names + in kill, killall etc. This costs ~250 bytes. + config BUSYBOX_PASSWORD_MINLEN int "Minimum password length" default 6 @@ -12,9 +28,9 @@ config BUSYBOX_PASSWORD_MINLEN help Minimum allowable password length. -config BUSYBOX_MD5_SIZE_VS_SPEED +config BUSYBOX_MD5_SMALL int "MD5: Trade bytes for speed (0:fast, 3:slow)" - default 2 + default 1 range 0 3 help Trade binary size versus speed for the md5sum algorithm. @@ -28,7 +44,7 @@ config BUSYBOX_MD5_SIZE_VS_SPEED config BUSYBOX_FEATURE_FAST_TOP bool "Faster /proc scanning code (+100 bytes)" - default n + default y help This option makes top (and ps) ~20% faster (or 20% less CPU hungry), but code size is slightly bigger. @@ -41,6 +57,17 @@ config BUSYBOX_FEATURE_ETC_NETWORKS a rarely used feature which allows you to use names instead of IP/mask pairs in route command. +config BUSYBOX_FEATURE_USE_TERMIOS + bool "Use termios to manipulate the screen" + default y + depends on BUSYBOX_MORE || BUSYBOX_TOP || BUSYBOX_POWERTOP + help + This option allows utilities such as 'more' and 'top' to determine + the size of the screen. If you leave this disabled, your utilities + that display things on the screen will be especially primitive and + will be unable to determine the current screen size, and will be + unable to move the cursor. + config BUSYBOX_FEATURE_EDITING bool "Command line editing" default y @@ -67,18 +94,34 @@ config BUSYBOX_FEATURE_EDITING_VI config BUSYBOX_FEATURE_EDITING_HISTORY int "History size" - range 0 99999 - default 64 + # Don't allow way too big values here, code uses fixed "char *history[N]" struct member + range 0 9999 + default 255 depends on BUSYBOX_FEATURE_EDITING help - Specify command history size. + Specify command history size (0 - disable). config BUSYBOX_FEATURE_EDITING_SAVEHISTORY bool "History saving" + default y + depends on BUSYBOX_FEATURE_EDITING + help + Enable history saving in shells. + +config BUSYBOX_FEATURE_EDITING_SAVE_ON_EXIT + bool "Save history on shell exit, not after every command" default n - depends on BUSYBOX_ASH && BUSYBOX_FEATURE_EDITING + depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY + help + Save history on shell exit, not after every command. + +config BUSYBOX_FEATURE_REVERSE_SEARCH + bool "Reverse history search" + default y + depends on BUSYBOX_FEATURE_EDITING_SAVEHISTORY help - Enable history saving in ash shell. + Enable readline-like Ctrl-R combination for reverse history search. + Increases code by about 0.5k. config BUSYBOX_FEATURE_TAB_COMPLETION bool "Tab completion" @@ -96,7 +139,7 @@ config BUSYBOX_FEATURE_USERNAME_COMPLETION config BUSYBOX_FEATURE_EDITING_FANCY_PROMPT bool "Fancy shell prompts" - default n + default y depends on BUSYBOX_FEATURE_EDITING help Setting this option allows for prompts to use things like \w and @@ -122,7 +165,7 @@ config BUSYBOX_FEATURE_NON_POSIX_CP and create a regular file. This does not conform to POSIX, but prevents a symlink attack. Similarly, "cp file device" will not send file's data - to the device. + to the device. (To do that, use "cat file >device") config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE bool "Give more precise messages when copy fails (cp, mv etc)" @@ -143,15 +186,34 @@ config BUSYBOX_FEATURE_COPYBUF_KB range 1 1024 default 4 help - Size of buffer used by cp, mv, install etc. + Size of buffer used by cp, mv, install, wget etc. Buffers which are 4 kb or less will be allocated on stack. Bigger buffers will be allocated with mmap, with fallback to 4 kb stack buffer if mmap fails. +config BUSYBOX_FEATURE_SKIP_ROOTFS + bool "Skip rootfs in mount table" + default y + help + Ignore rootfs entry in mount table. + + In Linux, kernel has a special filesystem, rootfs, which is initially + mounted on /. It contains initramfs data, if kernel is configured + to have one. Usually, another file system is mounted over / early + in boot process, and therefore most tools which manipulate + mount table, such as df, will skip rootfs entry. + + However, some systems do not mount anything on /. + If you need to configure busybox for one of these systems, + you may find it useful to turn this option off to make df show + initramfs statistics. + + Otherwise, choose Y. + config BUSYBOX_MONOTONIC_SYSCALL bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring time intervals (time, ping, traceroute etc need this). diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in index ab0e578d8..1c36631f9 100644 --- a/package/busybox/config/loginutils/Config.in +++ b/package/busybox/config/loginutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -7,13 +8,13 @@ menu "Login/Password Management Utilities" config BUSYBOX_ADD_SHELL bool "add-shell" - default y if BUSYBOX_DESKTOP + default y if DESKTOP help Add shells to /etc/shells. config BUSYBOX_REMOVE_SHELL bool "remove-shell" - default y if BUSYBOX_DESKTOP + default y if DESKTOP help Remove shells from /etc/shells. @@ -93,7 +94,7 @@ config BUSYBOX_USE_BB_CRYPT config BUSYBOX_USE_BB_CRYPT_SHA bool "Enable SHA256/512 crypt functions" - default n + default y depends on BUSYBOX_USE_BB_CRYPT help Enable this if you have passwords starting with "$5$" or "$6$" @@ -103,41 +104,18 @@ config BUSYBOX_USE_BB_CRYPT_SHA With this option off, login will fail password check for any user which has password encrypted with these algorithms. -config BUSYBOX_ADDGROUP - bool "addgroup" +config BUSYBOX_ADDUSER + bool "adduser" default y help - Utility for creating a new group account. + Utility for creating a new user account. -config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS +config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" - default n - depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS - help - Support long options for the addgroup applet. - -config BUSYBOX_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" - default n - depends on BUSYBOX_ADDGROUP - help - If called with two non-option arguments, - addgroup will add an existing user to an - existing group. - -config BUSYBOX_DELGROUP - bool "delgroup" default y + depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS help - Utility for deleting a group account. - -config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups" - default n - depends on BUSYBOX_DELGROUP - help - If called with two non-option arguments, deluser - or delgroup will remove an user from a specified group. + Support long options for the adduser applet. config BUSYBOX_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" @@ -151,19 +129,6 @@ config BUSYBOX_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. -config BUSYBOX_ADDUSER - bool "adduser" - default y - help - Utility for creating a new user account. - -config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS - help - Support long options for the adduser applet. - config BUSYBOX_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP @@ -180,39 +145,70 @@ config BUSYBOX_LAST_SYSTEM_ID help Last valid system uid or gid for adduser and addgroup +config BUSYBOX_ADDGROUP + bool "addgroup" + default y + help + Utility for creating a new group account. + +config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS + help + Support long options for the addgroup applet. + +config BUSYBOX_FEATURE_ADDUSER_TO_GROUP + bool "Support for adding users to groups" + default y + depends on BUSYBOX_ADDGROUP + help + If called with two non-option arguments, + addgroup will add an existing user to an + existing group. + config BUSYBOX_DELUSER bool "deluser" default y help Utility for deleting a user account. +config BUSYBOX_DELGROUP + bool "delgroup" + default y + help + Utility for deleting a group account. + +config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP + bool "Support for removing users from groups" + default y + depends on BUSYBOX_DELGROUP + help + If called with two non-option arguments, deluser + or delgroup will remove an user from a specified group. + config BUSYBOX_GETTY bool "getty" default y select BUSYBOX_FEATURE_SYSLOG help - getty lets you log in on a tty, it is normally invoked by init. + getty lets you log in on a tty. It is normally invoked by init. -config BUSYBOX_FEATURE_UTMP - bool "Support utmp file" - depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_WHO - default n - help - The file /var/run/utmp is used to track who is currently logged in. + Note that you can save a few bytes by disabling it and + using login applet directly. + If you need to reset tty attributes before calling login, + this script approximates getty: -config BUSYBOX_FEATURE_WTMP - bool "Support wtmp file" - depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_LAST - default n - select BUSYBOX_FEATURE_UTMP - help - The file /var/run/wtmp is used to track when user's have logged into - and logged out of the system. + exec </dev/$1 >/dev/$1 2>&1 || BUSYBOX_exit 1 + reset + stty sane; stty ispeed 38400; stty ospeed 38400 + printf "%s login: " "`hostname`" + read -r login + exec /bin/login "$login" config BUSYBOX_LOGIN bool "login" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help login is used when signing onto a system. @@ -220,8 +216,20 @@ config BUSYBOX_LOGIN Note that Busybox binary must be setuid root for this applet to work properly. +config BUSYBOX_LOGIN_SESSION_AS_CHILD + bool "Run logged in session in a child process" + default y if PAM + depends on BUSYBOX_LOGIN + help + Run the logged in session in a child process. This allows + login to clean up things such as utmp entries or PAM sessions + when the login session is complete. If you use PAM, you + almost always would want this to be set to Y, else PAM session + will not be cleaned up. + config BUSYBOX_PAM bool "Support for PAM (Pluggable Authentication Modules)" + depends on !ADK_PACKAGE_PAM default n depends on BUSYBOX_LOGIN help @@ -245,7 +253,7 @@ config BUSYBOX_FEATURE_NOLOGIN config BUSYBOX_FEATURE_SECURETTY bool "Support for /etc/securetty" - default y + default n depends on BUSYBOX_LOGIN help The file /etc/securetty is used by (some versions of) login(1). @@ -255,7 +263,6 @@ config BUSYBOX_FEATURE_SECURETTY config BUSYBOX_PASSWD bool "passwd" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help passwd changes passwords for user and group accounts. A normal user @@ -288,10 +295,16 @@ config BUSYBOX_CHPASSWD Reads a file of user name and password pairs from standard input and uses this information to update a group of existing users. +config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO + string "Default password encryption method (passwd -a, cryptpw -m parameter)" + default "des" + depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW + help + Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". + config BUSYBOX_SU bool "su" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help su is used to become another user during a login session. @@ -321,7 +334,6 @@ config BUSYBOX_SULOGIN config BUSYBOX_VLOCK bool "vlock" default n - select BUSYBOX_FEATURE_SUID help Build the "vlock" applet which allows you to lock (virtual) terminals. diff --git a/package/busybox/config/mailutils/Config.in b/package/busybox/config/mailutils/Config.in index dfcc2b57d..263f80dd7 100644 --- a/package/busybox/config/mailutils/Config.in +++ b/package/busybox/config/mailutils/Config.in @@ -1,5 +1,7 @@ +# DO NOT EDIT. This file is generated from Config.src menu "Mail Utilities" + config BUSYBOX_MAKEMIME bool "makemime" default n @@ -22,7 +24,7 @@ config BUSYBOX_POPMAILDIR config BUSYBOX_FEATURE_POPMAILDIR_DELIVERY bool "Allow message filters and custom delivery program" - default n + default y depends on BUSYBOX_POPMAILDIR help Allow to use a custom program to filter the content diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 750d818ce..2e8404f0f 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -8,84 +9,153 @@ menu "Miscellaneous Utilities" config BUSYBOX_CONSPY bool "conspy" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help A text-mode VNC like program for Linux virtual terminals. example: conspy NUM shared access to console num or conspy -nd NUM screenshot of console num or conspy -cs NUM poor man's GNU screen like +config BUSYBOX_LESS + bool "less" + depends on !ADK_PACKAGE_LESS + default y + help + 'less' is a pager, meaning that it displays text files. It possesses + a wide array of features, and is an improvement over 'more'. + +config BUSYBOX_FEATURE_LESS_MAXLINES + int "Max number of input lines less will try to eat" + default 9999999 + depends on BUSYBOX_LESS + +config BUSYBOX_FEATURE_LESS_BRACKETS + bool "Enable bracket searching" + default y + depends on BUSYBOX_LESS + help + This option adds the capability to search for matching left and right + brackets, facilitating programming. + +config BUSYBOX_FEATURE_LESS_FLAGS + bool "Enable -m/-M" + default y + depends on BUSYBOX_LESS + help + The -M/-m flag enables a more sophisticated status line. + +config BUSYBOX_FEATURE_LESS_MARKS + bool "Enable marks" + default y + depends on BUSYBOX_LESS + help + Marks enable positions in a file to be stored for easy reference. + +config BUSYBOX_FEATURE_LESS_REGEXP + bool "Enable regular expressions" + default y + depends on BUSYBOX_LESS + help + Enable regular expressions, allowing complex file searches. + +config BUSYBOX_FEATURE_LESS_WINCH + bool "Enable automatic resizing on window size changes" + default y + depends on BUSYBOX_LESS + help + Makes less track window size changes. + +config BUSYBOX_FEATURE_LESS_ASK_TERMINAL + bool "Use 'tell me cursor position' ESC sequence to measure window" + default y + depends on BUSYBOX_FEATURE_LESS_WINCH + help + Makes less track window size changes. + If terminal size can't be retrieved and $LINES/$COLUMNS are not set, + this option makes less perform a last-ditch effort to find it: + position cursor to 999,999 and ask terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then read stdin. + + This is not clean but helps a lot on serial lines and such. +config BUSYBOX_FEATURE_LESS_DASHCMD + bool "Enable flag changes ('-' command)" + default y + depends on BUSYBOX_LESS + help + This enables the ability to change command-line flags within + less itself ('-' keyboard command). + +config BUSYBOX_FEATURE_LESS_LINENUMS + bool "Enable dynamic switching of line numbers" + default y + depends on BUSYBOX_FEATURE_LESS_DASHCMD + help + Enables "-N" command. config BUSYBOX_NANDWRITE bool "nandwrite" default n - depends on BUSYBOX_PLATFORM_LINUX - depends on !ADK_PACKAGE_NAND - default y if ADK_TARGET_WITH_NAND + select BUSYBOX_PLATFORM_LINUX help Write to the specified MTD device, with bad blocks awareness config BUSYBOX_NANDDUMP bool "nanddump" default n - depends on BUSYBOX_PLATFORM_LINUX - depends on !ADK_PACKAGE_NAND - default y if ADK_TARGET_WITH_NAND + select BUSYBOX_PLATFORM_LINUX help Dump the content of raw NAND chip - config BUSYBOX_SETSERIAL bool "setserial" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Retrieve or set Linux serial port. - config BUSYBOX_UBIATTACH bool "ubiattach" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Attach MTD device to an UBI device. config BUSYBOX_UBIDETACH bool "ubidetach" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Detach MTD device from an UBI device. config BUSYBOX_UBIMKVOL bool "ubimkvol" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Create a UBI volume. config BUSYBOX_UBIRMVOL bool "ubirmvol" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Delete a UBI volume. config BUSYBOX_UBIRSVOL bool "ubirsvol" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Resize a UBI volume. config BUSYBOX_UBIUPDATEVOL bool "ubiupdatevol" default n - select PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Update a UBI volume. config BUSYBOX_ADJTIMEX bool "adjtimex" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. @@ -114,7 +184,7 @@ config BUSYBOX_FEATURE_COMPRESS_BBCONFIG config BUSYBOX_BEEP bool "beep" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The beep applets beeps in a given freq/Hz. @@ -170,7 +240,7 @@ config BUSYBOX_FEATURE_CHAT_IMPLICIT_CR config BUSYBOX_FEATURE_CHAT_SWALLOW_OPTS bool "Swallow options" depends on BUSYBOX_CHAT - default n + default y 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 @@ -179,7 +249,7 @@ config BUSYBOX_FEATURE_CHAT_SWALLOW_OPTS config BUSYBOX_FEATURE_CHAT_SEND_ESCAPES bool "Support weird SEND escapes" depends on BUSYBOX_CHAT - default n + default y help Original chat uses some escape sequences in SEND arguments which are not sent to device but rather performs special actions. @@ -190,14 +260,14 @@ config BUSYBOX_FEATURE_CHAT_SEND_ESCAPES config BUSYBOX_FEATURE_CHAT_VAR_ABORT_LEN bool "Support variable-length ABORT conditions" depends on BUSYBOX_CHAT - default n + default y help Original chat uses fixed 50-bytes length ABORT conditions. Say N here. config BUSYBOX_FEATURE_CHAT_CLR_ABORT bool "Support revoking of ABORT conditions" depends on BUSYBOX_CHAT - default n + default y help Support CLR_ABORT directive. @@ -210,8 +280,7 @@ config BUSYBOX_CHRT config BUSYBOX_CROND bool "crond" - default n - select BUSYBOX_FEATURE_SUID + default y select BUSYBOX_FEATURE_SYSLOG help Crond is a background daemon that parses individual crontab @@ -225,13 +294,13 @@ config BUSYBOX_CROND config BUSYBOX_FEATURE_CROND_D bool "Support option -d to redirect output to stderr" depends on BUSYBOX_CROND - default n + default y help -d sets loglevel to 0 (most verbose) and directs all output to stderr. config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL bool "Report command output via email (using sendmail)" - default n + default y depends on BUSYBOX_CROND help Command output will be sent to corresponding user via email. @@ -245,8 +314,7 @@ config BUSYBOX_FEATURE_CROND_DIR config BUSYBOX_CRONTAB bool "crontab" - default n - select BUSYBOX_FEATURE_SUID + default y help Crontab manipulates the crontab for a particular user. Only the superuser may specify a different user and/or crontab directory. @@ -262,7 +330,7 @@ config BUSYBOX_DC config BUSYBOX_FEATURE_DC_LIBM bool "Enable power and exp functions (requires libm)" - default n + default y depends on BUSYBOX_DC help Enable power and exp functions. @@ -271,7 +339,7 @@ config BUSYBOX_FEATURE_DC_LIBM config BUSYBOX_DEVFSD bool "devfsd (obsolete)" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help This is deprecated and should NOT be used anymore. @@ -290,7 +358,7 @@ config BUSYBOX_DEVFSD config BUSYBOX_DEVFSD_MODLOAD bool "Adds support for MODLOAD keyword in devsfd.conf" - default n + default y depends on BUSYBOX_DEVFSD help This actually doesn't work with busybox modutils but needs @@ -298,7 +366,7 @@ config BUSYBOX_DEVFSD_MODLOAD config BUSYBOX_DEVFSD_FG_NP bool "Enables the -fg and -np options" - default n + default y depends on BUSYBOX_DEVFSD help -fg Run the daemon in the foreground. @@ -307,7 +375,7 @@ config BUSYBOX_DEVFSD_FG_NP config BUSYBOX_DEVFSD_VERBOSE bool "Increases logging (and size)" - default n + default y depends on BUSYBOX_DEVFSD help Increases logging to stderr or syslog. @@ -315,7 +383,7 @@ config BUSYBOX_DEVFSD_VERBOSE config BUSYBOX_FEATURE_DEVFS bool "Use devfs names for all devices (obsolete)" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help This is obsolete and should NOT be used anymore. Use linux >= 2.6 (optionally with hotplug) and mdev instead! @@ -335,13 +403,13 @@ config BUSYBOX_DEVMEM config BUSYBOX_EJECT bool "eject" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Used to eject cdroms. (defaults to /dev/cdrom) config BUSYBOX_FEATURE_EJECT_SCSI bool "SCSI support" - default n + default y depends on BUSYBOX_EJECT help Add the -s option to eject, this allows to eject SCSI-Devices and @@ -350,7 +418,7 @@ config BUSYBOX_FEATURE_EJECT_SCSI config BUSYBOX_FBSPLASH bool "fbsplash" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Shows splash image and progress bar on framebuffer device. Can be used during boot phase of an embedded device. ~2kb. @@ -364,35 +432,35 @@ config BUSYBOX_FBSPLASH -i path_to_cfg_file (can be "-" for stdin) -f path_to_fifo (can be "-" for stdin) - if you want to run it only in presence of kernel parameter: - grep -q "fbsplash=on" </proc/cmdline && setsid fbsplash [params] & + grep -q "fbsplash=on" </proc/cmdline && BUSYBOX_setsid fbsplash [params] & - commands for fifo: "NN" (ASCII decimal number) - percentage to show on progress bar "exit" - well you guessed it config BUSYBOX_FLASHCP bool "flashcp" - default n + default n # doesn't build on Ubuntu 8.04 help The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. This utility is used to copy images into a MTD device. config BUSYBOX_FLASH_LOCK bool "flash_lock" - default n + default n # doesn't build on Ubuntu 8.04 help The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This utility locks part or all of the flash device. config BUSYBOX_FLASH_UNLOCK bool "flash_unlock" - default n + default n # doesn't build on Ubuntu 8.04 help The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This utility unlocks part or all of the flash device. config BUSYBOX_FLASH_ERASEALL bool "flash_eraseall" - default n + default n # doesn't build on Ubuntu 8.04 help The flash_eraseall binary from mtd-utils as of git head c4c6a59eb. This utility is used to erase the whole MTD device. @@ -400,29 +468,29 @@ config BUSYBOX_FLASH_ERASEALL config BUSYBOX_IONICE bool "ionice" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Set/set program io scheduling class and priority Requires kernel >= 2.6.13 config BUSYBOX_INOTIFYD bool "inotifyd" - default n + default n # doesn't build on Knoppix 5 help Simple inotify daemon. Reports filesystem changes. Requires kernel >= 2.6.13 config BUSYBOX_LAST bool "last" - default n - select BUSYBOX_FEATURE_WTMP + default y + depends on BUSYBOX_FEATURE_WTMP help 'last' displays a list of the last users that logged into the system. choice prompt "Choose last implementation" depends on BUSYBOX_LAST - default BUSYBOX_FEATURE_LAST_SMALL + default FEATURE_LAST_FANCY config BUSYBOX_FEATURE_LAST_SMALL bool "small" @@ -437,78 +505,11 @@ config BUSYBOX_FEATURE_LAST_FANCY logged into the system (mimics sysvinit last). +900 bytes. endchoice -config BUSYBOX_LESS - bool "less" - depends on !ADK_PACKAGE_LESS - default y - help - 'less' is a pager, meaning that it displays text files. It possesses - a wide array of features, and is an improvement over 'more'. - -config BUSYBOX_FEATURE_LESS_MAXLINES - int "Max number of input lines less will try to eat" - default 9999999 - depends on BUSYBOX_LESS - -config BUSYBOX_FEATURE_LESS_BRACKETS - bool "Enable bracket searching" - default y - depends on BUSYBOX_LESS - help - This option adds the capability to search for matching left and right - brackets, facilitating programming. - -config BUSYBOX_FEATURE_LESS_FLAGS - bool "Enable extra flags" - default y - depends on BUSYBOX_LESS - help - The extra flags provided do the following: - - The -M flag enables a more sophisticated status line. - The -m flag enables a simpler status line with a percentage. - -config BUSYBOX_FEATURE_LESS_MARKS - bool "Enable marks" - default n - depends on BUSYBOX_LESS - help - Marks enable positions in a file to be stored for easy reference. - -config BUSYBOX_FEATURE_LESS_REGEXP - bool "Enable regular expressions" - default n - depends on BUSYBOX_LESS - help - Enable regular expressions, allowing complex file searches. - -config BUSYBOX_FEATURE_LESS_WINCH - bool "Enable automatic resizing on window size changes" - default n - depends on BUSYBOX_LESS - help - Makes less track window size changes. - -config BUSYBOX_FEATURE_LESS_DASHCMD - bool "Enable flag changes ('-' command)" - default n - depends on BUSYBOX_LESS - help - This enables the ability to change command-line flags within - less itself ('-' keyboard command). - -config BUSYBOX_FEATURE_LESS_LINENUMS - bool "Enable dynamic switching of line numbers" - default n - depends on BUSYBOX_FEATURE_LESS_DASHCMD - help - Enable "-N" command. - config BUSYBOX_HDPARM bool "hdparm" - depends on !ADK_PACKAGE_HDPARM default n - depends on BUSYBOX_PLATFORM_LINUX + depends on !ADK_PACKAGE_HDPARM + select BUSYBOX_PLATFORM_LINUX help Get/Set hard drive parameters. Primarily intended for ATA drives. Adds about 13k (or around 30k if you enable the @@ -526,7 +527,7 @@ config BUSYBOX_FEATURE_HDPARM_GET_IDENTITY config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF bool "Register an IDE interface (DANGEROUS)" - default n + default y depends on BUSYBOX_HDPARM help Enables the 'hdparm -R' option to register an IDE interface. @@ -534,7 +535,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_SCAN_HWIF config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF bool "Un-register an IDE interface (DANGEROUS)" - default n + default y depends on BUSYBOX_HDPARM help Enables the 'hdparm -U' option to un-register an IDE interface. @@ -542,7 +543,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET bool "Perform device reset (DANGEROUS)" - default n + default y depends on BUSYBOX_HDPARM help Enables the 'hdparm -w' option to perform a device reset. @@ -550,7 +551,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_DRIVE_RESET config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF bool "Tristate device for hotswap (DANGEROUS)" - default n + default y depends on BUSYBOX_HDPARM help Enables the 'hdparm -x' option to tristate device for hotswap, @@ -559,7 +560,7 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF config BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA bool "Get/set using_dma flag" - default n + default y depends on BUSYBOX_HDPARM help Enables the 'hdparm -d' option to get/set using_dma flag. @@ -625,7 +626,7 @@ config BUSYBOX_MT config BUSYBOX_RAIDAUTORUN bool "raidautorun" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help raidautorun tells the kernel md driver to search and start RAID arrays. @@ -633,7 +634,8 @@ config BUSYBOX_RAIDAUTORUN config BUSYBOX_READAHEAD bool "readahead" default n - depends on BUSYBOX_LFS && BUSYBOX_PLATFORM_LINUX + depends on BUSYBOX_LFS + select BUSYBOX_PLATFORM_LINUX help Preload the files listed on the command line into RAM cache so that subsequent reads on these files will not block on disk I/O. @@ -650,7 +652,7 @@ config BUSYBOX_READAHEAD config BUSYBOX_RFKILL bool "rfkill" default y # doesn't build on Ubuntu 9.04 - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Enable/disable wireless devices. @@ -662,6 +664,7 @@ config BUSYBOX_RFKILL config BUSYBOX_RUNLEVEL bool "runlevel" default n + depends on BUSYBOX_FEATURE_UTMP help find the current and previous system runlevel. @@ -671,6 +674,7 @@ config BUSYBOX_RUNLEVEL config BUSYBOX_RX bool "rx" default n + select BUSYBOX_PLATFORM_LINUX help Receive files using the Xmodem protocol. @@ -682,14 +686,14 @@ config BUSYBOX_SETSID config BUSYBOX_STRINGS bool "strings" - default n + default y help strings prints the printable character sequences for each file specified. config BUSYBOX_TASKSET bool "taskset" - default n + default n # doesn't build on some non-x86 targets (m68k) help Retrieve or set a processes's CPU affinity. This requires sched_{g,s}etaffinity support in your libc. @@ -735,15 +739,16 @@ config BUSYBOX_VOLNAME config BUSYBOX_WALL bool "wall" - default n + default y + depends on BUSYBOX_FEATURE_UTMP help Write a message to all users that are logged in. config BUSYBOX_WATCHDOG bool "watchdog" + default n depends on !ADK_PACKAGE_WATCHDOG - default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in index 31ffe8156..3535c8e87 100644 --- a/package/busybox/config/modutils/Config.in +++ b/package/busybox/config/modutils/Config.in @@ -1,20 +1,22 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. # menu "Linux Module Utilities" -depends on BUSYBOX_PLATFORM_LINUX config BUSYBOX_MODINFO bool "modinfo" default y + select BUSYBOX_PLATFORM_LINUX help Show information about a Linux Kernel module config BUSYBOX_MODPROBE_SMALL bool "Simplified modutils" default n + select BUSYBOX_PLATFORM_LINUX help Simplified modutils. @@ -47,14 +49,15 @@ config BUSYBOX_MODPROBE_SMALL config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE bool "Accept module options on modprobe command line" - default n + default y depends on BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help Allow insmod and modprobe take module options from command line. config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED bool "Skip loading of already loaded modules" - default n + default y depends on BUSYBOX_MODPROBE_SMALL help Check if the module is already loaded. @@ -63,6 +66,7 @@ config BUSYBOX_INSMOD bool "insmod" default y depends on !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help insmod is used to load specified modules in the running kernel. @@ -70,6 +74,7 @@ config BUSYBOX_RMMOD bool "rmmod" default y depends on !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help rmmod is used to unload specified modules from the kernel. @@ -77,6 +82,7 @@ config BUSYBOX_LSMOD bool "lsmod" default y depends on !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help lsmod is used to display a list of loaded modules. @@ -84,6 +90,7 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT bool "Pretty output" default n depends on BUSYBOX_LSMOD + select BUSYBOX_PLATFORM_LINUX help This option makes output format of lsmod adjusted to the format of module-init-tools for Linux kernel 2.6. @@ -93,6 +100,7 @@ config BUSYBOX_MODPROBE bool "modprobe" default n depends on !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help Handle the loading of modules, and their dependencies on a high level. @@ -101,6 +109,7 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST bool "Blacklist support" default n depends on BUSYBOX_MODPROBE + select BUSYBOX_PLATFORM_LINUX help Say 'y' here to enable support for the 'blacklist' command in modprobe.conf. This prevents the alias resolver to resolve @@ -112,6 +121,7 @@ config BUSYBOX_DEPMOD bool "depmod" default n depends on !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help depmod generates modules.dep (and potentially modules.alias and modules.symbols) that contain dependency information @@ -123,6 +133,7 @@ config BUSYBOX_FEATURE_2_4_MODULES bool "Support version 2.2/2.4 Linux kernels" default n depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD + select BUSYBOX_PLATFORM_LINUX help Support module loading for 2.2.x and 2.4.x Linux kernels. This increases size considerably. Say N unless you plan @@ -132,6 +143,7 @@ config BUSYBOX_FEATURE_INSMOD_TRY_MMAP bool "Try to load module from a mmap'ed area" default n depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help This option causes module loading code to try to mmap module first. If it does not work (for example, @@ -148,6 +160,7 @@ config BUSYBOX_FEATURE_INSMOD_VERSION_CHECKING bool "Enable module version checking" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + select BUSYBOX_PLATFORM_LINUX help Support checking of versions for modules. This is used to ensure that the kernel and module are made for each other. @@ -156,6 +169,7 @@ config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + select BUSYBOX_PLATFORM_LINUX help By adding module symbols to the kernel symbol table, Oops messages occuring within kernel modules can be properly debugged. By enabling @@ -167,6 +181,7 @@ config BUSYBOX_FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) + select BUSYBOX_PLATFORM_LINUX help This is a special uClinux only memory optimization that lets insmod load the specified kernel module directly into kernel space, reducing @@ -177,6 +192,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP bool "Enable insmod load map (-m) option" default n depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD + select BUSYBOX_PLATFORM_LINUX help Enabling this, one would be able to get a load map output on stdout. This makes kernel module debugging @@ -188,6 +204,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default y depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help Without this option, -m will only output section load map. With this option, -m will also output @@ -197,6 +214,7 @@ config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL + select BUSYBOX_PLATFORM_LINUX help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your @@ -207,6 +225,7 @@ config BUSYBOX_FEATURE_MODUTILS_ALIAS bool "Support for module.aliases file" default y depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE + select BUSYBOX_PLATFORM_LINUX help Generate and parse modules.alias containing aliases for bus identifiers: @@ -223,6 +242,7 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS bool "Support for module.symbols file" default y depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE + select BUSYBOX_PLATFORM_LINUX help Generate and parse modules.symbols containing aliases for symbol_request() kernel calls, such as: @@ -233,7 +253,7 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS config BUSYBOX_DEFAULT_MODULES_DIR string "Default directory containing modules" default "/lib/modules" - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO help Directory that contains kernel modules. Defaults to "/lib/modules" @@ -241,7 +261,7 @@ config BUSYBOX_DEFAULT_MODULES_DIR config BUSYBOX_DEFAULT_DEPMOD_FILE string "Default name of modules.dep" default "modules.dep" - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL || BUSYBOX_MODINFO help Filename that contains kernel modules dependencies. Defaults to "modules.dep" diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index f00b23ee9..18355025f 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,100 @@ menu "Networking Utilities" +config BUSYBOX_NAMEIF + bool "nameif" + default y + select BUSYBOX_PLATFORM_LINUX + select BUSYBOX_FEATURE_SYSLOG + help + nameif is used to rename network interface by its MAC address. + Renamed interfaces MUST be in the down state. + It is possible to use a file (default: /etc/mactab) + with list of new interface names and MACs. + Maximum interface name length: IFNAMSIZ = 16 + File fields are separated by space or tab. + File format: + # Comment + new_interface_name XX:XX:XX:XX:XX:XX + +config BUSYBOX_FEATURE_NAMEIF_EXTENDED + bool "Extended nameif" + default y + depends on BUSYBOX_NAMEIF + help + This extends the nameif syntax to support the bus_info, driver, + phyaddr selectors. The syntax is compatible to the normal nameif. + File format: + new_interface_name driver=asix bus=usb-0000:00:08.2-3 + new_interface_name bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 + new_interface_name phy_address=2 00:80:C8:38:91:B5 + new_interface_name mac=00:80:C8:38:91:B5 + new_interface_name 00:80:C8:38:91:B5 +config BUSYBOX_NBDCLIENT + bool "nbd-client" + default n + help + Network block device client +config BUSYBOX_NC + bool "nc" + default y + help + A simple Unix utility which reads and writes data across network + connections. + +config BUSYBOX_NC_SERVER + bool "Netcat server options (-l)" + default y + depends on BUSYBOX_NC + help + Allow netcat to act as a server. + +config BUSYBOX_NC_EXTRA + bool "Netcat extensions (-eiw and filename)" + default y + depends on BUSYBOX_NC + help + Add -e (support for executing the rest of the command line after + making or receiving a successful connection), -i (delay interval for + lines sent), -w (timeout for initial connection). + +config BUSYBOX_NC_110_COMPAT + bool "Netcat 1.10 compatibility (+2.5k)" + default n # off specially for Rob + depends on BUSYBOX_NC + help + This option makes nc closely follow original nc-1.10. + The code is about 2.5k bigger. It enables + -s ADDR, -n, -u, -v, -o FILE, -z options, but loses + busybox-specific extensions: -f FILE and -ll. +config BUSYBOX_PING + bool "ping" + default y + select BUSYBOX_PLATFORM_LINUX + help + ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to + elicit an ICMP ECHO_RESPONSE from a host or gateway. + +config BUSYBOX_PING6 + bool "ping6" + default y + depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING + help + This will give you a ping that can talk IPv6. + +config BUSYBOX_FEATURE_FANCY_PING + bool "Enable fancy ping output" + default y + depends on BUSYBOX_PING + help + Make the output from the ping applet include statistics, and at the + same time provide full support for ICMP packets. +config BUSYBOX_WHOIS + bool "whois" + default y + help + whois is a client for the whois directory service + config BUSYBOX_FEATURE_IPV6 bool "Enable IPv6 support" default y @@ -49,14 +144,14 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS config BUSYBOX_ARP bool "arp" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Manipulate the system ARP cache. config BUSYBOX_ARPING bool "arping" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help Ping hosts by ARP packets. @@ -64,14 +159,14 @@ config BUSYBOX_BRCTL bool "brctl" depends on !ADK_PACKAGE_BRIDGE_UTILS default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Manage ethernet bridges. Supports addbr/delbr and addif/delif. config BUSYBOX_FEATURE_BRCTL_FANCY bool "Fancy options" - default n + default y depends on BUSYBOX_BRCTL help Add support for extended option like: @@ -82,7 +177,7 @@ config BUSYBOX_FEATURE_BRCTL_FANCY config BUSYBOX_FEATURE_BRCTL_SHOW bool "Support show, showmac and showstp" - default n + default y depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY help Add support for option which prints the current config: @@ -98,7 +193,7 @@ config BUSYBOX_ETHER_WAKE bool "ether-wake" depends on !ADK_PACKAGE_ETHER_WAKE default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. @@ -148,7 +243,7 @@ config BUSYBOX_FTPPUT config BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS bool "Enable long options in ftpget/ftpput" - default n + default y depends on BUSYBOX_LONG_OPTS && (BUSYBOX_FTPGET || BUSYBOX_FTPPUT) help Support long options for the ftpget/ftpput applet. @@ -167,7 +262,7 @@ config BUSYBOX_HTTPD config BUSYBOX_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" - default n + default y depends on BUSYBOX_HTTPD help Makes httpd emit "Accept-Ranges: bytes" header and understand @@ -176,7 +271,7 @@ config BUSYBOX_FEATURE_HTTPD_RANGES config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE bool "Use sendfile system call" - default n + default y depends on BUSYBOX_HTTPD help When enabled, httpd will use the kernel sendfile() function @@ -184,7 +279,7 @@ config BUSYBOX_FEATURE_HTTPD_USE_SENDFILE config BUSYBOX_FEATURE_HTTPD_SETUID bool "Enable -u <user> option" - default n + default y depends on BUSYBOX_HTTPD help This option allows the server to run as a specific user @@ -199,14 +294,22 @@ config BUSYBOX_FEATURE_HTTPD_BASIC_AUTH help Utilizes password settings from /etc/httpd.conf for basic authentication on a per url basis. + Example for httpd.conf file: + /adm:toor:PaSsWd config BUSYBOX_FEATURE_HTTPD_AUTH_MD5 bool "Support MD5 crypted passwords for http Authentication" - default n + default y depends on BUSYBOX_FEATURE_HTTPD_BASIC_AUTH help - Enables basic per URL authentication from /etc/httpd.conf - using md5 passwords. + Enables encrypted passwords, and wildcard user/passwords + in httpd.conf file. + User '*' means 'any system user name is ok', + password of '*' means 'use system password for this user' + Examples: + /adm:toor:$1$P/eKnWXS$aI1aPGxT.dJD5SzqAKWrF0 + /adm:root:* + /wiki:*:* config BUSYBOX_FEATURE_HTTPD_CGI bool "Support Common Gateway Interface (CGI)" @@ -218,18 +321,18 @@ config BUSYBOX_FEATURE_HTTPD_CGI config BUSYBOX_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR bool "Support for running scripts through an interpreter" - default n + default y depends on BUSYBOX_FEATURE_HTTPD_CGI help This option enables support for running scripts through an interpreter. Turn this on if you want PHP scripts to work - properly. You need to supply an additional line in your httpd - config file: + properly. You need to supply an additional line in your + httpd.conf file: *.php:/path/to/your/php config BUSYBOX_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV bool "Set REMOTE_PORT environment variable for CGI" - default n + default y depends on BUSYBOX_FEATURE_HTTPD_CGI help Use of this option can assist scripts in generating @@ -247,7 +350,7 @@ config BUSYBOX_FEATURE_HTTPD_ENCODE_URL_STR config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES bool "Support for custom error pages" - default n + default y depends on BUSYBOX_HTTPD help This option allows you to define custom error pages in @@ -260,7 +363,7 @@ config BUSYBOX_FEATURE_HTTPD_ERROR_PAGES config BUSYBOX_FEATURE_HTTPD_PROXY bool "Support for reverse proxy" - default n + default y depends on BUSYBOX_HTTPD help This option allows you to define URLs that will be forwarded @@ -281,7 +384,7 @@ config BUSYBOX_FEATURE_HTTPD_GZIP config BUSYBOX_IFCONFIG bool "ifconfig" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Ifconfig is used to configure the kernel-resident network interfaces. @@ -329,7 +432,7 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS config BUSYBOX_IFENSLAVE bool "ifenslave" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Userspace application to bind several interfaces to a logical interface (use with kernel bonding driver). @@ -337,7 +440,7 @@ config BUSYBOX_IFENSLAVE config BUSYBOX_IFPLUGD bool "ifplugd" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Network interface plug detection daemon. @@ -379,7 +482,8 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y - depends on BUSYBOX_FEATURE_IFUPDOWN_IP && BUSYBOX_PLATFORM_LINUX + depends on BUSYBOX_FEATURE_IFUPDOWN_IP + select BUSYBOX_PLATFORM_LINUX select BUSYBOX_IP select BUSYBOX_FEATURE_IP_ADDRESS select BUSYBOX_FEATURE_IP_LINK @@ -421,7 +525,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV6 ### UNUSED ###config FEATURE_IFUPDOWN_IPX ### bool "Support for IPX" -### default n +### default y ### depends on BUSYBOX_IFUPDOWN ### help ### If this option is selected you can use busybox to work with IPX @@ -429,7 +533,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV6 config BUSYBOX_FEATURE_IFUPDOWN_MAPPING bool "Enable mapping support" - default n + default y depends on BUSYBOX_IFUPDOWN help This enables support for the "mapping" stanza, unless you have @@ -437,7 +541,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP bool "Support for external dhcp clients" - default y + default n depends on BUSYBOX_IFUPDOWN help This enables support for the external dhcp clients. Clients are @@ -447,7 +551,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP config BUSYBOX_INETD bool "inetd" - default n + default y select BUSYBOX_FEATURE_SYSLOG help Internet superserver daemon @@ -489,7 +593,7 @@ config BUSYBOX_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN config BUSYBOX_FEATURE_INETD_RPC bool "Support RPC services" - default n + default y depends on BUSYBOX_INETD select BUSYBOX_FEATURE_HAVE_RPC help @@ -499,7 +603,7 @@ config BUSYBOX_IP bool "ip" depends on !ADK_PACKAGE_IP default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The "ip" applet is a TCP/IP interface configuration and routing utility. You generally don't need "ip" to use busybox with @@ -528,21 +632,21 @@ config BUSYBOX_FEATURE_IP_ROUTE config BUSYBOX_FEATURE_IP_TUNNEL bool "ip tunnel" - default n + default y depends on BUSYBOX_IP help Add support for tunneling commands to "ip". config BUSYBOX_FEATURE_IP_RULE bool "ip rule" - default n + default y depends on BUSYBOX_IP help Add support for rule commands to "ip". config BUSYBOX_FEATURE_IP_SHORT_FORMS bool "Support short forms of ip commands" - default n + default y depends on BUSYBOX_IP help Also support short-form of ip <OBJECT> commands: @@ -607,89 +711,21 @@ config BUSYBOX_FEATURE_IPCALC_FANCY config BUSYBOX_FEATURE_IPCALC_LONG_OPTIONS bool "Enable long options" - default n + default y depends on BUSYBOX_IPCALC && BUSYBOX_LONG_OPTS help Support long options for the ipcalc applet. -config BUSYBOX_NAMEIF - bool "nameif" - default n - depends on BUSYBOX_PLATFORM_LINUX - select BUSYBOX_FEATURE_SYSLOG - help - nameif is used to rename network interface by its MAC address. - Renamed interfaces MUST be in the down state. - It is possible to use a file (default: /etc/mactab) - with list of new interface names and MACs. - Maximum interface name length: IFNAMSIZ = 16 - File fields are separated by space or tab. - File format: - # Comment - new_interface_name XX:XX:XX:XX:XX:XX - -config BUSYBOX_FEATURE_NAMEIF_EXTENDED - bool "Extended nameif" - default n - depends on BUSYBOX_NAMEIF - help - This extends the nameif syntax to support the bus_info and driver - checks. The syntax is compatible to the normal nameif. - File format: - new_interface_name driver=asix bus=usb-0000:00:08.2-3 - new_interface_name bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 - new_interface_name mac=00:80:C8:38:91:B5 - new_interface_name 00:80:C8:38:91:B5 - -config BUSYBOX_NBDCLIENT - bool "nbd-client" - default n - help - Network block device client - -config BUSYBOX_NC - bool "nc" - default y - help - A simple Unix utility which reads and writes data across network - connections. - -config BUSYBOX_NC_SERVER - bool "Netcat server options (-l)" - default y - depends on BUSYBOX_NC - help - Allow netcat to act as a server. - -config BUSYBOX_NC_EXTRA - bool "Netcat extensions (-eiw and filename)" - default n - depends on BUSYBOX_NC - help - Add -e (support for executing the rest of the command line after - making or receiving a successful connection), -i (delay interval for - lines sent), -w (timeout for initial connection). - -config BUSYBOX_NC_110_COMPAT - bool "Netcat 1.10 compatibility (+2.5k)" - default n # off specially for Rob - depends on BUSYBOX_NC - help - This option makes nc closely follow original nc-1.10. - The code is about 2.5k bigger. It enables - -s ADDR, -n, -u, -v, -o FILE, -z options, but loses - busybox-specific extensions: -f FILE and -ll. - config BUSYBOX_NETSTAT bool "netstat" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help netstat prints information about the Linux networking subsystem. config BUSYBOX_FEATURE_NETSTAT_WIDE bool "Enable wide netstat output" - default n + default y depends on BUSYBOX_NETSTAT help Add support for wide columns. Useful when displaying IPv6 addresses @@ -705,47 +741,25 @@ config BUSYBOX_FEATURE_NETSTAT_PRG config BUSYBOX_NSLOOKUP bool "nslookup" - default n + default y help nslookup is a tool to query Internet name servers. config BUSYBOX_NTPD bool "ntpd" + depends on !ADK_PACKAGE_OPENNTPD default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The NTP client/server daemon. config BUSYBOX_FEATURE_NTPD_SERVER - bool "Make ntpd usable as a NTP server" - default y - depends on BUSYBOX_NTPD - help - Make ntpd usable as a NTP server. If you disable this option - ntpd will be usable only as a NTP client. - -config BUSYBOX_PING - bool "ping" - default y - depends on BUSYBOX_PLATFORM_LINUX - help - ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to - elicit an ICMP ECHO_RESPONSE from a host or gateway. - -config BUSYBOX_PING6 - bool "ping6" - default y - depends on BUSYBOX_FEATURE_IPV6 && BUSYBOX_PING - help - This will give you a ping that can talk IPv6. - -config BUSYBOX_FEATURE_FANCY_PING - bool "Enable fancy ping output" + bool "Make ntpd usable as a NTP server" default y - depends on BUSYBOX_PING + depends on BUSYBOX_NTPD help - Make the output from the ping applet include statistics, and at the - same time provide full support for ICMP packets. + Make ntpd usable as a NTP server. If you disable this option + ntpd will be usable only as a NTP client. config BUSYBOX_PSCAN bool "pscan" @@ -756,21 +770,21 @@ config BUSYBOX_PSCAN config BUSYBOX_ROUTE bool "route" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Route displays or manipulates the kernel's IP routing tables. config BUSYBOX_SLATTACH bool "slattach" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help slattach is a small utility to attach network interfaces to serial lines. #config TC # bool "tc" -# default n +# default y # help # show / manipulate traffic control settings # @@ -778,6 +792,13 @@ config BUSYBOX_SLATTACH # def_bool n # depends on BUSYBOX_TC +config BUSYBOX_TCPSVD + bool "tcpsvd" + default n + help + tcpsvd listens on a TCP port and runs a program for each new + connection. + config BUSYBOX_TELNET bool "telnet" default y @@ -837,7 +858,7 @@ config BUSYBOX_TELNETD mount -t devpts devpts /dev/pts - You need to be sure that Busybox has LOGIN and + You need to be sure that busybox has LOGIN and FEATURE_SUID enabled. And finally, you should make certain that Busybox has been installed setuid root: @@ -849,14 +870,14 @@ config BUSYBOX_TELNETD config BUSYBOX_FEATURE_TELNETD_STANDALONE bool "Support standalone telnetd (not inetd only)" - default n + default y depends on BUSYBOX_TELNETD help Selecting this will make telnetd able to run standalone. config BUSYBOX_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" - default n + default y depends on BUSYBOX_FEATURE_TELNETD_STANDALONE help This option allows you to run telnetd in "inet wait" mode. @@ -919,7 +940,7 @@ config BUSYBOX_FEATURE_TFTP_PUT config BUSYBOX_FEATURE_TFTP_BLOCKSIZE bool "Enable 'blksize' and 'tsize' protocol options" - default n + default y depends on BUSYBOX_TFTP || BUSYBOX_TFTPD help Allow tftp to specify block size, and tftpd to understand @@ -927,7 +948,7 @@ config BUSYBOX_FEATURE_TFTP_BLOCKSIZE config BUSYBOX_FEATURE_TFTP_PROGRESS_BAR bool "Enable tftp progress meter" - default n + default y depends on BUSYBOX_TFTP && BUSYBOX_FEATURE_TFTP_BLOCKSIZE help Show progress bar. @@ -943,7 +964,7 @@ config BUSYBOX_TFTP_DEBUG config BUSYBOX_TRACEROUTE bool "traceroute" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Utility to trace the route of IP packets. @@ -956,7 +977,7 @@ config BUSYBOX_TRACEROUTE6 config BUSYBOX_FEATURE_TRACEROUTE_VERBOSE bool "Enable verbose output" - default n + default y depends on BUSYBOX_TRACEROUTE help Add some verbosity to traceroute. This includes among other things @@ -972,26 +993,48 @@ config BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP bool "Use ICMP instead of UDP" - default y + default n depends on BUSYBOX_TRACEROUTE help Add option -I to use ICMP ECHO instead of UDP datagrams. +config BUSYBOX_TUNCTL + bool "tunctl" + default y + select BUSYBOX_PLATFORM_LINUX + help + tunctl creates or deletes tun devices. + +config BUSYBOX_FEATURE_TUNCTL_UG + bool "Support owner:group assignment" + default y + depends on BUSYBOX_TUNCTL + help + Allow to specify owner and group of newly created interface. + 340 bytes of pure bloat. Say no here. + source package/busybox/config/networking/udhcp/Config.in config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS string "ifup udhcpc command line options" - default "-b -R" + default "-R -n" depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC help Command line options to pass to udhcpc from ifup. Intended to alter options not available in /etc/network/interfaces. (IE: --syslog --background etc...) +config BUSYBOX_UDPSVD + bool "udpsvd" + default n + help + udpsvd listens on an UDP port and runs a program for each new + connection. + config BUSYBOX_VCONFIG bool "vconfig" - select ADK_KPACKAGE_KMOD_VLAN_8021Q - default n + default y + select BUSYBOX_PLATFORM_LINUX help Creates, removes, and configures VLAN interfaces @@ -1005,7 +1048,7 @@ config BUSYBOX_WGET config BUSYBOX_FEATURE_WGET_STATUSBAR bool "Enable a nifty process meter (+2k)" - default y + default n depends on BUSYBOX_WGET help Enable the transfer progress bar for wget transfers. @@ -1039,7 +1082,7 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT config BUSYBOX_ZCIP bool "zcip" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX select BUSYBOX_FEATURE_SYSLOG help ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. @@ -1049,33 +1092,4 @@ config BUSYBOX_ZCIP See http://www.zeroconf.org for further details, and "zcip.script" in the busybox examples. -config BUSYBOX_TCPSVD - bool "tcpsvd" - default n - help - tcpsvd listens on a TCP port and runs a program for each new - connection. - -config BUSYBOX_TUNCTL - bool "tunctl" - default n - depends on BUSYBOX_PLATFORM_LINUX - help - tunctl creates or deletes tun devices. - -config BUSYBOX_FEATURE_TUNCTL_UG - bool "Support owner:group assignment" - default n - depends on BUSYBOX_TUNCTL - help - Allow to specify owner and group of newly created interface. - 340 bytes of pure bloat. Say no here. - -config BUSYBOX_UDPSVD - bool "udpsvd" - default n - help - udpsvd listens on an UDP port and runs a program for each new - connection. - endmenu diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 2ace4737b..6ece73097 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -1,19 +1,26 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. # +config BUSYBOX_UDHCPC6 + bool "udhcp client for DHCPv6 (udhcpc6)" + default n # not yet ready + help + udhcpc6 is a DHCPv6 client + config BUSYBOX_UDHCPD bool "udhcp server (udhcpd)" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. config BUSYBOX_DHCPRELAY bool "dhcprelay" - default n + default y depends on BUSYBOX_UDHCPD help dhcprelay listens for dhcp requests on one or more interfaces @@ -22,7 +29,7 @@ config BUSYBOX_DHCPRELAY config BUSYBOX_DUMPLEASES bool "Lease display utility (dumpleases)" - default n + default y depends on BUSYBOX_UDHCPD help dumpleases displays the leases written out by the udhcpd server. @@ -31,13 +38,27 @@ config BUSYBOX_DUMPLEASES config BUSYBOX_FEATURE_UDHCPD_WRITE_LEASES_EARLY bool "Rewrite the lease file at every new acknowledge" - default n + default y depends on BUSYBOX_UDHCPD help If selected, udhcpd will write a new file with leases every time a new lease has been accepted, thus eliminating the need to send SIGUSR1 for the initial writing or updating. Any timed - rewriting remains undisturbed + rewriting remains undisturbed. + +config BUSYBOX_FEATURE_UDHCPD_BASE_IP_ON_MAC + bool "Select IP address based on client MAC" + default n + depends on BUSYBOX_UDHCPD + help + If selected, udhcpd will base its selection of IP address to offer + on the client's hardware address. Otherwise udhcpd uses the next + consecutive free address. + + This reduces the frequency of IP address changes for clients + which let their lease expire, and makes consecutive DHCPOFFERS + for the same client to (almost always) contain the same + IP address. config BUSYBOX_DHCPD_LEASES_FILE string "Absolute path to lease file" @@ -50,7 +71,7 @@ config BUSYBOX_DHCPD_LEASES_FILE config BUSYBOX_UDHCPC bool "udhcp client (udhcpc)" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help udhcpc is a DHCP client geared primarily toward embedded systems, while striving to be fully functional and RFC compliant. @@ -78,25 +99,33 @@ config BUSYBOX_FEATURE_UDHCP_PORT config BUSYBOX_UDHCP_DEBUG int "Maximum verbosity level for udhcp applets (0..9)" - default 0 + default 9 range 0 9 depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY help Verbosity can be increased with multiple -v options. - This options controls how high it can be cranked up. + This option controls how high it can be cranked up. Bigger values result in bigger code. Levels above 1 are very verbose and useful for debugging only. config BUSYBOX_FEATURE_UDHCP_RFC3397 bool "Support for RFC3397 domain search (experimental)" - default n + default y depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC help If selected, both client and server will support passing of domain search lists via option 119, specified in RFC 3397, and SIP servers option 120, specified in RFC 3361. +config BUSYBOX_FEATURE_UDHCP_8021Q + bool "Support for 802.1Q VLAN parameters" + default y + depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC + help + If selected, both client and server will support passing of VLAN + ID and priority via options 132 and 133 as per 802.1Q. + config BUSYBOX_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" default "/usr/share/udhcpc/default.script" diff --git a/package/busybox/config/printutils/Config.in b/package/busybox/config/printutils/Config.in index 41d0f9c2b..b5dd69e39 100644 --- a/package/busybox/config/printutils/Config.in +++ b/package/busybox/config/printutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Print Utilities" + config BUSYBOX_LPD bool "lpd" default n diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in index c67fa42d9..66d18a0f9 100644 --- a/package/busybox/config/procps/Config.in +++ b/package/busybox/config/procps/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,10 +6,73 @@ menu "Process Utilities" +config BUSYBOX_IOSTAT + bool "iostat" + default y + help + Report CPU and I/O statistics +config BUSYBOX_LSOF + bool "lsof" + default y + help + Show open files in the format of: + PID <TAB> /path/to/executable <TAB> /path/to/opened/file +config BUSYBOX_MPSTAT + bool "mpstat" + default n + help + Per-processor statistics +config BUSYBOX_NMETER + bool "nmeter" + default n + help + Prints selected system stats continuously, one line per update. +config BUSYBOX_PMAP + bool "pmap" + default y + help + Display processes' memory mappings. +config BUSYBOX_POWERTOP + bool "powertop" + default n + help + Analyze power consumption on Intel-based laptops +config BUSYBOX_PSTREE + bool "pstree" + default y + help + Display a tree of processes. +config BUSYBOX_PWDX + bool "pwdx" + default n + help + Report current working directory of a process +config BUSYBOX_SMEMCAP + bool "smemcap" + default n + help + smemcap is a tool for capturing process data for smem, + a memory usage statistic tool. +config BUSYBOX_UPTIME + bool "uptime" + default y + select BUSYBOX_PLATFORM_LINUX #sysinfo() + help + uptime gives a one line display of the current time, how long + the system has been running, how many users are currently logged + on, and the system load averages for the past 1, 5, and 15 minutes. + +config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT + bool "Support for showing the number of users" + default y + depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP + help + Makes uptime display the number of users currently logged on. + config BUSYBOX_FREE bool "free" default y - depends on BUSYBOX_PLATFORM_LINUX #sysinfo() + select BUSYBOX_PLATFORM_LINUX #sysinfo() help free displays the total amount of free and used physical and swap memory in the system, as well as the buffers used by the kernel. @@ -22,13 +86,6 @@ config BUSYBOX_FUSER file open. fuser can also list all PIDs that have a given network (TCP or UDP) port open. -config BUSYBOX_IOSTAT - bool "iostat" - default n - depends on !ADK_PACKAGE_SYSSTAT - help - Report CPU and I/O statistics - config BUSYBOX_KILL bool "kill" default y @@ -48,22 +105,9 @@ config BUSYBOX_KILLALL config BUSYBOX_KILLALL5 bool "killall5" - default n + default y depends on BUSYBOX_KILL -config BUSYBOX_MPSTAT - bool "mpstat" - default n - depends on !ADK_PACKAGE_SYSSTAT - help - Per-processor statistics - -config BUSYBOX_NMETER - bool "nmeter" - default n - help - Prints selected system stats continuously, one line per update. - config BUSYBOX_PGREP bool "pgrep" default y @@ -72,21 +116,21 @@ config BUSYBOX_PGREP config BUSYBOX_PIDOF bool "pidof" - default n + default y help Pidof finds the process id's (pids) of the named programs. It prints those id's on the standard output. config BUSYBOX_FEATURE_PIDOF_SINGLE bool "Enable argument for single shot (-s)" - default n + default y depends on BUSYBOX_PIDOF help Support argument '-s' for returning only the first pid found. config BUSYBOX_FEATURE_PIDOF_OMIT bool "Enable argument for omitting pids (-o)" - default n + default y depends on BUSYBOX_PIDOF help Support argument '-o' for omitting the given pids in output. @@ -99,18 +143,6 @@ config BUSYBOX_PKILL help Send signals to processes by name. -config BUSYBOX_PMAP - bool "pmap" - default n - help - Display processes' memory mappings. - -config BUSYBOX_POWERTOP - bool "powertop" - default n - help - Analyze power consumption on Intel-based laptops - config BUSYBOX_PS bool "ps" default y @@ -120,22 +152,31 @@ config BUSYBOX_PS config BUSYBOX_FEATURE_PS_WIDE bool "Enable wide output option (-w)" default y - depends on BUSYBOX_PS + depends on BUSYBOX_PS && !BUSYBOX_DESKTOP help Support argument 'w' for wide output. If given once, 132 chars are printed, and if given more than once, the length is unlimited. +config BUSYBOX_FEATURE_PS_LONG + bool "Enable long output option (-l)" + default y + depends on BUSYBOX_PS && !BUSYBOX_DESKTOP + help + Support argument 'l' for long output. + Adds fields PPID, RSS, START, TIME & TTY + config BUSYBOX_FEATURE_PS_TIME bool "Enable time and elapsed time output" - default n - depends on BUSYBOX_PS && BUSYBOX_DESKTOP && BUSYBOX_PLATFORM_LINUX #sysinfo() + default y + depends on BUSYBOX_PS && BUSYBOX_DESKTOP + select BUSYBOX_PLATFORM_LINUX help Support -o time and -o etime output specifiers. config BUSYBOX_FEATURE_PS_ADDITIONAL_COLUMNS bool "Enable additional ps columns" - default n + default y depends on BUSYBOX_PS && BUSYBOX_DESKTOP help Support -o rgroup, -o ruser, -o nice output specifiers. @@ -150,18 +191,11 @@ config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS config BUSYBOX_RENICE bool "renice" - default n + default y help Renice alters the scheduling priority of one or more running processes. -config BUSYBOX_SMEMCAP - bool "smemcap" - default n - help - smemcap is a tool for capturing process data for smem, - a memory usage statistic tool. - config BUSYBOX_BB_SYSCTL bool "sysctl" default y @@ -193,7 +227,7 @@ config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS config BUSYBOX_FEATURE_TOP_SMP_CPU bool "SMP CPU usage display ('c' key)" - default n + default y depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS help Allow 'c' key to switch between individual/cumulative CPU stats @@ -201,7 +235,7 @@ config BUSYBOX_FEATURE_TOP_SMP_CPU config BUSYBOX_FEATURE_TOP_DECIMALS bool "Show 1/10th of a percent in CPU/mem statistics" - default n + default y depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE help Show 1/10th of a percent in CPU/mem statistics. @@ -209,7 +243,7 @@ config BUSYBOX_FEATURE_TOP_DECIMALS config BUSYBOX_FEATURE_TOP_SMP_PROCESS bool "Show CPU process runs on ('j' field)" - default n + default y depends on BUSYBOX_TOP help Show CPU where process was last found running on. @@ -217,26 +251,18 @@ config BUSYBOX_FEATURE_TOP_SMP_PROCESS config BUSYBOX_FEATURE_TOPMEM bool "Topmem command ('s' key)" - default n + default y depends on BUSYBOX_TOP help Enable 's' in top (gives lots of memory info). config BUSYBOX_FEATURE_SHOW_THREADS - bool "Support for showing threads in ps/top" - default y - depends on BUSYBOX_PS || BUSYBOX_TOP - help - Enables ps -T option and 'h' command in top - -config BUSYBOX_UPTIME - bool "uptime" + bool "Support for showing threads in ps/pstree/top" default y - depends on BUSYBOX_PLATFORM_LINUX #sysinfo() + depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE help - uptime gives a one line display of the current time, how long - the system has been running, how many users are currently logged - on, and the system load averages for the past 1, 5, and 15 minutes. + Enables the ps -T option, showing of threads in pstree, + and 'h' command in top. config BUSYBOX_WATCH bool "watch" diff --git a/package/busybox/config/runit/Config.in b/package/busybox/config/runit/Config.in index 3c9c2dd29..fc767d280 100644 --- a/package/busybox/config/runit/Config.in +++ b/package/busybox/config/runit/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "Runit Utilities" + config BUSYBOX_RUNSV bool "runsv" default n diff --git a/package/busybox/config/selinux/Config.in b/package/busybox/config/selinux/Config.in index 41c60bd7e..8818ef5a1 100644 --- a/package/busybox/config/selinux/Config.in +++ b/package/busybox/config/selinux/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -6,6 +7,7 @@ menu "SELinux Utilities" depends on BUSYBOX_SELINUX + config BUSYBOX_CHCON bool "chcon" default n @@ -120,4 +122,3 @@ config BUSYBOX_SESTATUS Displays the status of SELinux. endmenu - diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 674aaabbe..52a96c7e2 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,58 +6,6 @@ menu "Shells" -choice - prompt "Choose which shell is aliased to 'sh' name" - default FEATURE_SH_IS_ASH - help - Choose a shell. The ash shell is the most bash compatible - and full featured one. - -config BUSYBOX_FEATURE_SH_IS_ASH - select BUSYBOX_ASH - bool "ash" - depends on !BUSYBOX_NOMMU - -config BUSYBOX_FEATURE_SH_IS_HUSH - select BUSYBOX_HUSH - bool "hush" - -config BUSYBOX_FEATURE_SH_IS_NONE - bool "none" - -endchoice - -choice - prompt "Choose which shell is aliased to 'bash' name" - default BUSYBOX_FEATURE_BASH_IS_NONE - help - Choose which shell you want to be executed by 'bash' alias. - The ash shell is the most bash compatible and full featured one. - - Note that selecting this option does not switch on any bash - compatibility code. It merely makes it possible to install - /bin/bash (sym)link and run scripts which start with - #!/bin/bash line. - - Many systems use it in scripts which use bash-specific features, - even simple ones like $RANDOM. Without this option, busybox - can't be used for running them because it won't recongnize - "bash" as a supported applet name. - -config BUSYBOX_FEATURE_BASH_IS_ASH - depends on BUSYBOX_ASH - bool "ash" - depends on !BUSYBOX_NOMMU - -config BUSYBOX_FEATURE_BASH_IS_HUSH - depends on BUSYBOX_HUSH - bool "hush" - -config BUSYBOX_FEATURE_BASH_IS_NONE - bool "none" - -endchoice - config BUSYBOX_ASH bool "ash" default y @@ -75,6 +24,13 @@ config BUSYBOX_ASH_BASH_COMPAT help Enable bash-compatible extensions. +config BUSYBOX_ASH_IDLE_TIMEOUT + bool "Idle timeout variable" + default n + depends on BUSYBOX_ASH + help + Enables bash-like auto-logout after $TMOUT seconds of idle time. + config BUSYBOX_ASH_JOB_CONTROL bool "Job control" default y @@ -83,7 +39,7 @@ config BUSYBOX_ASH_JOB_CONTROL Enable job control in the ash shell. config BUSYBOX_ASH_ALIAS - bool "alias support" + bool "Alias support" default y depends on BUSYBOX_ASH help @@ -94,32 +50,32 @@ config BUSYBOX_ASH_GETOPTS default y depends on BUSYBOX_ASH help - Enable getopts builtin in the ash shell. + Enable support for getopts builtin in ash. config BUSYBOX_ASH_BUILTIN_ECHO bool "Builtin version of 'echo'" default y depends on BUSYBOX_ASH help - Enable support for echo, builtin to ash. + Enable support for echo builtin in ash. config BUSYBOX_ASH_BUILTIN_PRINTF bool "Builtin version of 'printf'" default y depends on BUSYBOX_ASH help - Enable support for printf, builtin to ash. + Enable support for printf builtin in ash. config BUSYBOX_ASH_BUILTIN_TEST bool "Builtin version of 'test'" default y depends on BUSYBOX_ASH help - Enable support for test, builtin to ash. + Enable support for test builtin in ash. config BUSYBOX_ASH_CMDCMD bool "'command' command to override shell builtins" - default n + default y depends on BUSYBOX_ASH help Enable support for the ash 'command' builtin, which allows @@ -131,7 +87,7 @@ config BUSYBOX_ASH_MAIL default n depends on BUSYBOX_ASH help - Enable "check for new mail" in the ash shell. + Enable "check for new mail" function in the ash shell. config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE bool "Optimize for size instead of speed" @@ -142,7 +98,7 @@ config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE config BUSYBOX_ASH_RANDOM_SUPPORT bool "Pseudorandom generator and $RANDOM variable" - default n + default y depends on BUSYBOX_ASH help Enable pseudorandom generator and dynamic variable "$RANDOM". @@ -160,6 +116,49 @@ config BUSYBOX_ASH_EXPAND_PRMT This option recreates the prompt string from the environment variable each time it is displayed. +config BUSYBOX_CTTYHACK + bool "cttyhack" + default n + help + One common problem reported on the mailing list is the "can't + access tty; job control turned off" error message, which typically + appears when one tries to use a shell with stdin/stdout on + /dev/console. + This device is special - it cannot be a controlling tty. + + The proper solution is to use the correct device instead of + /dev/console. + + cttyhack provides a "quick and dirty" solution to this problem. + It analyzes stdin with various ioctls, trying to determine whether + it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). + On Linux it also checks sysfs for a pointer to the active console. + If cttyhack is able to find the real console device, it closes + stdin/out/err and reopens that device. + Then it executes the given program. Opening the device will make + that device a controlling tty. This may require cttyhack + to be a session leader. + + Example for /etc/inittab (for busybox init): + + ::respawn:/bin/cttyhack /bin/sh + + Starting an interactive shell from boot shell script: + + setsid cttyhack sh + + Giving controlling tty to shell running with PID 1: + + # exec cttyhack sh + + Without cttyhack, you need to know exact tty name, + and do something like this: + + # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1' + + Starting getty on a controlling tty from a shell script: + + # getty 115200 $(cttyhack) config BUSYBOX_HUSH bool "hush" default n @@ -190,7 +189,7 @@ config BUSYBOX_HUSH_BRACE_EXPANSION config BUSYBOX_HUSH_HELP bool "help builtin" - default n + default y depends on BUSYBOX_HUSH help Enable help builtin in hush. Code size + ~1 kbyte. @@ -214,7 +213,7 @@ config BUSYBOX_HUSH_SAVEHISTORY config BUSYBOX_HUSH_JOB bool "Job control" - default n + default y depends on BUSYBOX_HUSH_INTERACTIVE help Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current @@ -225,61 +224,61 @@ config BUSYBOX_HUSH_JOB config BUSYBOX_HUSH_TICK bool "Process substitution" - default n + default y depends on BUSYBOX_HUSH help Enable process substitution `command` and $(command) in hush. config BUSYBOX_HUSH_IF bool "Support if/then/elif/else/fi" - default n + default y depends on BUSYBOX_HUSH help Enable if/then/elif/else/fi in hush. config BUSYBOX_HUSH_LOOPS bool "Support for, while and until loops" - default n + default y depends on BUSYBOX_HUSH help Enable for, while and until loops in hush. config BUSYBOX_HUSH_CASE bool "Support case ... esac statement" - default n + default y depends on BUSYBOX_HUSH help Enable case ... esac statement in hush. +400 bytes. config BUSYBOX_HUSH_FUNCTIONS bool "Support funcname() { commands; } syntax" - default n + default y depends on BUSYBOX_HUSH help Enable support for shell functions in hush. +800 bytes. config BUSYBOX_HUSH_LOCAL bool "Support local builtin" - default n + default y depends on BUSYBOX_HUSH_FUNCTIONS help Enable support for local variables in functions. -config BUSYBOX_HUSH_EXPORT_N - bool "Support 'export -n' option" - default n - depends on BUSYBOX_HUSH - help - export -n unexports variables. It is a bash extension. - config BUSYBOX_HUSH_RANDOM_SUPPORT bool "Pseudorandom generator and $RANDOM variable" - default n + default y depends on BUSYBOX_HUSH help Enable pseudorandom generator and dynamic variable "$RANDOM". Each read of "$RANDOM" will generate a new pseudorandom value. +config BUSYBOX_HUSH_EXPORT_N + bool "Support 'export -n' option" + default y + depends on BUSYBOX_HUSH + help + export -n unexports variables. It is a bash extension. + config BUSYBOX_HUSH_MODE_X bool "Support 'hush -x' option and 'set -x' command" default y @@ -296,6 +295,61 @@ config BUSYBOX_MSH msh is deprecated and will be removed, please migrate to hush. + +choice + prompt "Choose which shell is aliased to 'sh' name" + default FEATURE_SH_IS_ASH + help + Choose which shell you want to be executed by 'sh' alias. + The ash shell is the most bash compatible and full featured one. + +# note: cannot use "select ASH" here, it breaks "make allnoconfig" +config BUSYBOX_FEATURE_SH_IS_ASH + depends on BUSYBOX_ASH + bool "ash" + depends on !BUSYBOX_NOMMU + +config BUSYBOX_FEATURE_SH_IS_HUSH + depends on BUSYBOX_HUSH + bool "hush" + +config BUSYBOX_FEATURE_SH_IS_NONE + bool "none" + +endchoice + +choice + prompt "Choose which shell is aliased to 'bash' name" + default FEATURE_BASH_IS_NONE + help + Choose which shell you want to be executed by 'bash' alias. + The ash shell is the most bash compatible and full featured one. + + Note that selecting this option does not switch on any bash + compatibility code. It merely makes it possible to install + /bin/bash (sym)link and run scripts which start with + #!/bin/bash line. + + Many systems use it in scripts which use bash-specific features, + even simple ones like $RANDOM. Without this option, busybox + can't be used for running them because it won't recongnize + "bash" as a supported applet name. + +config BUSYBOX_FEATURE_BASH_IS_ASH + depends on BUSYBOX_ASH + bool "ash" + depends on !BUSYBOX_NOMMU + +config BUSYBOX_FEATURE_BASH_IS_HUSH + depends on BUSYBOX_HUSH + bool "hush" + +config BUSYBOX_FEATURE_BASH_IS_NONE + bool "none" + +endchoice + + config BUSYBOX_SH_MATH_SUPPORT bool "POSIX math support" default y @@ -305,7 +359,7 @@ config BUSYBOX_SH_MATH_SUPPORT config BUSYBOX_SH_MATH_SUPPORT_64 bool "Extend POSIX math support to 64 bit" - default n + default y depends on BUSYBOX_SH_MATH_SUPPORT help Enable 64-bit math support in the shell. This will make the shell @@ -314,8 +368,8 @@ config BUSYBOX_SH_MATH_SUPPORT_64 config BUSYBOX_FEATURE_SH_EXTRA_QUIET bool "Hide message on interactive shell startup" - default n - depends on BUSYBOX_MSH || BUSYBOX_LASH || BUSYBOX_HUSH || BUSYBOX_ASH + default y + depends on BUSYBOX_HUSH || BUSYBOX_ASH help Remove the busybox introduction when starting a shell. @@ -357,9 +411,9 @@ config BUSYBOX_FEATURE_SH_NOFORK default n depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS help - This option causes busybox shells [currently only ash] - to not execute typical fork/exec/wait sequence, but call <applet>_main - directly, if possible. (Sometimes it is not possible: for example, + This option causes busybox shells to not execute typical + fork/exec/wait sequence, but call <applet>_main directly, + if possible. (Sometimes it is not possible: for example, this is not possible in pipes). This will be done only for some applets (those which are marked @@ -367,42 +421,17 @@ config BUSYBOX_FEATURE_SH_NOFORK This may significantly speed up some shell scripts. - This feature is relatively new. Use with care. + This feature is relatively new. Use with care. Report bugs + to project mailing list. -config BUSYBOX_CTTYHACK - bool "cttyhack" - default n +config BUSYBOX_FEATURE_SH_HISTFILESIZE + bool "Use $HISTFILESIZE" + default y + depends on BUSYBOX_HUSH || BUSYBOX_ASH help - One common problem reported on the mailing list is "can't access tty; - job control turned off" error message which typically appears when - one tries to use shell with stdin/stdout opened to /dev/console. - This device is special - it cannot be a controlling tty. - - Proper solution is to use correct device instead of /dev/console. - - cttyhack provides "quick and dirty" solution to this problem. - It analyzes stdin with various ioctls, trying to determine whether - it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). - If it detects one, it closes stdin/out/err and reopens that device. - Then it executes given program. Opening the device will make - that device a controlling tty. This may require cttyhack - to be a session leader. - - Example for /etc/inittab (for busybox init): - - ::respawn:/bin/cttyhack /bin/sh + This option makes busybox shells to use $HISTFILESIZE variable + to set shell history size. Note that its max value is capped + by "History size" setting in library tuning section. - Starting an interactive shell from boot shell script: - - setsid cttyhack sh - - Giving controlling tty to shell running with PID 1: - - # exec cttyhack sh - - Without cttyhack, you need to know exact tty name, - and do something like this: - - # exec setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1' endmenu diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in index fcefc0fe3..8d999c8e9 100644 --- a/package/busybox/config/sysklogd/Config.in +++ b/package/busybox/config/sysklogd/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,6 +6,7 @@ menu "System Logging Utilities" + config BUSYBOX_SYSLOGD bool "syslogd" default y @@ -22,7 +24,7 @@ config BUSYBOX_SYSLOGD config BUSYBOX_FEATURE_ROTATE_LOGFILE bool "Rotate message files" - default n + default y depends on BUSYBOX_SYSLOGD help This enables syslogd to rotate the message files @@ -44,12 +46,19 @@ config BUSYBOX_FEATURE_REMOTE_LOG config BUSYBOX_FEATURE_SYSLOGD_DUP bool "Support -D (drop dups) option" - default n + default y depends on BUSYBOX_SYSLOGD help Option -D instructs syslogd to drop consecutive messages which are totally the same. +config BUSYBOX_FEATURE_SYSLOGD_CFG + bool "Support syslog.conf" + default n + depends on BUSYBOX_SYSLOGD + help + Supports restricted syslogd config. See docs/syslog.conf.txt + config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE int "Read buffer size in bytes" default 256 @@ -95,7 +104,7 @@ config BUSYBOX_LOGREAD config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING bool "Double buffering" - default n + default y depends on BUSYBOX_LOGREAD help 'logread' ouput to slow serial terminals can have @@ -117,7 +126,8 @@ config BUSYBOX_KLOGD config BUSYBOX_FEATURE_KLOGD_KLOGCTL bool "Use the klogctl() interface" default y - depends on BUSYBOX_KLOGD && BUSYBOX_PLATFORM_LINUX + depends on BUSYBOX_KLOGD + select BUSYBOX_PLATFORM_LINUX help The klogd applet supports two interfaces for reading kernel messages. Linux provides the klogctl() interface @@ -141,4 +151,3 @@ config BUSYBOX_LOGGER problems that occur within programs and scripts. endmenu - diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index e560a7b53..e9ee30431 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -5,10 +6,78 @@ menu "Linux System Utilities" +config BUSYBOX_BLOCKDEV + bool "blockdev" + default n + help + Performs some ioctls with block devices. +config BUSYBOX_MDEV + bool "mdev" + default y + select BUSYBOX_PLATFORM_LINUX + help + mdev is a mini-udev implementation for dynamically creating device + nodes in the /dev directory. + + For more information, please see docs/mdev.txt + +config BUSYBOX_FEATURE_MDEV_CONF + bool "Support /etc/mdev.conf" + default y + depends on BUSYBOX_MDEV + help + Add support for the mdev config file to control ownership and + permissions of the device nodes. + + For more information, please see docs/mdev.txt + +config BUSYBOX_FEATURE_MDEV_RENAME + bool "Support subdirs/symlinks" + default y + depends on BUSYBOX_FEATURE_MDEV_CONF + help + Add support for renaming devices and creating symlinks. + + For more information, please see docs/mdev.txt + +config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP + bool "Support regular expressions substitutions when renaming device" + default y + depends on BUSYBOX_FEATURE_MDEV_RENAME + help + Add support for regular expressions substitutions when renaming + device. + +config BUSYBOX_FEATURE_MDEV_EXEC + bool "Support command execution at device addition/removal" + default y + depends on BUSYBOX_FEATURE_MDEV_CONF + help + This adds support for an optional field to /etc/mdev.conf for + executing commands when devices are created/removed. + + For more information, please see docs/mdev.txt + +config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE + bool "Support loading of firmwares" + default y + depends on BUSYBOX_MDEV + help + Some devices need to load firmware before they can be usable. + + These devices will request userspace look up the files in + /lib/firmware/ and if it exists, send it to the kernel for + loading into the hardware. +config BUSYBOX_REV + bool "rev" + default n + help + Reverse lines of a file or files. + config BUSYBOX_ACPID bool "acpid" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely @@ -23,31 +92,32 @@ config BUSYBOX_ACPID config BUSYBOX_FEATURE_ACPID_COMPAT bool "Accept and ignore redundant options" - default n + default y depends on BUSYBOX_ACPID help Accept and ignore compatibility options -g -m -s -S -v. -config BUSYBOX_BLOCKDEV - bool "blockdev" - default n - help - Performs some ioctls with block devices. - config BUSYBOX_BLKID bool "blkid" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX select BUSYBOX_VOLUMEID help Lists labels and UUIDs of all filesystems. WARNING: With all submodules selected, it will add ~8k to busybox. +config BUSYBOX_FEATURE_BLKID_TYPE + bool "Print filesystem type" + default n + depends on BUSYBOX_BLKID + help + Show TYPE="filesystem type" + config BUSYBOX_DMESG bool "dmesg" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help dmesg is used to examine or control the kernel ring buffer. When the Linux kernel prints messages to the system log, they are stored in @@ -80,8 +150,10 @@ config BUSYBOX_FEATURE_DMESG_PRETTY config BUSYBOX_FBSET bool "fbset" + depends on !ADK_PACKAGE_FBSET + default y if ADK_TARGET_WITH_VGA default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help fbset is used to show or change the settings of a Linux frame buffer device. The frame buffer device provides a simple and unique @@ -90,7 +162,7 @@ config BUSYBOX_FBSET config BUSYBOX_FEATURE_FBSET_FANCY bool "Turn on extra fbset options" - default n + default y depends on BUSYBOX_FBSET help This option enables extended fbset options, allowing one to set the @@ -100,7 +172,7 @@ config BUSYBOX_FEATURE_FBSET_FANCY config BUSYBOX_FEATURE_FBSET_READMODE bool "Turn on fbset readmode support" - default n + default y depends on BUSYBOX_FBSET help This option allows fbset to read the video mode database stored by @@ -110,7 +182,7 @@ config BUSYBOX_FEATURE_FBSET_READMODE config BUSYBOX_FDFLUSH bool "fdflush" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help fdflush is only needed when changing media on slightly-broken removable media drives. It is used to make Linux believe that a @@ -123,14 +195,14 @@ config BUSYBOX_FDFLUSH config BUSYBOX_FDFORMAT bool "fdformat" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help fdformat is used to low-level format a floppy disk. config BUSYBOX_FDISK bool "fdisk" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The fdisk utility is used to divide hard disks into one or more logical disks, which are generally called partitions. This utility @@ -141,6 +213,7 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS bool "Support over 4GB disks" default y depends on BUSYBOX_FDISK + depends on !BUSYBOX_LFS # with LFS no special code is needed help Enable this option to support large disks > 4GB. @@ -195,7 +268,7 @@ config BUSYBOX_FEATURE_GPT_LABEL config BUSYBOX_FEATURE_FDISK_ADVANCED bool "Support expert mode" - default n + default y depends on BUSYBOX_FDISK && BUSYBOX_FEATURE_FDISK_WRITABLE help Enabling this option allows you to do terribly unsafe things like @@ -206,7 +279,7 @@ config BUSYBOX_FEATURE_FDISK_ADVANCED config BUSYBOX_FINDFS bool "findfs" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX select BUSYBOX_VOLUMEID help Prints the name of a filesystem with given label or UUID. @@ -222,7 +295,7 @@ config BUSYBOX_FLOCK config BUSYBOX_FREERAMDISK bool "freeramdisk" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Linux allows you to create ramdisks. This utility allows you to delete them and completely free all memory that was used for the @@ -242,25 +315,15 @@ config BUSYBOX_FSCK_MINIX check for and attempt to repair any corruption that occurs to a minix filesystem. -config BUSYBOX_MKFS_EXT2 - bool "mkfs_ext2" - default n - depends on BUSYBOX_PLATFORM_LINUX - help - Utility to create EXT2 filesystems. - config BUSYBOX_MKFS_MINIX bool "mkfs_minix" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The minix filesystem is a nice, small, compact, read-write filesystem with little overhead. If you wish to be able to create minix filesystems this utility will do the job for you. -comment "Minix filesystem support" - depends on BUSYBOX_FSCK_MINIX || BUSYBOX_MKFS_MINIX - config BUSYBOX_FEATURE_MINIX2 bool "Support Minix fs v2 (fsck_minix/mkfs_minix)" default y @@ -273,7 +336,7 @@ config BUSYBOX_FEATURE_MINIX2 config BUSYBOX_MKFS_REISER bool "mkfs_reiser" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Utility to create ReiserFS filesystems. Note: this applet needs a lot of testing and polishing. @@ -282,13 +345,13 @@ config BUSYBOX_MKFS_VFAT bool "mkfs_vfat" default y if ADK_TARGET_WITH_MMC default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Utility to create FAT32 filesystems. config BUSYBOX_GETOPT bool "getopt" - default n + default y help The getopt utility is used to break up (parse) options in command lines to make it easy to write complex shell scripts that also check @@ -313,7 +376,7 @@ config BUSYBOX_HEXDUMP config BUSYBOX_FEATURE_HEXDUMP_REVERSE bool "Support -R, reverse of 'hexdump -Cv'" - default n + default y depends on BUSYBOX_HEXDUMP help The hexdump utility is used to display binary data in an ascii @@ -323,8 +386,8 @@ config BUSYBOX_FEATURE_HEXDUMP_REVERSE config BUSYBOX_HD bool "hd" - default n - select BUSYBOX_HEXDUMP + default y + depends on BUSYBOX_HEXDUMP help hd is an alias to hexdump -C. @@ -332,7 +395,7 @@ config BUSYBOX_HWCLOCK bool "hwclock" default y if ADK_TARGET_WITH_RTC default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The hwclock utility is used to read and set the hardware clock on a system. This is primarily used to set the current time on @@ -341,7 +404,7 @@ config BUSYBOX_HWCLOCK config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS bool "Support long options (--hctosys,...)" - default n + default y depends on BUSYBOX_HWCLOCK && BUSYBOX_LONG_OPTS help By default, the hwclock utility only uses short options. If you @@ -350,7 +413,7 @@ config BUSYBOX_FEATURE_HWCLOCK_LONG_OPTIONS config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS bool "Use FHS /var/lib/hwclock/adjtime" - default y + default n # util-linux-ng in Fedora 13 still uses /etc/adjtime depends on BUSYBOX_HWCLOCK help Starting with FHS 2.3, the adjtime state file is supposed to exist @@ -362,8 +425,7 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS config BUSYBOX_IPCRM bool "ipcrm" - default n - select BUSYBOX_FEATURE_SUID + default y help The ipcrm utility allows the removal of System V interprocess communication (IPC) objects and the associated data structures @@ -371,17 +433,16 @@ config BUSYBOX_IPCRM config BUSYBOX_IPCS bool "ipcs" - default n - depends on BUSYBOX_PLATFORM_LINUX - select BUSYBOX_FEATURE_SUID + default y + select BUSYBOX_PLATFORM_LINUX help The ipcs utility is used to provide information on the currently allocated System V interprocess (IPC) objects in the system. config BUSYBOX_LOSETUP bool "losetup" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help losetup is used to associate or detach a loop device with a regular file or block device, and to query the status of a loop device. This @@ -389,9 +450,11 @@ config BUSYBOX_LOSETUP config BUSYBOX_LSPCI bool "lspci" - default y - #depends on BUSYBOX_PLATFORM_LINUX depends on !ADK_PACKAGE_PCIUTILS + default y if ADK_TARGET_WITH_PCI + default y if ADK_TARGET_WITH_MINIPCI + default n + #select PLATFORM_LINUX help lspci is a utility for displaying information about PCI buses in the system and devices connected to them. @@ -400,76 +463,19 @@ config BUSYBOX_LSPCI config BUSYBOX_LSUSB bool "lsusb" - default y - #depends on BUSYBOX_PLATFORM_LINUX depends on !ADK_PACKAGE_LSUSB + default y if ADK_TARGET_WITH_USB + default n + #select PLATFORM_LINUX help lsusb is a utility for displaying information about USB buses in the system and devices connected to them. This version uses sysfs (/sys/bus/usb/devices) only. -config BUSYBOX_MDEV - bool "mdev" - default y - depends on BUSYBOX_PLATFORM_LINUX - help - mdev is a mini-udev implementation for dynamically creating device - nodes in the /dev directory. - - For more information, please see docs/mdev.txt - -config BUSYBOX_FEATURE_MDEV_CONF - bool "Support /etc/mdev.conf" - default y - depends on BUSYBOX_MDEV - help - Add support for the mdev config file to control ownership and - permissions of the device nodes. - - For more information, please see docs/mdev.txt - -config BUSYBOX_FEATURE_MDEV_RENAME - bool "Support subdirs/symlinks" - default y - depends on BUSYBOX_FEATURE_MDEV_CONF - help - Add support for renaming devices and creating symlinks. - - For more information, please see docs/mdev.txt - -config BUSYBOX_FEATURE_MDEV_RENAME_REGEXP - bool "Support regular expressions substitutions when renaming device" - default y - depends on BUSYBOX_FEATURE_MDEV_RENAME - help - Add support for regular expressions substitutions when renaming - device. - -config BUSYBOX_FEATURE_MDEV_EXEC - bool "Support command execution at device addition/removal" - default y - depends on BUSYBOX_FEATURE_MDEV_CONF - help - This adds support for an optional field to /etc/mdev.conf for - executing commands when devices are created/removed. - - For more information, please see docs/mdev.txt - -config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE - bool "Support loading of firmwares" - default y - depends on BUSYBOX_MDEV - help - Some devices need to load firmware before they can be usable. - - These devices will request userspace look up the files in - /lib/firmware/ and if it exists, send it to the kernel for - loading into the hardware. - config BUSYBOX_MKSWAP bool "mkswap" - default n + default y help The mkswap utility is used to configure a file or disk partition as Linux swap space. This allows Linux to use the entire file or @@ -482,7 +488,7 @@ config BUSYBOX_MKSWAP config BUSYBOX_FEATURE_MKSWAP_UUID bool "UUID support" - default n + default y depends on BUSYBOX_MKSWAP help Generate swap spaces with universally unique identifiers. @@ -497,241 +503,10 @@ config BUSYBOX_MORE you will probably find this utility very helpful. If you don't have any need to reading text files, you can leave this disabled. -config BUSYBOX_FEATURE_USE_TERMIOS - bool "Use termios to manipulate the screen" - default y - depends on BUSYBOX_MORE || BUSYBOX_TOP || BUSYBOX_POWERTOP - help - This option allows utilities such as 'more' and 'top' to determine - the size of the screen. If you leave this disabled, your utilities - that display things on the screen will be especially primitive and - will be unable to determine the current screen size, and will be - unable to move the cursor. - -config BUSYBOX_VOLUMEID - bool #No description makes it a hidden option - default n - -menu "Filesystem/Volume identification" - depends on BUSYBOX_VOLUMEID - -config BUSYBOX_FEATURE_VOLUMEID_EXT - bool "Ext filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_BTRFS - bool "btrfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_REISERFS - bool "Reiser filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_FAT - bool "fat filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_HFS - bool "hfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_JFS - bool "jfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_UFS -### bool "ufs filesystem" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -config BUSYBOX_FEATURE_VOLUMEID_XFS - bool "xfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_NTFS - bool "ntfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_ISO9660 - bool "iso9660 filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_UDF - bool "udf filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_LUKS - bool "luks filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP - bool "linux swap filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_LVM -### bool "lvm" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -config BUSYBOX_FEATURE_VOLUMEID_CRAMFS - bool "cramfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_HPFS -### bool "hpfs filesystem" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -config BUSYBOX_FEATURE_VOLUMEID_ROMFS - bool "romfs filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -config BUSYBOX_FEATURE_VOLUMEID_SYSV - bool "sysv filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_MINIX -### bool "minix filesystem" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### These only detect partition tables - not used (yet?) -### config FEATURE_VOLUMEID_MAC -### bool "mac filesystem" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO -### -### config FEATURE_VOLUMEID_MSDOS -### bool "msdos filesystem" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -config BUSYBOX_FEATURE_VOLUMEID_OCFS2 - bool "ocfs2 filesystem" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -### config FEATURE_VOLUMEID_HIGHPOINTRAID -### bool "highpoint raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_ISWRAID -### bool "intel raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_LSIRAID -### bool "lsi raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_VIARAID -### bool "via raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_SILICONRAID -### bool "silicon raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_NVIDIARAID -### bool "nvidia raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -### config FEATURE_VOLUMEID_PROMISERAID -### bool "promise raid" -### default n -### depends on BUSYBOX_VOLUMEID -### help -### TODO - -config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID - bool "linuxraid" - default n - depends on BUSYBOX_VOLUMEID - help - TODO - -endmenu - config BUSYBOX_MOUNT bool "mount" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help All files and filesystems in Unix are arranged into one big directory tree. The 'mount' utility is used to graft a filesystem onto a @@ -742,14 +517,14 @@ config BUSYBOX_MOUNT config BUSYBOX_FEATURE_MOUNT_FAKE bool "Support option -f" - default n + default y depends on BUSYBOX_MOUNT help Enable support for faking a file system mount. config BUSYBOX_FEATURE_MOUNT_VERBOSE bool "Support option -v" - default n + default y depends on BUSYBOX_MOUNT help Enable multi-level -v[vv...] verbose messages. Useful if you @@ -779,13 +554,18 @@ config BUSYBOX_FEATURE_MOUNT_LABEL This also enables label or uuid support for swapon. config BUSYBOX_FEATURE_MOUNT_NFS - bool "Support mounting NFS file systems" - default y + bool "Support mounting NFS file systems on Linux < 2.6.23" + default n depends on BUSYBOX_MOUNT select BUSYBOX_FEATURE_HAVE_RPC select BUSYBOX_FEATURE_SYSLOG help - Enable mounting of NFS file systems. + Enable mounting of NFS file systems on Linux kernels prior + to version 2.6.23. Note that in this case mounting of NFS + over IPv6 will not be possible. + + Note that this option links in RPC support from libc, + which is rather large (~10 kbytes on uclibc). config BUSYBOX_FEATURE_MOUNT_CIFS bool "Support mounting CIFS/SMB file systems" @@ -814,7 +594,7 @@ config BUSYBOX_FEATURE_MOUNT_FSTAB config BUSYBOX_PIVOT_ROOT bool "pivot_root" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The pivot_root utility swaps the mount points for the root filesystem with some other mounted filesystem. This allows you to do all sorts @@ -834,28 +614,22 @@ config BUSYBOX_RDATE systems. config BUSYBOX_RDEV - bool "rdev" - default n - help + bool "rdev" + default n + help Print the device node associated with the filesystem mounted at '/'. config BUSYBOX_READPROFILE bool "readprofile" default n - #depends on BUSYBOX_PLATFORM_LINUX + #select PLATFORM_LINUX help This allows you to parse /proc/profile for basic profiling. -config BUSYBOX_REV - bool "rev" - default n - help - Reverse lines of a file or files. - config BUSYBOX_RTCWAKE bool "rtcwake" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help Enter a system sleep state until specified wakeup time. @@ -875,7 +649,7 @@ config BUSYBOX_SCRIPTREPLAY config BUSYBOX_SETARCH bool "setarch" default n - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help The linux32 utility is used to create a 32bit environment for the specified program (usually a shell). It only makes sense to have @@ -884,8 +658,8 @@ config BUSYBOX_SETARCH config BUSYBOX_SWAPONOFF bool "swaponoff" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help This option enables both the 'swapon' and the 'swapoff' utilities. Once you have created some swap space using 'mkswap', you also need @@ -896,15 +670,15 @@ config BUSYBOX_SWAPONOFF config BUSYBOX_FEATURE_SWAPON_PRI bool "Support priority option -p" - default n + default y depends on BUSYBOX_SWAPONOFF help Enable support for setting swap device priority in swapon. config BUSYBOX_SWITCH_ROOT bool "switch_root" - default n - depends on BUSYBOX_PLATFORM_LINUX + default y + select BUSYBOX_PLATFORM_LINUX help The switch_root utility is used from initramfs to select a new root device. Under initramfs, you have to use this instead of @@ -924,7 +698,7 @@ config BUSYBOX_SWITCH_ROOT config BUSYBOX_UMOUNT bool "umount" default y - depends on BUSYBOX_PLATFORM_LINUX + select BUSYBOX_PLATFORM_LINUX help When you want to remove a mounted filesystem from its current mount point, for example when you are shutting down the system, the @@ -933,7 +707,7 @@ config BUSYBOX_UMOUNT config BUSYBOX_FEATURE_UMOUNT_ALL bool "Support option -a" - default n + default y depends on BUSYBOX_UMOUNT help Support -a option to unmount all currently mounted filesystems. @@ -943,7 +717,7 @@ comment "Common options for mount/umount" config BUSYBOX_FEATURE_MOUNT_LOOP bool "Support loopback mounts" - default n + default y depends on BUSYBOX_MOUNT || BUSYBOX_UMOUNT help Enabling this feature allows automatic mounting of files (containing @@ -994,4 +768,224 @@ config BUSYBOX_FEATURE_MTAB_SUPPORT About the only reason to use this is if you've removed /proc from your kernel. +config BUSYBOX_VOLUMEID + bool #No description makes it a hidden option + default n + +menu "Filesystem/Volume identification" + depends on BUSYBOX_VOLUMEID + +config BUSYBOX_FEATURE_VOLUMEID_EXT + bool "Ext filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_BTRFS + bool "btrfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_REISERFS + bool "Reiser filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_FAT + bool "fat filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_HFS + bool "hfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_JFS + bool "jfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_UFS +### bool "ufs filesystem" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +config BUSYBOX_FEATURE_VOLUMEID_XFS + bool "xfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_NTFS + bool "ntfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_ISO9660 + bool "iso9660 filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_UDF + bool "udf filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_LUKS + bool "luks filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_LINUXSWAP + bool "linux swap filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_LVM +### bool "lvm" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +config BUSYBOX_FEATURE_VOLUMEID_CRAMFS + bool "cramfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HPFS +### bool "hpfs filesystem" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +config BUSYBOX_FEATURE_VOLUMEID_ROMFS + bool "romfs filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +config BUSYBOX_FEATURE_VOLUMEID_SYSV + bool "sysv filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_MINIX +### bool "minix filesystem" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### These only detect partition tables - not used (yet?) +### config FEATURE_VOLUMEID_MAC +### bool "mac filesystem" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO +### +### config FEATURE_VOLUMEID_MSDOS +### bool "msdos filesystem" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +config BUSYBOX_FEATURE_VOLUMEID_OCFS2 + bool "ocfs2 filesystem" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +### config FEATURE_VOLUMEID_HIGHPOINTRAID +### bool "highpoint raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_ISWRAID +### bool "intel raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_LSIRAID +### bool "lsi raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_VIARAID +### bool "via raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_SILICONRAID +### bool "silicon raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_NVIDIARAID +### bool "nvidia raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +### config FEATURE_VOLUMEID_PROMISERAID +### bool "promise raid" +### default y +### depends on BUSYBOX_VOLUMEID +### help +### TODO + +config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID + bool "linuxraid" + default y + depends on BUSYBOX_VOLUMEID + help + TODO + +endmenu + endmenu diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index df391a54f..552618af7 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,18 +1,7 @@ -diff -Nur busybox-1.19.4.orig/Makefile busybox-1.19.4/Makefile ---- busybox-1.19.4.orig/Makefile 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/Makefile 2012-03-17 00:58:08.189100677 +0100 -@@ -465,6 +465,7 @@ - libs-y := \ - archival/ \ - archival/libarchive/ \ -+ archival/libipkg/ \ - console-tools/ \ - coreutils/ \ - coreutils/libcoreutils/ \ -diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config.src ---- busybox-1.19.4.orig/archival/Config.src 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/archival/Config.src 2012-03-17 00:58:08.189100677 +0100 -@@ -202,6 +202,12 @@ +diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src +--- busybox-1.20.2.orig//archival/Config.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/archival/Config.src 2012-08-28 11:57:00.000000000 +0200 +@@ -214,6 +214,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -25,20 +14,9 @@ diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.19.4.orig/archival/Kbuild.src busybox-1.19.4/archival/Kbuild.src ---- busybox-1.19.4.orig/archival/Kbuild.src 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/archival/Kbuild.src 2012-03-17 00:58:08.189100677 +0100 -@@ -22,6 +22,7 @@ - lib-$(CONFIG_LZOP) += lzop.o bbunzip.o - lib-$(CONFIG_GZIP) += gzip.o bbunzip.o - lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o -+lib-$(CONFIG_IPKG) += ipkg.o - - lib-$(CONFIG_UNXZ) += bbunzip.o - lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.19.4.orig/archival/ipkg.c busybox-1.19.4/archival/ipkg.c ---- busybox-1.19.4.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/ipkg.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c +--- busybox-1.20.2.orig//archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/ipkg.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -68,73 +46,39 @@ diff -Nur busybox-1.19.4.orig/archival/ipkg.c busybox-1.19.4/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/Kbuild busybox-1.19.4/archival/libipkg/Kbuild ---- busybox-1.19.4.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/Kbuild 2012-03-17 00:58:08.189100677 +0100 -@@ -0,0 +1,60 @@ -+# Makefile for busybox -+# -+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -+# Copyright (C) 2006 OpenWrt.org -+# -+# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -+ -+LIBIPKG_CORE_OBJS:= \ -+ args.o \ -+ libipkg.o \ -+ user.o \ -+ -+LIBIPKG_CMD_OBJS:= \ -+ ipkg_cmd.o \ -+ ipkg_configure.o \ -+ ipkg_download.o \ -+ ipkg_install.o \ -+ ipkg_remove.o \ -+ ipkg_upgrade.o \ -+ -+LIBIPKG_DB_OBJS:= \ -+ hash_table.o \ -+ ipkg_conf.o \ -+ ipkg_utils.o \ -+ pkg.o \ -+ pkg_depends.o \ -+ pkg_extract.o \ -+ pkg_hash.o \ -+ pkg_parse.o \ -+ pkg_vec.o \ -+ -+LIBIPKG_LIST_OBJS:= \ -+ conffile.o \ -+ conffile_list.o \ -+ nv_pair.o \ -+ nv_pair_list.o \ -+ pkg_dest.o \ -+ pkg_dest_list.o \ -+ pkg_src.o \ -+ pkg_src_list.o \ -+ str_list.o \ -+ void_list.o \ -+ -+LIBIPKG_UTIL_OBJS:= \ -+ file_util.o \ -+ ipkg_message.o \ -+ str_util.o \ -+ xsystem.o \ -+ -+lib-y := -+lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS) -+lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS) -+ -+ifeq ($(strip $(IPKG_ARCH)),) -+IPKG_ARCH:=$(TARGET_ARCH) -+endif -+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.19.4.orig/archival/libipkg/args.c busybox-1.19.4/archival/libipkg/args.c ---- busybox-1.19.4.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/args.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuild.src +--- busybox-1.20.2.orig//archival/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/archival/Kbuild.src 2012-08-28 11:57:01.000000000 +0200 +@@ -22,6 +22,7 @@ + lib-$(CONFIG_LZOP) += lzop.o bbunzip.o + lib-$(CONFIG_GZIP) += gzip.o bbunzip.o + lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o ++lib-$(CONFIG_IPKG) += ipkg.o + + lib-$(CONFIG_UNXZ) += bbunzip.o + lib-$(CONFIG_UNLZMA) += bbunzip.o +diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/archival/libarchive/Kbuild.src +--- busybox-1.20.2.orig//archival/libarchive/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/archival/libarchive/Kbuild.src 2012-08-28 15:10:38.000000000 +0200 +@@ -25,6 +25,7 @@ + \ + data_align.o \ + find_list_entry.o \ ++ get_header_tar_gz.o \ + init_handle.o + + DPKG_FILES:= \ +@@ -32,7 +33,6 @@ + filter_accept_list_reassign.o \ + get_header_ar.o \ + get_header_tar.o \ +- get_header_tar_gz.o \ + get_header_tar_bz2.o \ + get_header_tar_lzma.o \ + +diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/libipkg/args.c +--- busybox-1.20.2.orig//archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/args.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -378,9 +322,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/args.c busybox-1.19.4/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/args.h busybox-1.19.4/archival/libipkg/args.h ---- busybox-1.19.4.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/args.h 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/libipkg/args.h +--- busybox-1.20.2.orig//archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/args.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -454,9 +398,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/args.h busybox-1.19.4/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.c busybox-1.19.4/archival/libipkg/conffile.c ---- busybox-1.19.4.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/conffile.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archival/libipkg/conffile.c +--- busybox-1.20.2.orig//archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/conffile.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -523,9 +467,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.c busybox-1.19.4/archiva + + return ret; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.h busybox-1.19.4/archival/libipkg/conffile.h ---- busybox-1.19.4.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/conffile.h 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archival/libipkg/conffile.h +--- busybox-1.20.2.orig//archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/conffile.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -557,9 +501,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.h busybox-1.19.4/archiva + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.c busybox-1.19.4/archival/libipkg/conffile_list.c ---- busybox-1.19.4.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/conffile_list.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/archival/libipkg/conffile_list.c +--- busybox-1.20.2.orig//archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/conffile_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -608,9 +552,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.c busybox-1.19.4/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.h busybox-1.19.4/archival/libipkg/conffile_list.h ---- busybox-1.19.4.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/conffile_list.h 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/archival/libipkg/conffile_list.h +--- busybox-1.20.2.orig//archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/conffile_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -648,9 +592,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.h busybox-1.19.4/ar + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.c busybox-1.19.4/archival/libipkg/file_util.c ---- busybox-1.19.4.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/file_util.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archival/libipkg/file_util.c +--- busybox-1.20.2.orig//archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/file_util.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -838,9 +782,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.c busybox-1.19.4/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.h busybox-1.19.4/archival/libipkg/file_util.h ---- busybox-1.19.4.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/file_util.h 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archival/libipkg/file_util.h +--- busybox-1.20.2.orig//archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/file_util.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -871,9 +815,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.h busybox-1.19.4/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.c busybox-1.19.4/archival/libipkg/hash_table.c ---- busybox-1.19.4.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/hash_table.c 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/archival/libipkg/hash_table.c +--- busybox-1.20.2.orig//archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/hash_table.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -1030,9 +974,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.c busybox-1.19.4/archi + } +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.h busybox-1.19.4/archival/libipkg/hash_table.h ---- busybox-1.19.4.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/hash_table.h 2012-03-17 00:58:08.189100677 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/archival/libipkg/hash_table.h +--- busybox-1.20.2.orig//archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/hash_table.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1078,82 +1022,10 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.h busybox-1.19.4/archi +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg.h busybox-1.19.4/archival/libipkg/ipkg.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg.h 2012-03-17 00:58:08.189100677 +0100 -@@ -0,0 +1,68 @@ -+/* ipkg.h - the itsy package management system -+ -+ Carl D. Worth -+ -+ Copyright (C) 2001 University of Southern California -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2, or (at -+ your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+*/ -+ -+#ifndef IPKG_H -+#define IPKG_H -+ -+#include "libbb.h" -+ -+#include "ipkg_includes.h" -+#include "ipkg_conf.h" -+#include "ipkg_message.h" -+ -+#define IPKG_PKG_EXTENSION ".ipk" -+#define DPKG_PKG_EXTENSION ".deb" -+ -+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" -+#define IPKG_PKG_VERSION_SEP_CHAR '_' -+ -+#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg" -+#define IPKG_LISTS_DIR_SUFFIX "lists" -+#define IPKG_INFO_DIR_SUFFIX "info" -+#define IPKG_STATUS_FILE_SUFFIX "status" -+ -+#define IPKG_BACKUP_SUFFIX "-ipkg.backup" -+ -+#define IPKG_LIST_DESCRIPTION_LENGTH 128 -+ -+#define IPKG_VERSION "1.00" -+ -+ -+enum ipkg_error { -+ IPKG_SUCCESS = 0, -+ IPKG_PKG_DEPS_UNSATISFIED, -+ IPKG_PKG_IS_ESSENTIAL, -+ IPKG_PKG_HAS_DEPENDENTS, -+ IPKG_PKG_HAS_NO_CANDIDATE -+}; -+typedef enum ipkg_error ipkg_error_t; -+ -+extern int ipkg_state_changed; -+ -+ -+struct errlist { -+ char * errmsg; -+ struct errlist * next; -+} ; -+ -+extern struct errlist* error_list; -+ -+extern ipkg_conf_t *global_conf; -+ -+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; -+ -+#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archival/libipkg/ipkg_cmd.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_cmd.c 2012-03-17 00:58:08.193100680 +0100 -@@ -0,0 +1,1366 @@ +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archival/libipkg/ipkg_cmd.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c 2012-08-28 12:15:11.000000000 +0200 +@@ -0,0 +1,1367 @@ +/* ipkg_cmd.c - the itsy package management system + + Carl D. Worth @@ -1193,7 +1065,7 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archiva +#include "pkg.h" +#include "file_util.h" +#include "str_util.h" -+#include "archive.h" ++#include "bb_archive.h" + +#include <fnmatch.h> + @@ -1392,8 +1264,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archiva + in = fopen (tmp_file_name, "r"); + out = fopen (list_file_name, "w"); + if (in && out) { -+ inflate_unzip_result res; -+ inflate_unzip (&res, 0x8000, fileno(in), fileno(out)); ++ transformer_aux_data_t aux; ++ init_transformer_aux_data(&aux); ++ inflate_unzip (&aux, fileno(in), fileno(out)); + } else + err = 1; + if (in) @@ -2520,9 +2393,10 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archiva +} + + -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.19.4/archival/libipkg/ipkg_cmd.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_cmd.h 2012-03-17 00:58:08.193100680 +0100 +Binary files busybox-1.20.2.orig//archival/libipkg/.ipkg_cmd.c.swp and busybox-1.20.2/archival/libipkg/.ipkg_cmd.c.swp differ +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archival/libipkg/ipkg_cmd.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2565,9 +2439,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.19.4/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c busybox-1.19.4/archival/libipkg/ipkg_conf.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_conf.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archival/libipkg/ipkg_conf.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_conf.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3280,9 +3154,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c busybox-1.19.4/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h busybox-1.19.4/archival/libipkg/ipkg_conf.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_conf.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archival/libipkg/ipkg_conf.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_conf.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3391,9 +3265,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h busybox-1.19.4/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c busybox-1.19.4/archival/libipkg/ipkg_configure.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_configure.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/archival/libipkg/ipkg_configure.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_configure.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3435,9 +3309,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c busybox-1.19.4/a + return 0; +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h busybox-1.19.4/archival/libipkg/ipkg_configure.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_configure.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/archival/libipkg/ipkg_configure.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_configure.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3464,9 +3338,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h busybox-1.19.4/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/archival/libipkg/ipkg_download.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_download.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/archival/libipkg/ipkg_download.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_download.c 2012-08-28 15:00:11.000000000 +0200 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3499,7 +3373,7 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/ar + int err = 0; + + char *src_basec = strdup(src); -+ char *src_base = basename(src_basec); ++ char *src_base = bb_basename(src_basec); + char *tmp_file_location; + char *cmd; + @@ -3614,7 +3488,7 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/ar + || str_starts_with(url, "ftp://")) { + char *tmp_file; + char *file_basec = strdup(url); -+ char *file_base = basename(file_basec); ++ char *file_base = bb_basename(file_basec); + + sprintf_alloc(&tmp_file, "%s/%s", conf->tmp_dir, file_base); + err = ipkg_download(conf, url, tmp_file); @@ -3663,9 +3537,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/ar + } + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.h busybox-1.19.4/archival/libipkg/ipkg_download.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_download.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/archival/libipkg/ipkg_download.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_download.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3697,9 +3571,81 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.h busybox-1.19.4/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_includes.h busybox-1.19.4/archival/libipkg/ipkg_includes.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_includes.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/libipkg/ipkg.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg.h 2012-08-28 11:57:01.000000000 +0200 +@@ -0,0 +1,68 @@ ++/* ipkg.h - the itsy package management system ++ ++ Carl D. Worth ++ ++ Copyright (C) 2001 University of Southern California ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License as ++ published by the Free Software Foundation; either version 2, or (at ++ your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++*/ ++ ++#ifndef IPKG_H ++#define IPKG_H ++ ++#include "libbb.h" ++ ++#include "ipkg_includes.h" ++#include "ipkg_conf.h" ++#include "ipkg_message.h" ++ ++#define IPKG_PKG_EXTENSION ".ipk" ++#define DPKG_PKG_EXTENSION ".deb" ++ ++#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-" ++#define IPKG_PKG_VERSION_SEP_CHAR '_' ++ ++#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg" ++#define IPKG_LISTS_DIR_SUFFIX "lists" ++#define IPKG_INFO_DIR_SUFFIX "info" ++#define IPKG_STATUS_FILE_SUFFIX "status" ++ ++#define IPKG_BACKUP_SUFFIX "-ipkg.backup" ++ ++#define IPKG_LIST_DESCRIPTION_LENGTH 128 ++ ++#define IPKG_VERSION "1.00" ++ ++ ++enum ipkg_error { ++ IPKG_SUCCESS = 0, ++ IPKG_PKG_DEPS_UNSATISFIED, ++ IPKG_PKG_IS_ESSENTIAL, ++ IPKG_PKG_HAS_DEPENDENTS, ++ IPKG_PKG_HAS_NO_CANDIDATE ++}; ++typedef enum ipkg_error ipkg_error_t; ++ ++extern int ipkg_state_changed; ++ ++ ++struct errlist { ++ char * errmsg; ++ struct errlist * next; ++} ; ++ ++extern struct errlist* error_list; ++ ++extern ipkg_conf_t *global_conf; ++ ++typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; ++ ++#endif +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/archival/libipkg/ipkg_includes.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_includes.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3783,9 +3729,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_includes.h busybox-1.19.4/ar +#include <mntent.h> + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.c busybox-1.19.4/archival/libipkg/ipkg_install.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_install.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/archival/libipkg/ipkg_install.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_install.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5769,9 +5715,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.c busybox-1.19.4/arc +} + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.h busybox-1.19.4/archival/libipkg/ipkg_install.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_install.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/archival/libipkg/ipkg_install.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_install.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5808,9 +5754,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.h busybox-1.19.4/arc +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.c busybox-1.19.4/archival/libipkg/ipkg_message.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_message.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/archival/libipkg/ipkg_message.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_message.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5847,9 +5793,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.c busybox-1.19.4/arc + ipkg_cb_message(conf,level,ts); + } +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.h busybox-1.19.4/archival/libipkg/ipkg_message.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_message.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/archival/libipkg/ipkg_message.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_message.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5883,9 +5829,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.h busybox-1.19.4/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.c busybox-1.19.4/archival/libipkg/ipkg_remove.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_remove.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/archival/libipkg/ipkg_remove.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_remove.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6272,9 +6218,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.c busybox-1.19.4/arch + + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.h busybox-1.19.4/archival/libipkg/ipkg_remove.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_remove.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/archival/libipkg/ipkg_remove.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_remove.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6309,9 +6255,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.h busybox-1.19.4/arch + + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.c busybox-1.19.4/archival/libipkg/ipkg_upgrade.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_upgrade.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/archival/libipkg/ipkg_upgrade.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6392,9 +6338,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.c busybox-1.19.4/arc + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.h busybox-1.19.4/archival/libipkg/ipkg_upgrade.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_upgrade.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/archival/libipkg/ipkg_upgrade.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6414,9 +6360,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.h busybox-1.19.4/arc +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.c busybox-1.19.4/archival/libipkg/ipkg_utils.c ---- busybox-1.19.4.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_utils.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/archival/libipkg/ipkg_utils.c +--- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_utils.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6603,9 +6549,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.c busybox-1.19.4/archi +} + + -diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.h busybox-1.19.4/archival/libipkg/ipkg_utils.h ---- busybox-1.19.4.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/ipkg_utils.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/archival/libipkg/ipkg_utils.h +--- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/ipkg_utils.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6636,9 +6582,73 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.h busybox-1.19.4/archi +int line_is_blank(const char *line); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.c busybox-1.19.4/archival/libipkg/libipkg.c ---- busybox-1.19.4.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/libipkg.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/libipkg/Kbuild +--- busybox-1.20.2.orig//archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/Kbuild 2012-08-28 11:57:01.000000000 +0200 +@@ -0,0 +1,60 @@ ++# Makefile for busybox ++# ++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> ++# Copyright (C) 2006 OpenWrt.org ++# ++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. ++ ++LIBIPKG_CORE_OBJS:= \ ++ args.o \ ++ libipkg.o \ ++ user.o \ ++ ++LIBIPKG_CMD_OBJS:= \ ++ ipkg_cmd.o \ ++ ipkg_configure.o \ ++ ipkg_download.o \ ++ ipkg_install.o \ ++ ipkg_remove.o \ ++ ipkg_upgrade.o \ ++ ++LIBIPKG_DB_OBJS:= \ ++ hash_table.o \ ++ ipkg_conf.o \ ++ ipkg_utils.o \ ++ pkg.o \ ++ pkg_depends.o \ ++ pkg_extract.o \ ++ pkg_hash.o \ ++ pkg_parse.o \ ++ pkg_vec.o \ ++ ++LIBIPKG_LIST_OBJS:= \ ++ conffile.o \ ++ conffile_list.o \ ++ nv_pair.o \ ++ nv_pair_list.o \ ++ pkg_dest.o \ ++ pkg_dest_list.o \ ++ pkg_src.o \ ++ pkg_src_list.o \ ++ str_list.o \ ++ void_list.o \ ++ ++LIBIPKG_UTIL_OBJS:= \ ++ file_util.o \ ++ ipkg_message.o \ ++ str_util.o \ ++ xsystem.o \ ++ ++lib-y := ++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS) ++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS) ++ ++ifeq ($(strip $(IPKG_ARCH)),) ++IPKG_ARCH:=$(TARGET_ARCH) ++endif ++CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" +diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archival/libipkg/libipkg.c +--- busybox-1.20.2.orig//archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/libipkg.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7223,9 +7233,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.c busybox-1.19.4/archival + + return err; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.h busybox-1.19.4/archival/libipkg/libipkg.h ---- busybox-1.19.4.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/libipkg.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archival/libipkg/libipkg.h +--- busybox-1.20.2.orig//archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/libipkg.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7305,9 +7315,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.h busybox-1.19.4/archival +extern void free_error_list(struct errlist **errors); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.c busybox-1.19.4/archival/libipkg/nv_pair.c ---- busybox-1.19.4.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/nv_pair.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archival/libipkg/nv_pair.c +--- busybox-1.20.2.orig//archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/nv_pair.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7349,9 +7359,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.c busybox-1.19.4/archival +} + + -diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.h busybox-1.19.4/archival/libipkg/nv_pair.h ---- busybox-1.19.4.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/nv_pair.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archival/libipkg/nv_pair.h +--- busybox-1.20.2.orig//archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/nv_pair.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7385,9 +7395,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.h busybox-1.19.4/archival + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.c busybox-1.19.4/archival/libipkg/nv_pair_list.c ---- busybox-1.19.4.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/nv_pair_list.c 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/archival/libipkg/nv_pair_list.c +--- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/nv_pair_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7487,9 +7497,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.c busybox-1.19.4/arc + } + return NULL; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.h busybox-1.19.4/archival/libipkg/nv_pair_list.h ---- busybox-1.19.4.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/nv_pair_list.h 2012-03-17 00:58:08.193100680 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/archival/libipkg/nv_pair_list.h +--- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/nv_pair_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7551,9 +7561,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.h busybox-1.19.4/arc + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg.c busybox-1.19.4/archival/libipkg/pkg.c ---- busybox-1.19.4.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/libipkg/pkg.c +--- busybox-1.20.2.orig//archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9312,242 +9322,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg.c busybox-1.19.4/archival/lib + } + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg.h busybox-1.19.4/archival/libipkg/pkg.h ---- busybox-1.19.4.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg.h 2012-03-17 00:58:08.197100679 +0100 -@@ -0,0 +1,229 @@ -+/* pkg.h - the itsy package management system -+ -+ Carl D. Worth -+ -+ Copyright (C) 2001 University of Southern California -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2, or (at -+ your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+*/ -+ -+#ifndef PKG_H -+#define PKG_H -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+ -+#include "pkg_vec.h" -+#include "str_list.h" -+#include "pkg_src.h" -+#include "pkg_dest.h" -+#include "ipkg_conf.h" -+#include "conffile_list.h" -+ -+struct ipkg_conf; -+ -+/* I think "Size" is currently the shortest field name */ -+#define PKG_MINIMUM_FIELD_NAME_LEN 4 -+ -+enum pkg_state_want -+{ -+ SW_UNKNOWN = 1, -+ SW_INSTALL, -+ SW_DEINSTALL, -+ SW_PURGE, -+ SW_LAST_STATE_WANT -+}; -+typedef enum pkg_state_want pkg_state_want_t; -+ -+enum pkg_state_flag -+{ -+ SF_OK = 0, -+ SF_REINSTREQ = 1, -+ SF_HOLD = 2, /* do not upgrade version */ -+ SF_REPLACE = 4, /* replace this package */ -+ SF_NOPRUNE = 8, /* do not remove obsolete files */ -+ SF_PREFER = 16, /* prefer this version */ -+ SF_OBSOLETE = 32, /* old package in upgrade pair */ -+ SF_MARKED = 64, /* temporary mark */ -+ SF_FILELIST_CHANGED = 128, /* needs filelist written */ -+ SF_USER = 256, -+ SF_LAST_STATE_FLAG -+}; -+typedef enum pkg_state_flag pkg_state_flag_t; -+#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER) -+ -+enum pkg_state_status -+{ -+ SS_NOT_INSTALLED = 1, -+ SS_UNPACKED, -+ SS_HALF_CONFIGURED, -+ SS_INSTALLED, -+ SS_HALF_INSTALLED, -+ SS_CONFIG_FILES, -+ SS_POST_INST_FAILED, -+ SS_REMOVAL_FAILED, -+ SS_LAST_STATE_STATUS -+}; -+typedef enum pkg_state_status pkg_state_status_t; -+ -+struct abstract_pkg{ -+ char * name; -+ int dependencies_checked; -+ pkg_vec_t * pkgs; -+ pkg_state_status_t state_status; -+ pkg_state_flag_t state_flag; -+ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */ -+ abstract_pkg_vec_t * provided_by; -+ abstract_pkg_vec_t * replaced_by; -+}; -+ -+#include "pkg_depends.h" -+ -+/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways: -+ -+ The 3 version fields should go into a single version struct. (This -+ is especially important since, currently, pkg->version can easily -+ be mistaken for pkg_verson_str_alloc(pkg) although they are very -+ distinct. This has been the source of multiple bugs. -+ -+ The 3 state fields could possibly also go into their own struct. -+ -+ All fields which deal with lists of packages, (Depends, -+ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each -+ be handled by a single struct in pkg_t -+ -+ All string fields for which there is a small set of possible -+ values, (section, maintainer, architecture, maybe version?), that -+ are reused among different packages -- for all such packages we -+ should move from "char *"s to some atom datatype to share data -+ storage and use less memory. We might even do reference counting, -+ but probably not since most often we only create new pkg_t structs, -+ we don't often free them. */ -+struct pkg -+{ -+ char *name; -+ unsigned long epoch; -+ char *version; -+ char *revision; -+ char *familiar_revision; -+ pkg_src_t *src; -+ pkg_dest_t *dest; -+ char *architecture; -+ char *section; -+ char *maintainer; -+ char *description; -+ pkg_state_want_t state_want; -+ pkg_state_flag_t state_flag; -+ pkg_state_status_t state_status; -+ char **depends_str; -+ int depends_count; -+ char **pre_depends_str; -+ int pre_depends_count; -+ char **recommends_str; -+ int recommends_count; -+ char **suggests_str; -+ int suggests_count; -+ compound_depend_t * depends; -+ -+ /* Abhaya: new conflicts */ -+ char **conflicts_str; -+ compound_depend_t * conflicts; -+ int conflicts_count; -+ -+ char **replaces_str; -+ int replaces_count; -+ abstract_pkg_t ** replaces; -+ -+ char **provides_str; -+ int provides_count; -+ abstract_pkg_t ** provides; -+ -+ abstract_pkg_t *parent; -+ -+ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */ -+ -+ char *filename; -+ char *local_filename; -+ char *url; -+ char *tmp_unpack_dir; -+ char *md5sum; -+ char *size; -+ char *installed_size; -+ char *priority; -+ char *source; -+ conffile_list_t conffiles; -+ time_t installed_time; -+ /* As pointer for lazy evaluation */ -+ str_list_t *installed_files; -+ /* XXX: CLEANUP: I'd like to perhaps come up with a better -+ mechanism to avoid the problem here, (which is that the -+ installed_files list was being freed from an inner loop while -+ still being used within an outer loop. */ -+ int installed_files_ref_cnt; -+ int essential; -+ int arch_priority; -+/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */ -+ int provided_by_hand; -+}; -+ -+pkg_t *pkg_new(void); -+int pkg_init(pkg_t *pkg); -+void pkg_deinit(pkg_t *pkg); -+int pkg_init_from_file(pkg_t *pkg, const char *filename); -+abstract_pkg_t *abstract_pkg_new(void); -+int abstract_pkg_init(abstract_pkg_t *ab_pkg); -+ -+/* -+ * merges fields from newpkg into oldpkg. -+ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero -+ */ -+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status); -+ -+char *pkg_version_str_alloc(pkg_t *pkg); -+ -+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); -+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b); -+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b); -+ -+char * pkg_formatted_info(pkg_t *pkg ); -+char * pkg_formatted_field(pkg_t *pkg, const char *field ); -+ -+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg); -+ -+void pkg_print_info(pkg_t *pkg, FILE *file); -+void pkg_print_status(pkg_t * pkg, FILE * file); -+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field); -+str_list_t *pkg_get_installed_files(pkg_t *pkg); -+int pkg_free_installed_files(pkg_t *pkg); -+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg); -+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name); -+int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg, -+ const char *script, const char *args); -+ -+/* enum mappings */ -+char *pkg_state_want_to_str(pkg_state_want_t sw); -+pkg_state_want_t pkg_state_want_from_str(char *str); -+char *pkg_state_flag_to_str(pkg_state_flag_t sf); -+pkg_state_flag_t pkg_state_flag_from_str(char *str); -+char *pkg_state_status_to_str(pkg_state_status_t ss); -+pkg_state_status_t pkg_state_status_from_str(char *str); -+ -+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op); -+ -+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg); -+int pkg_info_preinstall_check(ipkg_conf_t *conf); -+int pkg_free_installed_files(pkg_t *pkg); -+ -+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg); -+int pkg_write_changed_filelists(ipkg_conf_t *conf); -+ -+#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.c busybox-1.19.4/archival/libipkg/pkg_depends.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_depends.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/archival/libipkg/pkg_depends.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_depends.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10581,9 +10358,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.c busybox-1.19.4/arch + + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.h busybox-1.19.4/archival/libipkg/pkg_depends.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_depends.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/archival/libipkg/pkg_depends.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_depends.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10690,9 +10467,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.h busybox-1.19.4/arch +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.c busybox-1.19.4/archival/libipkg/pkg_dest.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_dest.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archival/libipkg/pkg_dest.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_dest.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10786,9 +10563,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.c busybox-1.19.4/archiva + + dest->root_dir = NULL; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.h busybox-1.19.4/archival/libipkg/pkg_dest.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_dest.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archival/libipkg/pkg_dest.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_dest.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10828,9 +10605,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.h busybox-1.19.4/archiva + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.c busybox-1.19.4/archival/libipkg/pkg_dest_list.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_dest_list.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/archival/libipkg/pkg_dest_list.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10917,9 +10694,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.c busybox-1.19.4/ar +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.h busybox-1.19.4/archival/libipkg/pkg_dest_list.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_dest_list.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/archival/libipkg/pkg_dest_list.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10971,9 +10748,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.h busybox-1.19.4/ar + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.c busybox-1.19.4/archival/libipkg/pkg_extract.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_extract.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/archival/libipkg/pkg_extract.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_extract.c 2012-08-28 11:58:04.000000000 +0200 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11002,7 +10779,7 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.c busybox-1.19.4/arch +#include "libbb.h" +#include "file_util.h" +#include "sprintf_alloc.h" -+#include "archive.h" ++#include "bb_archive.h" + +#define IPKG_CONTROL_ARCHIVE "control.tar.gz" +#define IPKG_DATA_ARCHIVE "data.tar.gz" @@ -11230,9 +11007,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.c busybox-1.19.4/arch + + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.h busybox-1.19.4/archival/libipkg/pkg_extract.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_extract.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/archival/libipkg/pkg_extract.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_extract.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11266,9 +11043,242 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.h busybox-1.19.4/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.c busybox-1.19.4/archival/libipkg/pkg_hash.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_hash.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/libipkg/pkg.h +--- busybox-1.20.2.orig//archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg.h 2012-08-28 11:57:01.000000000 +0200 +@@ -0,0 +1,229 @@ ++/* pkg.h - the itsy package management system ++ ++ Carl D. Worth ++ ++ Copyright (C) 2001 University of Southern California ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License as ++ published by the Free Software Foundation; either version 2, or (at ++ your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++*/ ++ ++#ifndef PKG_H ++#define PKG_H ++ ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ ++#include "pkg_vec.h" ++#include "str_list.h" ++#include "pkg_src.h" ++#include "pkg_dest.h" ++#include "ipkg_conf.h" ++#include "conffile_list.h" ++ ++struct ipkg_conf; ++ ++/* I think "Size" is currently the shortest field name */ ++#define PKG_MINIMUM_FIELD_NAME_LEN 4 ++ ++enum pkg_state_want ++{ ++ SW_UNKNOWN = 1, ++ SW_INSTALL, ++ SW_DEINSTALL, ++ SW_PURGE, ++ SW_LAST_STATE_WANT ++}; ++typedef enum pkg_state_want pkg_state_want_t; ++ ++enum pkg_state_flag ++{ ++ SF_OK = 0, ++ SF_REINSTREQ = 1, ++ SF_HOLD = 2, /* do not upgrade version */ ++ SF_REPLACE = 4, /* replace this package */ ++ SF_NOPRUNE = 8, /* do not remove obsolete files */ ++ SF_PREFER = 16, /* prefer this version */ ++ SF_OBSOLETE = 32, /* old package in upgrade pair */ ++ SF_MARKED = 64, /* temporary mark */ ++ SF_FILELIST_CHANGED = 128, /* needs filelist written */ ++ SF_USER = 256, ++ SF_LAST_STATE_FLAG ++}; ++typedef enum pkg_state_flag pkg_state_flag_t; ++#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER) ++ ++enum pkg_state_status ++{ ++ SS_NOT_INSTALLED = 1, ++ SS_UNPACKED, ++ SS_HALF_CONFIGURED, ++ SS_INSTALLED, ++ SS_HALF_INSTALLED, ++ SS_CONFIG_FILES, ++ SS_POST_INST_FAILED, ++ SS_REMOVAL_FAILED, ++ SS_LAST_STATE_STATUS ++}; ++typedef enum pkg_state_status pkg_state_status_t; ++ ++struct abstract_pkg{ ++ char * name; ++ int dependencies_checked; ++ pkg_vec_t * pkgs; ++ pkg_state_status_t state_status; ++ pkg_state_flag_t state_flag; ++ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */ ++ abstract_pkg_vec_t * provided_by; ++ abstract_pkg_vec_t * replaced_by; ++}; ++ ++#include "pkg_depends.h" ++ ++/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways: ++ ++ The 3 version fields should go into a single version struct. (This ++ is especially important since, currently, pkg->version can easily ++ be mistaken for pkg_verson_str_alloc(pkg) although they are very ++ distinct. This has been the source of multiple bugs. ++ ++ The 3 state fields could possibly also go into their own struct. ++ ++ All fields which deal with lists of packages, (Depends, ++ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each ++ be handled by a single struct in pkg_t ++ ++ All string fields for which there is a small set of possible ++ values, (section, maintainer, architecture, maybe version?), that ++ are reused among different packages -- for all such packages we ++ should move from "char *"s to some atom datatype to share data ++ storage and use less memory. We might even do reference counting, ++ but probably not since most often we only create new pkg_t structs, ++ we don't often free them. */ ++struct pkg ++{ ++ char *name; ++ unsigned long epoch; ++ char *version; ++ char *revision; ++ char *familiar_revision; ++ pkg_src_t *src; ++ pkg_dest_t *dest; ++ char *architecture; ++ char *section; ++ char *maintainer; ++ char *description; ++ pkg_state_want_t state_want; ++ pkg_state_flag_t state_flag; ++ pkg_state_status_t state_status; ++ char **depends_str; ++ int depends_count; ++ char **pre_depends_str; ++ int pre_depends_count; ++ char **recommends_str; ++ int recommends_count; ++ char **suggests_str; ++ int suggests_count; ++ compound_depend_t * depends; ++ ++ /* Abhaya: new conflicts */ ++ char **conflicts_str; ++ compound_depend_t * conflicts; ++ int conflicts_count; ++ ++ char **replaces_str; ++ int replaces_count; ++ abstract_pkg_t ** replaces; ++ ++ char **provides_str; ++ int provides_count; ++ abstract_pkg_t ** provides; ++ ++ abstract_pkg_t *parent; ++ ++ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */ ++ ++ char *filename; ++ char *local_filename; ++ char *url; ++ char *tmp_unpack_dir; ++ char *md5sum; ++ char *size; ++ char *installed_size; ++ char *priority; ++ char *source; ++ conffile_list_t conffiles; ++ time_t installed_time; ++ /* As pointer for lazy evaluation */ ++ str_list_t *installed_files; ++ /* XXX: CLEANUP: I'd like to perhaps come up with a better ++ mechanism to avoid the problem here, (which is that the ++ installed_files list was being freed from an inner loop while ++ still being used within an outer loop. */ ++ int installed_files_ref_cnt; ++ int essential; ++ int arch_priority; ++/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */ ++ int provided_by_hand; ++}; ++ ++pkg_t *pkg_new(void); ++int pkg_init(pkg_t *pkg); ++void pkg_deinit(pkg_t *pkg); ++int pkg_init_from_file(pkg_t *pkg, const char *filename); ++abstract_pkg_t *abstract_pkg_new(void); ++int abstract_pkg_init(abstract_pkg_t *ab_pkg); ++ ++/* ++ * merges fields from newpkg into oldpkg. ++ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero ++ */ ++int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status); ++ ++char *pkg_version_str_alloc(pkg_t *pkg); ++ ++int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); ++int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b); ++int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b); ++ ++char * pkg_formatted_info(pkg_t *pkg ); ++char * pkg_formatted_field(pkg_t *pkg, const char *field ); ++ ++void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg); ++ ++void pkg_print_info(pkg_t *pkg, FILE *file); ++void pkg_print_status(pkg_t * pkg, FILE * file); ++void pkg_print_field(pkg_t *pkg, FILE *file, const char *field); ++str_list_t *pkg_get_installed_files(pkg_t *pkg); ++int pkg_free_installed_files(pkg_t *pkg); ++int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg); ++conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name); ++int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg, ++ const char *script, const char *args); ++ ++/* enum mappings */ ++char *pkg_state_want_to_str(pkg_state_want_t sw); ++pkg_state_want_t pkg_state_want_from_str(char *str); ++char *pkg_state_flag_to_str(pkg_state_flag_t sf); ++pkg_state_flag_t pkg_state_flag_from_str(char *str); ++char *pkg_state_status_to_str(pkg_state_status_t ss); ++pkg_state_status_t pkg_state_status_from_str(char *str); ++ ++int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op); ++ ++int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg); ++int pkg_info_preinstall_check(ipkg_conf_t *conf); ++int pkg_free_installed_files(pkg_t *pkg); ++ ++int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg); ++int pkg_write_changed_filelists(ipkg_conf_t *conf); ++ ++#endif +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archival/libipkg/pkg_hash.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_hash.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11893,9 +11903,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.c busybox-1.19.4/archiva +} + + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.h busybox-1.19.4/archival/libipkg/pkg_hash.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_hash.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archival/libipkg/pkg_hash.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_hash.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11958,9 +11968,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.h busybox-1.19.4/archiva + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.c busybox-1.19.4/archival/libipkg/pkg_parse.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_parse.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archival/libipkg/pkg_parse.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_parse.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12330,9 +12340,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.c busybox-1.19.4/archiv + + return 0; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.h busybox-1.19.4/archival/libipkg/pkg_parse.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_parse.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archival/libipkg/pkg_parse.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_parse.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12365,9 +12375,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.h busybox-1.19.4/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.c busybox-1.19.4/archival/libipkg/pkg_src.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_src.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archival/libipkg/pkg_src.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_src.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12412,9 +12422,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.c busybox-1.19.4/archival +} + + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.h busybox-1.19.4/archival/libipkg/pkg_src.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_src.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archival/libipkg/pkg_src.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_src.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12450,9 +12460,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.h busybox-1.19.4/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.c busybox-1.19.4/archival/libipkg/pkg_src_list.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_src_list.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/archival/libipkg/pkg_src_list.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_src_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12529,9 +12539,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.c busybox-1.19.4/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.h busybox-1.19.4/archival/libipkg/pkg_src_list.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_src_list.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/archival/libipkg/pkg_src_list.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_src_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12590,9 +12600,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.h busybox-1.19.4/arc + +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.c busybox-1.19.4/archival/libipkg/pkg_vec.c ---- busybox-1.19.4.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_vec.c 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archival/libipkg/pkg_vec.c +--- busybox-1.20.2.orig//archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_vec.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12825,9 +12835,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.c busybox-1.19.4/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.h busybox-1.19.4/archival/libipkg/pkg_vec.h ---- busybox-1.19.4.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/pkg_vec.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archival/libipkg/pkg_vec.h +--- busybox-1.20.2.orig//archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/pkg_vec.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12891,9 +12901,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.h busybox-1.19.4/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.19.4.orig/archival/libipkg/sprintf_alloc.h busybox-1.19.4/archival/libipkg/sprintf_alloc.h ---- busybox-1.19.4.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/sprintf_alloc.h 2012-03-17 00:58:08.197100679 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/archival/libipkg/sprintf_alloc.h +--- busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12920,9 +12930,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/sprintf_alloc.h busybox-1.19.4/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.c busybox-1.19.4/archival/libipkg/str_list.c ---- busybox-1.19.4.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/str_list.c 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archival/libipkg/str_list.c +--- busybox-1.20.2.orig//archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/str_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13000,9 +13010,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.c busybox-1.19.4/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.h busybox-1.19.4/archival/libipkg/str_list.h ---- busybox-1.19.4.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/str_list.h 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archival/libipkg/str_list.h +--- busybox-1.20.2.orig//archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/str_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13055,9 +13065,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.h busybox-1.19.4/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.c busybox-1.19.4/archival/libipkg/str_util.c ---- busybox-1.19.4.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/str_util.c 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archival/libipkg/str_util.c +--- busybox-1.20.2.orig//archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/str_util.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13128,9 +13138,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.c busybox-1.19.4/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.h busybox-1.19.4/archival/libipkg/str_util.h ---- busybox-1.19.4.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/str_util.h 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archival/libipkg/str_util.h +--- busybox-1.20.2.orig//archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/str_util.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13159,9 +13169,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.h busybox-1.19.4/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/user.c busybox-1.19.4/archival/libipkg/user.c ---- busybox-1.19.4.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/user.c 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/libipkg/user.c +--- busybox-1.20.2.orig//archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/user.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13212,9 +13222,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/user.c busybox-1.19.4/archival/li + + return response; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/user.h busybox-1.19.4/archival/libipkg/user.h ---- busybox-1.19.4.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/user.h 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/libipkg/user.h +--- busybox-1.20.2.orig//archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/user.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13239,9 +13249,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/user.h busybox-1.19.4/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.c busybox-1.19.4/archival/libipkg/void_list.c ---- busybox-1.19.4.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/void_list.c 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archival/libipkg/void_list.c +--- busybox-1.20.2.orig//archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/void_list.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13437,9 +13447,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.c busybox-1.19.4/archiv + else + return NULL; +} -diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.h busybox-1.19.4/archival/libipkg/void_list.h ---- busybox-1.19.4.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/void_list.h 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archival/libipkg/void_list.h +--- busybox-1.20.2.orig//archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/void_list.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13500,9 +13510,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.h busybox-1.19.4/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.c busybox-1.19.4/archival/libipkg/xsystem.c ---- busybox-1.19.4.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/xsystem.c 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archival/libipkg/xsystem.c +--- busybox-1.20.2.orig//archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/xsystem.c 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13568,9 +13578,9 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.c busybox-1.19.4/archival + return -1; +} + -diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.h busybox-1.19.4/archival/libipkg/xsystem.h ---- busybox-1.19.4.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.19.4/archival/libipkg/xsystem.h 2012-03-17 00:58:08.201100676 +0100 +diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archival/libipkg/xsystem.h +--- busybox-1.20.2.orig//archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.20.2/archival/libipkg/xsystem.h 2012-08-28 11:57:01.000000000 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13606,10 +13616,10 @@ diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.h busybox-1.19.4/archival + +#endif + -diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/applets.src.h ---- busybox-1.19.4.orig/include/applets.src.h 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/include/applets.src.h 2012-03-17 00:58:53.526834671 +0100 -@@ -200,6 +200,7 @@ +diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h +--- busybox-1.20.2.orig//include/applets.src.h 2012-07-02 16:08:25.000000000 +0200 ++++ busybox-1.20.2/include/applets.src.h 2012-08-28 11:57:01.000000000 +0200 +@@ -199,6 +199,7 @@ IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP)) @@ -13617,10 +13627,10 @@ diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/apple IF_IPLINK(APPLET(iplink, BB_DIR_BIN, BB_SUID_DROP)) IF_IPROUTE(APPLET(iproute, BB_DIR_BIN, BB_SUID_DROP)) IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP)) -diff -Nur busybox-1.19.4.orig/include/archive.h busybox-1.19.4/include/archive.h ---- busybox-1.19.4.orig/include/archive.h 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/include/archive.h 2012-03-17 00:58:08.201100676 +0100 -@@ -96,7 +96,7 @@ +diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_archive.h +--- busybox-1.20.2.orig//include/bb_archive.h 2012-07-02 16:08:25.000000000 +0200 ++++ busybox-1.20.2/include/bb_archive.h 2012-08-28 11:57:01.000000000 +0200 +@@ -98,7 +98,7 @@ struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; #endif @@ -13629,9 +13639,9 @@ diff -Nur busybox-1.19.4.orig/include/archive.h busybox-1.19.4/include/archive.h /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.19.4.orig/include/usage.src.h busybox-1.19.4/include/usage.src.h ---- busybox-1.19.4.orig/include/usage.src.h 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/include/usage.src.h 2012-03-17 01:01:02.169888238 +0100 +diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.src.h +--- busybox-1.20.2.orig//include/usage.src.h 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/include/usage.src.h 2012-08-28 11:57:01.000000000 +0200 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13713,3 +13723,14 @@ diff -Nur busybox-1.19.4.orig/include/usage.src.h busybox-1.19.4/include/usage.s + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + #endif +diff -Nur busybox-1.20.2.orig//Makefile busybox-1.20.2/Makefile +--- busybox-1.20.2.orig//Makefile 2012-07-02 16:20:27.000000000 +0200 ++++ busybox-1.20.2/Makefile 2012-08-28 11:57:01.000000000 +0200 +@@ -465,6 +465,7 @@ + libs-y := \ + archival/ \ + archival/libarchive/ \ ++ archival/libipkg/ \ + console-tools/ \ + coreutils/ \ + coreutils/libcoreutils/ \ diff --git a/package/busybox/patches/003-defaults.patch b/package/busybox/patches/003-defaults.patch index 2592dc04c..826a0a1a7 100644 --- a/package/busybox/patches/003-defaults.patch +++ b/package/busybox/patches/003-defaults.patch @@ -1,27 +1,6 @@ -diff -Nur busybox-1.19.4.orig/Config.in busybox-1.19.4/Config.in ---- busybox-1.19.4.orig/Config.in 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/Config.in 2012-03-20 16:07:34.206229130 +0100 -@@ -15,7 +15,7 @@ - - config DESKTOP - bool "Enable options for full-blown desktop systems" -- default y -+ default n - help - Enable options and features which are not essential. - Select this only if you plan to use busybox on full-blown -@@ -32,7 +32,7 @@ - - config INCLUDE_SUSv2 - bool "Enable obsolete features removed before SUSv3" -- default y -+ default n - help - This option will enable backwards compatibility with SuSv2, - specifically, old-style numeric options ('command -1 <file>') -diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config.src ---- busybox-1.19.4.orig/archival/Config.src 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/archival/Config.src 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src +--- busybox-1.20.2.orig//archival/Config.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/archival/Config.src 2012-08-28 11:52:12.000000000 +0200 @@ -79,7 +79,7 @@ config BUNZIP2 @@ -49,7 +28,7 @@ diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config help cpio is an archival utility program used to create, modify, and extract contents from archives. -@@ -204,19 +204,19 @@ +@@ -216,19 +216,19 @@ config RPM2CPIO bool "rpm2cpio" @@ -72,7 +51,7 @@ diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config help tar is an archiving program. It's commonly used with gzip to create compressed archives. It's probably the most widely used -@@ -323,7 +323,7 @@ +@@ -335,7 +335,7 @@ config UNLZMA bool "unlzma" @@ -81,7 +60,7 @@ diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config help unlzma is a compression utility using the Lempel-Ziv-Markov chain compression algorithm, and range coding. Compression -@@ -354,7 +354,7 @@ +@@ -363,7 +363,7 @@ config UNXZ bool "unxz" @@ -90,9 +69,30 @@ diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config help unxz is a unlzma successor. -diff -Nur busybox-1.19.4.orig/editors/Config.src busybox-1.19.4/editors/Config.src ---- busybox-1.19.4.orig/editors/Config.src 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/editors/Config.src 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//Config.in busybox-1.20.2/Config.in +--- busybox-1.20.2.orig//Config.in 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/Config.in 2012-08-28 11:52:12.000000000 +0200 +@@ -15,7 +15,7 @@ + + config DESKTOP + bool "Enable options for full-blown desktop systems" +- default y ++ default n + help + Enable options and features which are not essential. + Select this only if you plan to use busybox on full-blown +@@ -32,7 +32,7 @@ + + config INCLUDE_SUSv2 + bool "Enable obsolete features removed before SUSv3" +- default y ++ default n + help + This option will enable backwards compatibility with SuSv2, + specifically, old-style numeric options ('command -1 <file>') +diff -Nur busybox-1.20.2.orig//editors/Config.src busybox-1.20.2/editors/Config.src +--- busybox-1.20.2.orig//editors/Config.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/editors/Config.src 2012-08-28 11:52:12.000000000 +0200 @@ -31,7 +31,7 @@ config DIFF @@ -111,9 +111,9 @@ diff -Nur busybox-1.19.4.orig/editors/Config.src busybox-1.19.4/editors/Config.s help sed is used to perform text transformations on a file or input from a pipeline. -diff -Nur busybox-1.19.4.orig/editors/patch.c busybox-1.19.4/editors/patch.c ---- busybox-1.19.4.orig/editors/patch.c 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/editors/patch.c 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//editors/patch.c busybox-1.20.2/editors/patch.c +--- busybox-1.20.2.orig//editors/patch.c 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/editors/patch.c 2012-08-28 11:52:12.000000000 +0200 @@ -24,7 +24,7 @@ //config:config PATCH @@ -123,9 +123,9 @@ diff -Nur busybox-1.19.4.orig/editors/patch.c busybox-1.19.4/editors/patch.c //config: help //config: Apply a unified diff formatted patch. -diff -Nur busybox-1.19.4.orig/findutils/find.c busybox-1.19.4/findutils/find.c ---- busybox-1.19.4.orig/findutils/find.c 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/findutils/find.c 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//findutils/find.c busybox-1.20.2/findutils/find.c +--- busybox-1.20.2.orig//findutils/find.c 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/findutils/find.c 2012-08-28 11:52:12.000000000 +0200 @@ -55,7 +55,7 @@ //config:config FIND @@ -135,9 +135,9 @@ diff -Nur busybox-1.19.4.orig/findutils/find.c busybox-1.19.4/findutils/find.c //config: help //config: find is used to search your system to find specified files. //config: -diff -Nur busybox-1.19.4.orig/findutils/grep.c busybox-1.19.4/findutils/grep.c ---- busybox-1.19.4.orig/findutils/grep.c 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/findutils/grep.c 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//findutils/grep.c busybox-1.20.2/findutils/grep.c +--- busybox-1.20.2.orig//findutils/grep.c 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/findutils/grep.c 2012-08-28 11:52:12.000000000 +0200 @@ -26,7 +26,7 @@ //config:config GREP @@ -147,10 +147,10 @@ diff -Nur busybox-1.19.4.orig/findutils/grep.c busybox-1.19.4/findutils/grep.c //config: help //config: grep is used to search files for a specified pattern. //config: -diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/applets.src.h ---- busybox-1.19.4.orig/include/applets.src.h 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/include/applets.src.h 2012-03-20 16:12:28.806228451 +0100 -@@ -244,9 +244,9 @@ +diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h +--- busybox-1.20.2.orig//include/applets.src.h 2012-07-02 16:08:25.000000000 +0200 ++++ busybox-1.20.2/include/applets.src.h 2012-08-28 11:52:12.000000000 +0200 +@@ -242,9 +242,9 @@ IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) @@ -162,9 +162,9 @@ diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/apple //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3)) IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix)) IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser)) -diff -Nur busybox-1.19.4.orig/miscutils/Config.src busybox-1.19.4/miscutils/Config.src ---- busybox-1.19.4.orig/miscutils/Config.src 2012-02-04 20:24:55.000000000 +0100 -+++ busybox-1.19.4/miscutils/Config.src 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//miscutils/Config.src busybox-1.20.2/miscutils/Config.src +--- busybox-1.20.2.orig//miscutils/Config.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/miscutils/Config.src 2012-08-28 11:52:12.000000000 +0200 @@ -362,7 +362,7 @@ config HDPARM @@ -183,9 +183,9 @@ diff -Nur busybox-1.19.4.orig/miscutils/Config.src busybox-1.19.4/miscutils/Conf select PLATFORM_LINUX help The watchdog utility is used with hardware or software watchdog -diff -Nur busybox-1.19.4.orig/networking/Config.src busybox-1.19.4/networking/Config.src ---- busybox-1.19.4.orig/networking/Config.src 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/networking/Config.src 2012-03-20 16:07:34.206229130 +0100 +diff -Nur busybox-1.20.2.orig//networking/Config.src busybox-1.20.2/networking/Config.src +--- busybox-1.20.2.orig//networking/Config.src 2012-07-02 16:08:25.000000000 +0200 ++++ busybox-1.20.2/networking/Config.src 2012-08-28 11:52:12.000000000 +0200 @@ -64,7 +64,7 @@ config BRCTL @@ -204,7 +204,7 @@ diff -Nur busybox-1.19.4.orig/networking/Config.src busybox-1.19.4/networking/Co select PLATFORM_LINUX help Send a magic packet to wake up sleeping machines. -@@ -498,7 +498,7 @@ +@@ -506,7 +506,7 @@ config IP bool "ip" @@ -213,7 +213,7 @@ diff -Nur busybox-1.19.4.orig/networking/Config.src busybox-1.19.4/networking/Co select PLATFORM_LINUX help The "ip" applet is a TCP/IP interface configuration and routing -@@ -935,7 +935,7 @@ +@@ -943,7 +943,7 @@ config WGET bool "wget" @@ -222,9 +222,9 @@ diff -Nur busybox-1.19.4.orig/networking/Config.src busybox-1.19.4/networking/Co help wget is a utility for non-interactive download of files from HTTP, HTTPS, and FTP servers. -diff -Nur busybox-1.19.4.orig/util-linux/Config.src busybox-1.19.4/util-linux/Config.src ---- busybox-1.19.4.orig/util-linux/Config.src 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/util-linux/Config.src 2012-03-20 16:09:26.662228452 +0100 +diff -Nur busybox-1.20.2.orig//util-linux/Config.src busybox-1.20.2/util-linux/Config.src +--- busybox-1.20.2.orig//util-linux/Config.src 2012-06-26 15:35:45.000000000 +0200 ++++ busybox-1.20.2/util-linux/Config.src 2012-08-28 11:52:12.000000000 +0200 @@ -246,13 +246,6 @@ check for and attempt to repair any corruption that occurs to a minix filesystem. @@ -257,14 +257,3 @@ diff -Nur busybox-1.19.4.orig/util-linux/Config.src busybox-1.19.4/util-linux/Co #select PLATFORM_LINUX help lsusb is a utility for displaying information about USB buses in the -diff -Nur busybox-1.19.4.orig/util-linux/Kbuild.src busybox-1.19.4/util-linux/Kbuild.src ---- busybox-1.19.4.orig/util-linux/Kbuild.src 2012-02-04 20:34:24.000000000 +0100 -+++ busybox-1.19.4/util-linux/Kbuild.src 2012-03-20 16:10:21.682228369 +0100 -@@ -27,7 +27,6 @@ - lib-$(CONFIG_LSPCI) += lspci.o - lib-$(CONFIG_LSUSB) += lsusb.o - lib-$(CONFIG_MDEV) += mdev.o --lib-$(CONFIG_MKFS_EXT2) += mkfs_ext2.o - lib-$(CONFIG_MKFS_MINIX) += mkfs_minix.o - lib-$(CONFIG_MKFS_REISER) += mkfs_reiser.o - lib-$(CONFIG_MKFS_VFAT) += mkfs_vfat.o |