diff options
Diffstat (limited to 'openwrt/package/busybox')
41 files changed, 0 insertions, 19893 deletions
diff --git a/openwrt/package/busybox/Config.in b/openwrt/package/busybox/Config.in deleted file mode 100644 index e79aef7..0000000 --- a/openwrt/package/busybox/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -menu "busybox........................... The Swiss Army Knife of embedded Linux" - -config BR2_PACKAGE_BUSYBOX - prompt "busybox........................... The Swiss Army Knife of embedded Linux" - bool - default y - help - The Swiss Army Knife of embedded Linux. It slices, it dices, it - makes Julian Fries. - - http://busybox.net/ - - Most people will answer Y. - -config BR2_PACKAGE_BUSYBOX_SNAPSHOT - bool "Use the daily snapshot of busybox?" - depends BR2_PACKAGE_BUSYBOX - depends CONFIG_DEVEL - default n - help - Use the latest busybox CVS snapshot instead of release. - - For fun, you should say Y. - -menu "Busybox Configuration" - depends BR2_PACKAGE_BUSYBOX - -source package/busybox/config/Config.in - -endmenu - -endmenu diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile deleted file mode 100644 index 83c74ff..0000000 --- a/openwrt/package/busybox/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=busybox -PKG_RELEASE:=1 - -ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) -# Be aware that this changes daily.... -PKG_VERSION:=0.${shell date +"%G%m%d"} -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2 -PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots -PKG_MD5SUM:=x -else -PKG_VERSION:=1.1.3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.busybox.net/downloads -PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7 -endif -PKG_CAT:=bzcat - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config - yes '' | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" ARCH="$(ARCH)" -C $(PKG_BUILD_DIR) - touch $@ - -$(IPKG_BUSYBOX): - $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(IDIR_BUSYBOX)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install - $(STRIP) $(IDIR_BUSYBOX)/bin/busybox - $(IPKG_BUILD) $(IDIR_BUSYBOX) $(PACKAGE_DIR) diff --git a/openwrt/package/busybox/config/Config.in b/openwrt/package/busybox/config/Config.in deleted file mode 100644 index eedb4ba..0000000 --- a/openwrt/package/busybox/config/Config.in +++ /dev/null @@ -1,406 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - - -config BUSYBOX_HAVE_DOT_CONFIG - bool - default y - -menu "Busybox Settings" - -menu "General Configuration" - -choice - prompt "Buffer allocation policy" - default BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK - help - There are 3 ways BusyBox can handle buffer allocations: - - Use malloc. This costs code size for the call to xmalloc. - - Put them on stack. For some very small machines with limited stack - space, this can be deadly. For most folks, this works just fine. - - Put them in BSS. This works beautifully for computers with a real - MMU (and OS support), but wastes runtime RAM for uCLinux. This - behavior was the only one available for BusyBox versions 0.48 and - earlier. - -config BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC - bool "Allocate with Malloc" - -config BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK - bool "Allocate on the Stack" - -config BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS - bool "Allocate in the .bss section" - -endchoice - -config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE - bool "Show verbose applet usage messages" - default y - help - All BusyBox applets will show more 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. - -config BUSYBOX_CONFIG_FEATURE_INSTALLER - bool "Support --install [-s] to install applet links at runtime" - default n - help - Enable 'busybox --install [-s]' support. This will allow you to use - busybox at runtime to create hard links or symlinks for all the - applets that are compiled into busybox. This feature requires the - /proc filesystem. - -config BUSYBOX_CONFIG_LOCALE_SUPPORT - bool "Enable locale support (system needs locale for this to work)" - default n - help - Enable this if your system has locale support and you would like - busybox to support locale settings. - -config BUSYBOX_CONFIG_FEATURE_DEVFS - bool "Support for devfs" - default y - help - Enable if you want BusyBox to work with devfs. - -config BUSYBOX_CONFIG_FEATURE_DEVPTS - bool "Use the devpts filesystem for Unix98 PTYs" - default y if BUSYBOX_CONFIG_FEATURE_DEVFS - help - Enable if you want BusyBox to use Unix98 PTY support. If enabled, - busybox will use /dev/ptmx for the master side of the pseudoterminal - and /dev/pts/<number> for the slave side. Otherwise, BSD style - /dev/ttyp<number> will be used. To use this option, you should have - devpts or devfs mounted. - -config BUSYBOX_CONFIG_FEATURE_CLEAN_UP - bool "Clean up all memory before exiting (usually not needed)" - default n - help - As a size optimization, busybox normally exits without explicitly - freeing dynamically allocated memory or closing files. This saves - space since the OS will clean up for us, but it can confuse debuggers - like valgrind, which report tons of memory and resource leaks. - - Don't enable this unless you have a really good reason to clean - things up manually. - -config BUSYBOX_CONFIG_FEATURE_SUID - bool "Support for SUID/SGID handling" - default y - help - Support SUID and SGID binaries. - -config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG - bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default n if BUSYBOX_CONFIG_FEATURE_SUID - depends on BUSYBOX_CONFIG_FEATURE_SUID - help - Allow the SUID / SGID state of an applet to be determined runtime by - checking /etc/busybox.conf. The format of this file is as follows: - - <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) - - An example might help: - - [SUID] - su = ssx root.0 # applet su can be run by anyone and runs with euid=0/egid=0 - 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 - - cp = --- # disable applet cp for everyone - - The file has to be owned by user root, group root and has to be - writeable only by root: - (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) - The busybox executable has to be owned by user root, group - root and has to be setuid root for this to work: - (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) - - Robert 'sandman' Griebl has more information here: - <url: http://www.softforge.de/bb/suid.html >. - -config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG_QUIET - bool "Suppress warning message if /etc/busybox.conf is not readable" - default n - depends on BUSYBOX_CONFIG_FEATURE_SUID_CONFIG - help - /etc/busybox.conf should be readable by the user needing the SUID, check - this option to avoid users to be notified about missing permissions. - -config BUSYBOX_CONFIG_SELINUX - bool "Support NSA Security Enhanced Linux" - default n - help - Enable support for SE Linux in applets ls, ps, and id. Also provide - the option of compiling in SE Linux applets. - - If you do not have a complete SE Linux Full Userland installed, this - stuff will not compile. Go visit - http://www.nsa.gov/selinux/index.html - to download the necessary stuff to allow busybox to compile with this - option enabled. - - Most people will leave this set to 'N'. - -endmenu - -menu 'Build Options' - -config BUSYBOX_CONFIG_STATIC - bool "Build BusyBox as a static binary (no shared libs)" - default n - help - If you want to build a static BusyBox binary, which does not - use or require any shared libraries, then enable this option. - This can cause BusyBox to be considerably larger, so you should - leave this option false unless you have a good reason (i.e. - your target platform does not support shared libraries, or - you are building an initrd which doesn't need anything but - BusyBox, etc). - - Most people will leave this set to 'N'. - -# The busybox shared library feature is there so make standalone can produce -# smaller applets. Since make standalone isn't in yet, there's nothing using -# this yet, and so it's disabled. -config BUSYBOX_CONFIG_DISABLE_SHARED - bool - default n - -config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX - bool "Build shared libbusybox" - default n - depends on BUSYBOX_CONFIG_DISABLE_SHARED - help - Build a shared library libbusybox.so which contains all - libraries used inside busybox. - -config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX - bool "Feature-complete libbusybox" - default n if !CONFIG_FEATURE_SHARED_BUSYBOX - depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX - help - Build a libbusybox with the complete feature-set, disregarding - the actually selected config. - - Normally, libbusybox will only contain the features which are - used by busybox itself. If you plan to write a separate - standalone application which uses libbusybox say 'Y'. - - Note: libbusybox is GPL, not LGPL, and exports no stable API that - might act as a copyright barrier. We can and will modify the - exported function set between releases (even minor version number - changes), and happily break out-of-tree features. - - Say 'N' if in doubt. - -config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX - bool "Use shared libbusybox for busybox" - default n if BUSYBOX_CONFIG_BUILD_LIBBUSYBOX - depends on !CONFIG_STATIC && BUSYBOX_CONFIG_BUILD_LIBBUSYBOX - help - Use libbusybox.so also for busybox itself. - You need to have a working dynamic linker to use this variant. - -config BUSYBOX_CONFIG_LFS - bool - 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 - library lacks large file support for large files. Some of the - programs that can benefit from large file support include dd, gzip, - cp, mount, tar, and many others. If you want to access files larger - than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'. - -config BUSYBOX_USING_CROSS_COMPILER - bool - default y - help - Do you want to build BusyBox with a Cross Compiler? If so, - then enable this option. Otherwise leave it set to 'N'. - -config BUSYBOX_CROSS_COMPILER_PREFIX - string - default "mipsel-uclibc-" - depends on BUSYBOX_USING_CROSS_COMPILER - help - If you want to build BusyBox with a cross compiler, then you - will need to set this to the cross-compiler prefix. For example, - if my cross-compiler is /usr/i386-linux-uclibc/bin/i386-uclibc-gcc - then I would enter '/usr/i386-linux-uclibc/bin/i386-uclibc-' here, - which will ensure the correct compiler is used. - -config BUSYBOX_EXTRA_CFLAGS_OPTIONS - string - default "-Os " - help - Do you want to pass any extra CFLAGS options to the compiler as - you build BusyBox? If so, this is the option for you... For example, - if you want to add some simple compiler switches (like -march=i686), - or check for warnings using -Werror, just those options here. - -config BUSYBOX_CONFIG_BUILD_AT_ONCE - bool "Compile all sources at once" - default n - help - Normally each source-file is compiled with one invocation of - the compiler. - If you set this option, all sources are compiled at once. - This gives the compiler more opportunities to optimize which can - result in smaller and/or faster binaries. - - Setting this option will consume alot of memory, e.g. if you - enable all applets with all features, gcc uses more than 300MB - RAM during compilation of busybox. - - This option is most likely only beneficial for newer compilers - such as gcc-4.1 and above. - - Say 'N' unless you know what you are doing. - -endmenu - -menu 'Debugging Options' - -config BUSYBOX_CONFIG_DEBUG - bool "Build BusyBox with Debugging symbols" - default n - help - Say Y here if you wish to compile BusyBox with debugging symbols. - This will allow you to use a debugger to examine BusyBox internals - while applets are running. This increases the size of the binary - considerably and should only be used when doing development. - If you are doing development and want to debug BusyBox, answer Y. - - Most people should answer N. - -choice - prompt "Additional debugging library" - default BUSYBOX_CONFIG_NO_DEBUG_LIB - depends on BUSYBOX_CONFIG_DEBUG - help - Using an additional debugging library will make BusyBox become - considerable larger and will cause it to run more slowly. You - should always leave this option disabled for production use. - - dmalloc support: - ---------------- - This enables compiling with dmalloc ( http://dmalloc.com/ ) - which is an excellent public domain mem leak and malloc problem - detector. To enable dmalloc, before running busybox you will - want to properly set your environment, for example: - export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile - The 'debug=' value is generated using the following command - dmalloc -p log-stats -p log-non-free -p log-bad-space -p log-elapsed-time \ - -p check-fence -p check-heap -p check-lists -p check-blank \ - -p check-funcs -p realloc-copy -p allow-free-null - - Electric-fence support: - ----------------------- - This enables compiling with Electric-fence support. Electric - fence is another very useful malloc debugging library which uses - your computer's virtual memory hardware to detect illegal memory - accesses. This support will make BusyBox be considerable larger - and run slower, so you should leave this option disabled unless - you are hunting a hard to find memory problem. - - -config BUSYBOX_CONFIG_NO_DEBUG_LIB - bool "None" - -config BUSYBOX_CONFIG_DMALLOC - bool "Dmalloc" - -config BUSYBOX_CONFIG_EFENCE - bool "Electric-fence" - -endchoice - -config BUSYBOX_CONFIG_DEBUG_YANK_SUSv2 - bool "Disable obsolete features removed before SUSv3?" - default y - help - This option will disable backwards compatability with SuSv2, - specifically, old-style numeric options ('command -1 <file>') - will not be supported in head, tail, and fold. (Note: should - yank from renice too.) - -endmenu - -menu 'Installation Options' - -config BUSYBOX_CONFIG_INSTALL_NO_USR - bool "Don't use /usr" - default n - help - Disable use of /usr. Don't activate this option if you don't know - that you really want this behaviour. - -choice - prompt "Applets links" - default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS - help - Choose how you install applets links. - -config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS - bool "as soft-links" - help - Install applets as soft-links to the busybox binary. This needs some - free inodes on the filesystem, but might help with filesystem - generators that can't cope with hard-links. - -config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS - bool "as hard-links" - help - Install applets as hard-links to the busybox binary. This might count - on a filesystem with few inodes. - -config BUSYBOX_CONFIG_INSTALL_APPLET_DONT - bool - prompt "not installed" - depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL - help - Do not install applets links. Usefull when using the -install feature - or a standalone shell for rescue pruposes. - -endchoice - -config BUSYBOX_PREFIX - string - default "./_install" - help - Define your directory to install BusyBox files/subdirs in. - -endmenu - -source package/busybox/config/libbb/Config.in - -endmenu - -comment "Applets" - -source package/busybox/config/archival/Config.in -source package/busybox/config/coreutils/Config.in -source package/busybox/config/console-tools/Config.in -source package/busybox/config/debianutils/Config.in -source package/busybox/config/editors/Config.in -source package/busybox/config/findutils/Config.in -source package/busybox/config/init/Config.in -source package/busybox/config/loginutils/Config.in -source package/busybox/config/e2fsprogs/Config.in -source package/busybox/config/modutils/Config.in -source package/busybox/config/util-linux/Config.in -source package/busybox/config/miscutils/Config.in -source package/busybox/config/networking/Config.in -source package/busybox/config/procps/Config.in -source package/busybox/config/shell/Config.in -source package/busybox/config/sysklogd/Config.in diff --git a/openwrt/package/busybox/config/archival/Config.in b/openwrt/package/busybox/config/archival/Config.in deleted file mode 100644 index bd5c4b1..0000000 --- a/openwrt/package/busybox/config/archival/Config.in +++ /dev/null @@ -1,308 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Archival Utilities" - -config BUSYBOX_CONFIG_AR - bool "ar" - default n - help - ar is an archival utility program used to create, modify, and - extract contents from archives. An archive is a single file holding - a collection of other files in a structure that makes it possible to - retrieve the original individual files (called archive members). - The original files' contents, mode (permissions), timestamp, owner, - and group are preserved in the archive, and can be restored on - extraction. - - The stored filename is limited to 15 characters. (for more information - see long filename support). - ar has 60 bytes of overheads for every stored file. - - This implementation of ar can extract archives, it cannot create or - modify them. - On an x86 system, the ar applet adds about 1K. - - Unless you have a specific application which requires ar, you should - probably say N here. - -config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES - bool " Enable support for long filenames (not need for debs)" - default n - depends on BUSYBOX_CONFIG_AR - help - By default the ar format can only store the first 15 characters of the - filename, this option removes that limitation. - It supports the GNU ar long filename method which moves multiple long - filenames into a the data section of a new ar entry. - -config BUSYBOX_CONFIG_BUNZIP2 - bool "bunzip2" - default y - help - bunzip2 is a compression utility using the Burrows-Wheeler block - sorting text compression algorithm, and Huffman coding. Compression - is generally considerably better than that achieved by more - conventional LZ77/LZ78-based compressors, and approaches the - performance of the PPM family of statistical compressors. - - The BusyBox bunzip2 applet is limited to de-compression only. - On an x86 system, this applet adds about 11K. - - Unless you have a specific application which requires bunzip2, you - should probably say N here. - -config BUSYBOX_CONFIG_CPIO - bool "cpio" - default n - help - cpio is an archival utility program used to create, modify, and extract - contents from archives. - cpio has 110 bytes of overheads for every stored file. - - This implementation of cpio can extract cpio archives created in the - "newc" or "crc" format, it cannot create or modify them. - - Unless you have a specific application which requires cpio, you should - probably say N here. - -config BUSYBOX_CONFIG_DPKG - bool "dpkg" - default n - help - dpkg is a medium-level tool to install, build, remove and manage Debian packages. - - This implementation of dpkg has a number of limitations, you should use the - official dpkg if possible. - -config BUSYBOX_CONFIG_DPKG_DEB - bool "dpkg_deb" - default n - help - dpkg-deb packs, unpacks and provides information about Debian archives. - - This implementation of dpkg-deb cannot pack archives. - - Unless you have a specific application which requires dpkg-deb, you should - probably say N here. - -config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY - bool " extract only (-x)" - default n - depends on BUSYBOX_CONFIG_DPKG_DEB - help - This reduces dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx". - However it saves space as none of the extra dpkg-deb, ar or tar options are - needed, they are linked to internally. - -config BUSYBOX_CONFIG_GUNZIP - bool "gunzip" - default y - help - gunzip is used to decompress archives created by gzip. - You can use the `-t' option to test the integrity of - an archive, without decompressing it. - -config BUSYBOX_CONFIG_FEATURE_GUNZIP_UNCOMPRESS - bool " Uncompress support" - default y - depends on BUSYBOX_CONFIG_GUNZIP - help - Enable if you want gunzip to have the ability to decompress - archives created by the program compress (not much - used anymore). - -config BUSYBOX_CONFIG_GZIP - bool "gzip" - default y - help - gzip is used to compress files. - It's probably the most widely used UNIX compression program. - -config BUSYBOX_CONFIG_IPKG - bool "ipkg" - default y - select BUSYBOX_CONFIG_MD5SUM - select BUSYBOX_CONFIG_WGET - help - ipkg is the itsy package management system. - -config BUSYBOX_CONFIG_RPM2CPIO - bool "rpm2cpio" - default n - help - Converts an RPM file into a CPIO archive. - -config BUSYBOX_CONFIG_RPM - bool "rpm" - default n - help - Mini RPM applet - queries and extracts - -config BUSYBOX_CONFIG_TAR - bool "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. - -config BUSYBOX_CONFIG_FEATURE_TAR_CREATE - bool " Enable archive creation" - default y - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option you'll be able to create - tar archives using the `-c' option. - -config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2 - bool " Enable -j option to handle .tar.bz2 files" - default y - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option you'll be able to extract - archives compressed with bzip2. - -config BUSYBOX_CONFIG_FEATURE_TAR_LZMA - bool " Enable -a option to handle .tar.lzma files" - default n - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option you'll be able to extract - archives compressed with lzma. - -config BUSYBOX_CONFIG_FEATURE_TAR_FROM - bool " Enable -X (exclude from) and -T (include from) options)" - default y - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option you'll be able to specify - a list of files to include or exclude from an archive. - -config BUSYBOX_CONFIG_FEATURE_TAR_GZIP - bool " Enable -z option" - default y - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option tar will be able to call gzip, - when creating or extracting tar gziped archives. - -config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS - bool " Enable -Z option" - default n - depends on BUSYBOX_CONFIG_TAR - help - If you enable this option tar will be able to call uncompress, - when extracting .tar.Z archives. - -config BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY - bool " Enable support for old tar header format" - default n - depends on BUSYBOX_CONFIG_TAR - help - This option is required to unpack archives created in - the old GNU format; help to kill this old format by - repacking your ancient archives with the new format. - -config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS - bool " Enable support for some GNU tar extensions" - default y - depends on BUSYBOX_CONFIG_TAR - help - With this option busybox supports GNU long filenames and - linknames. - -config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS - bool " Enable long options" - default n - depends on BUSYBOX_CONFIG_TAR - help - Enable use of long options, increases size by about 400 Bytes - -config BUSYBOX_CONFIG_UNCOMPRESS - bool "uncompress" - default n - help - uncompress is used to decompress archives created by compress. - Not much used anymore, replaced by gzip/gunzip. - -config BUSYBOX_CONFIG_UNLZMA - bool "unlzma" - 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. - 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_CONFIG_FEATURE_LZMA_FAST - bool " Optimze unlzma for speed" - default n - depends on BUSYBOX_CONFIG_UNLZMA - help - This option reduce decompression time by about 33% at the cost of - a 2K bigger binary. - -config BUSYBOX_CONFIG_UNZIP - bool "unzip" - default n - help - unzip will list or extract files from a ZIP archive, - commonly found on DOS/WIN systems. The default behavior - (with no options) is to extract the archive into the - current directory. Use the `-d' option to extract to a - directory of your choice. - -comment "Common options for cpio and tar" - depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR - -config BUSYBOX_CONFIG_FEATURE_UNARCHIVE_TAPE - bool " Enable tape drive support" - default n - depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR - help - I don't think this is needed anymore. - -comment "Common options for dpkg and dpkg_deb" - depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB - -config BUSYBOX_CONFIG_FEATURE_DEB_TAR_GZ - bool " gzip debian packages (normal)" - default n if BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB - depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB - help - This is the default compression method inside the debian ar file. - - If you want compatibility with standard .deb's you should say yes here. - -config BUSYBOX_CONFIG_FEATURE_DEB_TAR_BZ2 - bool " bzip2 debian packages" - default n - depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB - help - This allows dpkg and dpkg-deb to extract deb's that are compressed internally - with bzip2 instead of gzip. - - You only want this if you are creating your own custom debian packages that - use an internal control.tar.bz2 or data.tar.bz2. - -config BUSYBOX_CONFIG_FEATURE_DEB_TAR_LZMA - bool " lzma debian packages" - default n - depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB - help - This allows dpkg and dpkg-deb to extract deb's that are compressed - internally with lzma instead of gzip. - - You only want this if you are creating your own custom debian - packages that use an internal control.tar.lzma or data.tar.lzma. - -endmenu diff --git a/openwrt/package/busybox/config/console-tools/Config.in b/openwrt/package/busybox/config/console-tools/Config.in deleted file mode 100644 index 4faaeb4..0000000 --- a/openwrt/package/busybox/config/console-tools/Config.in +++ /dev/null @@ -1,75 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Console Utilities" - -config BUSYBOX_CONFIG_CHVT - bool "chvt" - default n - help - This program is used to change to another terminal. - Example: chvt 4 (change to terminal /dev/tty4) - -config BUSYBOX_CONFIG_CLEAR - bool "clear" - default y - help - This program clears the terminal screen. - -config BUSYBOX_CONFIG_DEALLOCVT - bool "deallocvt" - default n - help - This program deallocates unused virtual consoles. - -config BUSYBOX_CONFIG_DUMPKMAP - bool "dumpkmap" - default n - 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_CONFIG_LOADFONT - bool "loadfont" - default n - help - This program loads a console font from standard input. - -config BUSYBOX_CONFIG_LOADKMAP - bool "loadkmap" - default n - help - This program loads a keyboard translation table from - standard input. - -config BUSYBOX_CONFIG_OPENVT - bool "openvt" - default n - help - This program is used to start a command on an unused - virtual terminal. - -config BUSYBOX_CONFIG_RESET - bool "reset" - default y - help - This program is used to reset the terminal screen, if it - gets messed up. - -config BUSYBOX_CONFIG_SETCONSOLE - bool "setconsole" - default n - help - This program redirects the system console to another device, - like the current tty while logged in via telnet. - -config BUSYBOX_CONFIG_SETKEYCODES - bool "setkeycodes" - default n - help - This program loads entries into the kernel's scancode-to-keycode - map, allowing unusual keyboards to generate usable keycodes. - -endmenu diff --git a/openwrt/package/busybox/config/coreutils/Config.in b/openwrt/package/busybox/config/coreutils/Config.in deleted file mode 100644 index 53984e3..0000000 --- a/openwrt/package/busybox/config/coreutils/Config.in +++ /dev/null @@ -1,679 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Coreutils" - -config BUSYBOX_CONFIG_BASENAME - bool "basename" - default y - help - 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_CONFIG_CAL - bool "cal" - default n - help - cal is used to display a monthly calender. - -config BUSYBOX_CONFIG_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_CONFIG_CHGRP - bool "chgrp" - default y - help - chgrp is used to change the group ownership of files. - -config BUSYBOX_CONFIG_CHMOD - bool "chmod" - default y - help - chmod is used to change the access permission of files. - -config BUSYBOX_CONFIG_CHOWN - bool "chown" - default y - help - chown is used to change the user and/or group ownership - of files. - -config BUSYBOX_CONFIG_CHROOT - bool "chroot" - default y - help - chroot is used to change the root directory and run a command. - The default command is `/bin/sh'. - -config BUSYBOX_CONFIG_CMP - bool "cmp" - default n - help - cmp is used to compare two files and returns the result - to standard output. - -config BUSYBOX_CONFIG_COMM - bool "comm" - default n - help - comm is used to compare two files line by line and return - a three-column output. - -config BUSYBOX_CONFIG_CP - bool "cp" - default y - help - cp is used to copy files and directories. - -config BUSYBOX_CONFIG_CUT - bool "cut" - default y - help - cut is used to print selected parts of lines from - each file to stdout. - -config BUSYBOX_CONFIG_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_CONFIG_FEATURE_DATE_ISOFMT - bool " Enable ISO date format output (-I)" - default y - depends on BUSYBOX_CONFIG_DATE - help - Enable option (-I) to output an ISO-8601 compliant - date/time string. - -config BUSYBOX_CONFIG_DD - bool "dd" - default y - help - dd copies a file (from standard input to standard output, - by default) using specific input and output blocksizes, - while optionally performing conversions on it. - -config BUSYBOX_CONFIG_DF - bool "df" - default y - help - df reports the amount of disk space used and available - on filesystems. - -config BUSYBOX_CONFIG_DIRNAME - bool "dirname" - default y - help - dirname is used to strip a non-directory suffix from - a file name. - -config BUSYBOX_CONFIG_DOS2UNIX - bool "dos2unix/unix2dos" - default n - help - dos2unix is used to convert a text file from DOS format to - UNIX format, and vice versa. - -config BUSYBOX_CONFIG_UNIX2DOS - bool - default n - depends on BUSYBOX_CONFIG_DOS2UNIX - -config BUSYBOX_CONFIG_DU - bool "du (default blocksize of 512 bytes)" - default y - help - du is used to report the amount of disk space used - for specified files. - -config BUSYBOX_CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K - bool " Use a default blocksize of 1024 bytes (1K)" - default y - depends on BUSYBOX_CONFIG_DU - help - Use a blocksize of (1K) instead of the default 512b. - -config BUSYBOX_CONFIG_ECHO - bool "echo (basic SuSv3 version taking no options)" - default y - help - echo is used to print a specified string to stdout. - -# this entry also appears in shell/Config.in, next to the echo builtin -config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO - bool " Enable echo options (-n and -e)" - default y - depends on BUSYBOX_CONFIG_ECHO - help - This adds options (-n and -e) to echo. - -config BUSYBOX_CONFIG_ENV - bool "env" - default y - help - env is used to set an environment variable and run - a command; without options it displays the current - environment. - -config BUSYBOX_CONFIG_EXPR - bool "expr" - default y - help - expr is used to calculate numbers and print the result - to standard output. - -config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64 - bool " Extend Posix numbers support to 64 bit" - default n - depends on BUSYBOX_CONFIG_EXPR - help - Enable 64-bit math support in the expr applet. This will make - the applet slightly larger, but will allow computation with very - large numbers. - -config BUSYBOX_CONFIG_FALSE - bool "false" - default y - help - false returns an exit code of FALSE (1). - -config BUSYBOX_CONFIG_FOLD - bool "fold" - default n - help - Wrap text to fit a specific width. - -config BUSYBOX_CONFIG_HEAD - bool "head" - default y - help - head is used to print the first specified number of lines - from files. - -config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD - bool " Enable head options (-c, -q, and -v)" - default y - depends on BUSYBOX_CONFIG_HEAD - help - This enables the head options (-c, -q, and -v). - -config BUSYBOX_CONFIG_HOSTID - bool "hostid" - default y - help - hostid prints the numeric identifier (in hexadecimal) for - the current host. - -config BUSYBOX_CONFIG_ID - bool "id" - default y - help - id displays the current user and group ID names. - -config BUSYBOX_CONFIG_INSTALL - bool "install" - default n - help - Copy files and set attributes. - -config BUSYBOX_CONFIG_LENGTH - bool "length" - default y - help - length is used to print out the length of a specified string. - -config BUSYBOX_CONFIG_LN - bool "ln" - default y - help - ln is used to create hard or soft links between files. - -config BUSYBOX_CONFIG_LOGNAME - bool "logname" - default n - help - logname is used to print the current user's login name. - -config BUSYBOX_CONFIG_LS - bool "ls" - default y - help - ls is used to list the contents of directories. - -config BUSYBOX_CONFIG_FEATURE_LS_FILETYPES - bool " Enable filetyping options (-p and -F)" - default y - depends on BUSYBOX_CONFIG_LS - help - Enable the ls options (-p and -F). - -config BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS - bool " Enable symlinks dereferencing (-L)" - default y - depends on BUSYBOX_CONFIG_LS - help - Enable the ls option (-L). - -config BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE - bool " Enable recursion (-R)" - default y - depends on BUSYBOX_CONFIG_LS - help - Enable the ls option (-R). - -config BUSYBOX_CONFIG_FEATURE_LS_SORTFILES - bool " Sort the file names" - default y - depends on BUSYBOX_CONFIG_LS - help - Allow ls to sort file names alphabetically. - -config BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS - bool " Show file timestamps" - default y - depends on BUSYBOX_CONFIG_LS - help - Allow ls to display timestamps for files. - -config BUSYBOX_CONFIG_FEATURE_LS_USERNAME - bool " Show username/groupnames" - default y - depends on BUSYBOX_CONFIG_LS - help - Allow ls to display username/groupname for files. - -config BUSYBOX_CONFIG_FEATURE_LS_COLOR - bool " Allow use of color to identify file types" - default y - depends on BUSYBOX_CONFIG_LS - help - This enables the --color option to ls. - -config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT - bool " Produce colored ls output by default" - default y - depends on BUSYBOX_CONFIG_FEATURE_LS_COLOR - help - Saying yes here will turn coloring on by default, - even if no "--color" option is given to the ls command. - This is not recommended, since the colors are not - configurable, and the output may not be legible on - many output screens. - -config BUSYBOX_CONFIG_MD5SUM - bool "md5sum" - default y - help - md5sum is used to print or check MD5 checksums. - -config BUSYBOX_CONFIG_MKDIR - bool "mkdir" - default y - help - mkdir is used to create directories with the specified names. - -config BUSYBOX_CONFIG_MKFIFO - bool "mkfifo" - default y - help - mkfifo is used to create FIFOs (named pipes). - The `mknod' program can also create FIFOs. - -config BUSYBOX_CONFIG_MKNOD - bool "mknod" - default n - help - mknod is used to create FIFOs or block/character special - files with the specified names. - -config BUSYBOX_CONFIG_MV - bool "mv" - default y - help - mv is used to move or rename files or directories. - -config BUSYBOX_CONFIG_NICE - bool "nice" - default n - help - nice runs a program with modified scheduling priority. - -config BUSYBOX_CONFIG_NOHUP - bool "nohup" - default n - help - run a command immune to hangups, with output to a non-tty. - -config BUSYBOX_CONFIG_OD - bool "od" - default n - help - od is used to dump binary files in octal and other formats. - -config BUSYBOX_CONFIG_PRINTENV - bool "printenv" - default n - help - printenv is used to print all or part of environment. - -config BUSYBOX_CONFIG_PRINTF - bool "printf" - default y - help - printf is used to format and print specified strings. - It's similar to `echo' except it has more options. - -config BUSYBOX_CONFIG_PWD - bool "pwd" - default y - help - pwd is used to print the current directory. - -config BUSYBOX_CONFIG_REALPATH - bool "realpath" - default n - help - Return the canonicalized absolute pathname. - This isn't provided by GNU shellutils, but where else does it belong. - -config BUSYBOX_CONFIG_RM - bool "rm" - default y - help - rm is used to remove files or directories. - -config BUSYBOX_CONFIG_RMDIR - bool "rmdir" - default y - help - rmdir is used to remove empty directories. - -config BUSYBOX_CONFIG_SEQ - bool "seq" - default y - help - print a sequence of numbers - -config BUSYBOX_CONFIG_SHA1SUM - bool "sha1sum" - default n - help - Compute and check SHA1 message digest - -config BUSYBOX_CONFIG_SLEEP - bool "sleep (single integer arg with no suffix)" - default y - help - sleep is used to pause for a specified number of seconds, - -config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP - bool " Enable multiple integer args and optional time suffixes" - default y - depends on BUSYBOX_CONFIG_SLEEP - help - Allow sleep to pause for specified minutes, hours, and days. - -config BUSYBOX_CONFIG_SORT - bool "sort" - default y - help - sort is used to sort lines of text in specified files. - -config BUSYBOX_CONFIG_FEATURE_SORT_BIG - bool " full SuSv3 compliant sort (Support -ktcsbdfiozgM)" - default n - depends on BUSYBOX_CONFIG_SORT - help - Without this, sort only supports -r, -u, and an integer version - of -n. Selecting this adds sort keys, floating point support, and - more. This adds a little over 3k to a nonstatic build on x86. - - The SuSv3 sort standard is available at: - http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html - -config BUSYBOX_CONFIG_STAT - bool "stat" - default n - help - display file or filesystem status. - -config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT - bool " Enable custom formats (-c)" - default n - depends on BUSYBOX_CONFIG_STAT - help - Without this, stat will not support the '-c format' option where - users can pass a custom format string for output. This adds about - 7k to a nonstatic build on amd64. - -config BUSYBOX_CONFIG_STTY - bool "stty" - default n - help - stty is used to change and print terminal line settings. - -config BUSYBOX_CONFIG_SUM - bool "sum" - default n - help - checksum and count the blocks in a file - -config BUSYBOX_CONFIG_SYNC - bool "sync" - default y - help - sync is used to flush filesystem buffers. - -config BUSYBOX_CONFIG_TAIL - bool "tail" - default y - help - tail is used to print the last specified number of lines - from files. - -config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL - bool " Enable extra tail options (-q, -s, and -v)" - default y - depends on BUSYBOX_CONFIG_TAIL - help - The options (-q, -s, and -v) are provided by GNU tail, but - are not specific in the SUSv3 standard. - -config BUSYBOX_CONFIG_TEE - bool "tee" - default y - help - tee is used to read from standard input and write - to standard output and files. - -config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO - bool " Enable block i/o (larger/faster) instead of byte i/o." - default y - depends on BUSYBOX_CONFIG_TEE - help - Enable this option for a faster tee, at expense of size. - -config BUSYBOX_CONFIG_TEST - bool "test" - default y - help - test is used to check file types and compare values, - returning an appropriate exit code. The shells (ash - and bash) have test builtin. - -config BUSYBOX_CONFIG_FEATURE_TEST_64 - bool " Extend test to 64 bit" - default n - depends on BUSYBOX_CONFIG_TEST - help - Enable 64-bit support in test. - -config BUSYBOX_CONFIG_TOUCH - bool "touch" - default y - help - touch is used to create or change the access and/or - modification timestamp of specified files. - -config BUSYBOX_CONFIG_TR - bool "tr" - default y - help - tr is used to squeeze, and/or delete characters from standard - input, writing to standard output. - -config BUSYBOX_CONFIG_FEATURE_TR_CLASSES - bool " Enable character classes (such as [:upper:])" - default n - depends on BUSYBOX_CONFIG_TR - help - Enable character classes, enabling commands such as: - tr [:upper:] [:lower:] to convert input into lowercase. - -config BUSYBOX_CONFIG_FEATURE_TR_EQUIV - bool " Enable equivalence classes" - default n - depends on BUSYBOX_CONFIG_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_CONFIG_TRUE - bool "true" - default y - help - true returns an exit code of TRUE (0). - -config BUSYBOX_CONFIG_TTY - bool "tty" - default n - help - tty is used to print the name of the current terminal to - standard output. - -config BUSYBOX_CONFIG_UNAME - bool "uname" - default y - help - uname is used to print system information. - -config BUSYBOX_CONFIG_UNIQ - bool "uniq" - default y - help - uniq is used to remove duplicate lines from a sorted file. - -config BUSYBOX_CONFIG_USLEEP - bool "usleep" - default n - help - usleep is used to pause for a specified number of microseconds. - -config BUSYBOX_CONFIG_UUDECODE - bool "uudecode" - default n - help - uudecode is used to decode a uuencoded file. - -config BUSYBOX_CONFIG_UUENCODE - bool "uuencode" - default n - help - uuencode is used to uuencode a file. - -config BUSYBOX_CONFIG_WATCH - bool "watch" - default n - select BUSYBOX_CONFIG_DATE - help - watch is used to execute a program periodically, showing - output to the screen. - -config BUSYBOX_CONFIG_WC - bool "wc" - default y - help - wc is used to print the number of bytes, words, and lines, - in specified files. - -config BUSYBOX_CONFIG_WHO - bool "who" - default n - select BUSYBOX_CONFIG_FEATURE_UTMP - help - who is used to show who is logged on. - -config BUSYBOX_CONFIG_WHOAMI - bool "whoami" - default n - help - whoami is used to print the username of the current - user id (same as id -un). - -config BUSYBOX_CONFIG_YES - bool "yes" - default y - help - yes is used to repeatedly output a specific string, or - the default string `y'. - -comment "Common options for cp and mv" - depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV - -config BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS - bool " Preserve hard links" - default y - depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV - help - Allow cp and mv to preserve hard links. - -comment "Common options for ls, more and telnet" - depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET - -config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH - bool " Calculate terminal & column widths" - default y - depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET - help - This option allows utilities such as 'ls', 'more' and 'telnet' - to determine the width of the screen, which can allow them to - display additional text or avoid wrapping text onto the next line. - If you leave this disabled, your utilities will be especially - primitive and will be unable to determine the current screen width. - -comment "Common options for df, du, ls" - depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS - -config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE - bool " Support for human readable output (example 13k, 23M, 235G)" - default y - depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS - help - Allow df, du, and ls to have human readable output. - -comment "Common options for md5sum, sha1sum" - depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM - -config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK - bool " Enable -c, -s and -w options" - default y - depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM - help - Enabling the -c options allows files to be checked - against pre-calculated hash values. - - -s and -w are useful options when verifying checksums. - -endmenu diff --git a/openwrt/package/busybox/config/debianutils/Config.in b/openwrt/package/busybox/config/debianutils/Config.in deleted file mode 100644 index 71f2bf3..0000000 --- a/openwrt/package/busybox/config/debianutils/Config.in +++ /dev/null @@ -1,65 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Debian Utilities" - -config BUSYBOX_CONFIG_MKTEMP - bool "mktemp" - default y - help - mktemp is used to create unique temporary files - -config BUSYBOX_CONFIG_PIPE_PROGRESS - bool "pipe_progress" - default n - help - Display a dot to indicate pipe activity. - -config BUSYBOX_CONFIG_READLINK - bool "readlink" - default n - help - This program reads a symbolic link and returns the name - of the file it points to - -config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW - bool " Enable canonicalization by following all symlinks (-f)" - default n - depends on BUSYBOX_CONFIG_READLINK - help - Enable the readlink option (-f). - -config BUSYBOX_CONFIG_RUN_PARTS - bool "run-parts" - default n - help - run-parts is a utility designed to run all the scripts in a directory. - - It is useful to set up a directory like cron.daily, where you need to - execute all the scripts in that directory. - - In this implementation of run-parts some features (such as report mode) - are not implemented. - - Unless you know that run-parts is used in some of your scripts - you can safely say N here. - -config BUSYBOX_CONFIG_START_STOP_DAEMON - bool "start-stop-daemon" - default n - help - start-stop-daemon is used to control the creation and - termination of system-level processes, usually the ones - started during the startup of the system. - -config BUSYBOX_CONFIG_WHICH - bool "which" - default y - help - which is used to find programs in your PATH and - print out their pathnames. - -endmenu - diff --git a/openwrt/package/busybox/config/e2fsprogs/Config.in b/openwrt/package/busybox/config/e2fsprogs/Config.in deleted file mode 100644 index e9ef3dc..0000000 --- a/openwrt/package/busybox/config/e2fsprogs/Config.in +++ /dev/null @@ -1,67 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Linux Ext2 FS Progs" - -config BUSYBOX_CONFIG_CHATTR - bool "chattr" - default n - help - chattr changes the file attributes on a second extended file system. - -config BUSYBOX_CONFIG_E2FSCK - bool "e2fsck" - default n - help - e2fsck is used to check Linux second extended file systems (ext2fs). - e2fsck also supports ext2 filesystems countaining a journal (ext3). - The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also - provided. - -config BUSYBOX_CONFIG_FSCK - bool "fsck" - default n - help - fsck is used to check and optionally repair one or more filesystems. - In actuality, fsck is simply a front-end for the various file system - checkers (fsck.fstype) available under Linux. - -config BUSYBOX_CONFIG_LSATTR - bool "lsattr" - default n - help - lsattr lists the file attributes on a second extended file system. - -config BUSYBOX_CONFIG_MKE2FS - bool "mke2fs" - default n - help - mke2fs is used to create an ext2/ext3 filesystem. The normal compat - symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. - -config BUSYBOX_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_CONFIG_E2LABEL - bool "e2label" - default n - depends on BUSYBOX_CONFIG_TUNE2FS - help - e2label will display or change the filesystem label on the ext2 - filesystem located on device. - -config BUSYBOX_CONFIG_FINDFS - bool "findfs" - default n - depends on BUSYBOX_CONFIG_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/openwrt/package/busybox/config/editors/Config.in b/openwrt/package/busybox/config/editors/Config.in deleted file mode 100644 index 85074b3..0000000 --- a/openwrt/package/busybox/config/editors/Config.in +++ /dev/null @@ -1,123 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Editors" - -config BUSYBOX_CONFIG_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_CONFIG_FEATURE_AWK_MATH - bool " Enable math functions (requires libm)" - default y - depends on BUSYBOX_CONFIG_AWK - help - Enable math functions of the Awk programming language. - NOTE: This will require libm to be present for linking. - -config BUSYBOX_CONFIG_PATCH - bool "patch" - default n - help - Apply a unified diff formatted patch. - -config BUSYBOX_CONFIG_SED - bool "sed" - default y - help - sed is used to perform text transformations on a file - or input from a pipeline. - -config BUSYBOX_CONFIG_VI - bool "vi" - default y - help - 'vi' is a text editor. More specifically, it is the One True - text editor <grin>. It does, however, have a rather steep - learning curve. If you are not already comfortable with 'vi' - you may wish to use something else. - -config BUSYBOX_CONFIG_FEATURE_VI_COLON - bool " Enable \":\" colon commands (no \"ex\" mode)" - default y - depends on BUSYBOX_CONFIG_VI - help - Enable a limited set of colon commands for vi. This does not - provide an "ex" mode. - -config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK - bool " Enable yank/put commands and mark cmds" - default y - depends on BUSYBOX_CONFIG_VI - help - This will enable you to use yank and put, as well as mark in - busybox vi. - -config BUSYBOX_CONFIG_FEATURE_VI_SEARCH - bool " Enable search and replace cmds" - default y - depends on BUSYBOX_CONFIG_VI - help - Select this if you wish to be able to do search and replace in - busybox vi. - -config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS - bool " Catch signals" - default y - depends on BUSYBOX_CONFIG_VI - help - Selecting this option will make busybox vi signal aware. This will - make busybox vi support SIGWINCH to deal with Window Changes, catch - Ctrl-Z and Ctrl-C and alarms. - -config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD - bool " Remember previous cmd and \".\" cmd" - default y - depends on BUSYBOX_CONFIG_VI - help - Make busybox vi remember the last command and be able to repeat it. - -config BUSYBOX_CONFIG_FEATURE_VI_READONLY - bool " Enable -R option and \"view\" mode" - default y - depends on BUSYBOX_CONFIG_VI - help - Enable the read-only command line option, which allows the user to - open a file in read-only mode. - -config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS - bool " Enable set-able options, ai ic showmatch" - default y - depends on BUSYBOX_CONFIG_VI - help - Enable the editor to set some (ai, ic, showmatch) options. - -config BUSYBOX_CONFIG_FEATURE_VI_SET - bool " Support for :set" - default y - depends on BUSYBOX_CONFIG_VI - help - Support for ":set". - -config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE - bool " Handle window resize" - default y - depends on BUSYBOX_CONFIG_VI - help - Make busybox vi behave nicely with terminals that get resized. - -config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR - bool " Optimize cursor movement" - default y - depends on BUSYBOX_CONFIG_VI - help - This will make the cursor movement faster, but requires more memory - and it makes the applet a tiny bit larger. - -endmenu - diff --git a/openwrt/package/busybox/config/findutils/Config.in b/openwrt/package/busybox/config/findutils/Config.in deleted file mode 100644 index 9667bfb..0000000 --- a/openwrt/package/busybox/config/findutils/Config.in +++ /dev/null @@ -1,149 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Finding Utilities" - -config BUSYBOX_CONFIG_FIND - bool "find" - default y - help - find is used to search your system to find specified files. - -config BUSYBOX_CONFIG_FEATURE_FIND_MTIME - bool " Enable modified time matching (-mtime) option" - default n - depends on BUSYBOX_CONFIG_FIND - help - Allow searching based on the modification time of - files, in days. - -config BUSYBOX_CONFIG_FEATURE_FIND_MMIN - bool " Enable modified time matching (-min) option" - default n - depends on BUSYBOX_CONFIG_FIND - help - Allow searching based on the modification time of - files, in minutes. - -config BUSYBOX_CONFIG_FEATURE_FIND_PERM - bool " Enable permissions matching (-perm) option" - default y - depends on BUSYBOX_CONFIG_FIND - help - Enable searching based on file permissions. - -config BUSYBOX_CONFIG_FEATURE_FIND_TYPE - bool " Enable filetype matching (-type) option" - default y - depends on BUSYBOX_CONFIG_FIND - help - Enable searching based on file type (file, - directory, socket, device, etc.). - -config BUSYBOX_CONFIG_FEATURE_FIND_XDEV - bool " Enable stay in filesystem (-xdev) option" - default y - depends on BUSYBOX_CONFIG_FIND - help - This option will allow find to restrict searches to a single - filesystem. - -config BUSYBOX_CONFIG_FEATURE_FIND_NEWER - bool " Enable -newer option for comparing file mtimes" - default n - depends on BUSYBOX_CONFIG_FIND - help - Support the 'find -newer' option for finding any files which have - a modified time that is more recent than the specified FILE. - -config BUSYBOX_CONFIG_FEATURE_FIND_INUM - bool " Enable inode number matching (-inum) option" - default n - depends on BUSYBOX_CONFIG_FIND - help - Support the 'find -inum' option for searching by inode number. - -config BUSYBOX_CONFIG_FEATURE_FIND_EXEC - bool " Enable (-exec) option allowing execution of commands" - default y - depends on BUSYBOX_CONFIG_FIND - help - Support the 'find -exec' option for executing commands based upon - the files matched. - -config BUSYBOX_CONFIG_GREP - bool "grep" - default y - help - grep is used to search files for a specified pattern. - -config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS - bool " Support extended regular expressions (egrep & grep -E)" - default y - depends on BUSYBOX_CONFIG_GREP - help - Enabled support for extended regular expressions. Extended - regular expressions allow for alternation (foo|bar), grouping, - and various repetition operators. - -config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS - bool " Alias fgrep to grep -F" - default y - depends on BUSYBOX_CONFIG_GREP - help - fgrep sees the search pattern as a normal string rather than - regular expressions. - grep -F is always builtin, this just creates the fgrep alias. - -config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT - bool " Enable before and after context flags (-A, -B and -C)" - default y - depends on BUSYBOX_CONFIG_GREP - help - 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_CONFIG_XARGS - bool "xargs" - default y - help - xargs is used to execute a specified command on - every item from standard input. - -config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION - bool " Enable prompt and confirmation option -p" - default y - depends on BUSYBOX_CONFIG_XARGS - help - Support prompt the user about whether to run each command - line and read a line from the terminal. - -config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES - bool " Enable support single and double quotes and backslash" - default y - depends on BUSYBOX_CONFIG_XARGS - help - Default xargs unsupport single and double quotes - and backslash for can use aruments with spaces. - -config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT - bool " Enable support options -x" - default y - depends on BUSYBOX_CONFIG_XARGS - help - Enable support exit if the size (see the -s or -n option) - is exceeded. - -config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM - bool " Enable options -0" - default y - depends on BUSYBOX_CONFIG_XARGS - help - Enable input filenames are terminated by a null character - instead of by whitespace, and the quotes and backslash - are not special. - -endmenu diff --git a/openwrt/package/busybox/config/init/Config.in b/openwrt/package/busybox/config/init/Config.in deleted file mode 100644 index 88dcaca..0000000 --- a/openwrt/package/busybox/config/init/Config.in +++ /dev/null @@ -1,80 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Init Utilities" - -config BUSYBOX_CONFIG_INIT - bool "init" - default y - help - init is the first program run when the system boots. - -config BUSYBOX_CONFIG_FEATURE_USE_INITTAB - bool " Support reading an inittab file" - default y - depends on BUSYBOX_CONFIG_INIT - help - Allow init to read an inittab file when the system boot. - -config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY - bool " Support running commands with a controlling-tty" - default n - depends on BUSYBOX_CONFIG_INIT - help - If this option is enabled a command starting with hyphen (-) - is run in its own session (setsid(2)) and possibly with a - controlling tty (TIOCSCTTY). This is not the traditional init - behavour, but is often what you want in an embedded system where - the console is only accessed during development or for maintenance. - -config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET - bool " Be _extra_ quiet on boot" - default n - depends on BUSYBOX_CONFIG_INIT - help - Prevent init from logging some messages to the console during boot. - -config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS - bool " Support dumping core for child processes (debugging only)" - default n - depends on BUSYBOX_CONFIG_INIT - help - If this option is enabled and the file /.init_enable_core - exists, then init will call setrlimit() to allow unlimited - core file sizes. If this option is disabled, processes - will not generate any core files. - - - -config BUSYBOX_CONFIG_FEATURE_INITRD - bool " Support running init from within an initrd (not initramfs)" - default n - depends on BUSYBOX_CONFIG_INIT - help - Legacy support for running init under the old-style initrd. Allows - the name linuxrc to act as init, and it doesn't assume init is PID 1. - - This does not apply to initramfs, which runs /init as PID 1 and - requires no special support. - -config BUSYBOX_CONFIG_HALT - bool "poweroff, halt, and reboot" - default y - help - Stop all processes and either halt, reboot, or power off the system. - -config BUSYBOX_CONFIG_MESG - bool "mesg" - default y - help - Mesg controls access to your terminal by others. It is typically - used to allow or disallow other users to write to your terminal - - default y - help - Stop all processes and (try to) power off the system. - -endmenu - diff --git a/openwrt/package/busybox/config/libbb/Config.in b/openwrt/package/busybox/config/libbb/Config.in deleted file mode 100644 index 7d84a75..0000000 --- a/openwrt/package/busybox/config/libbb/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Busybox Library Tuning" - -config BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED - int " MD5: Trade Bytes for Speed" - default 2 - range 0 3 - help - Trade binary size versus speed for the md5sum algorithm. - Approximate values running uClibc and hashing - linux-2.4.4.tar.bz2 were: - user times (sec) text size (386) - 0 (fastest) 1.1 6144 - 1 1.4 5392 - 2 3.0 5088 - 3 (smallest) 5.1 4912 - -endmenu diff --git a/openwrt/package/busybox/config/loginutils/Config.in b/openwrt/package/busybox/config/loginutils/Config.in deleted file mode 100644 index 621d576..0000000 --- a/openwrt/package/busybox/config/loginutils/Config.in +++ /dev/null @@ -1,163 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Login/Password Management Utilities" - -config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS - bool "Support for shadow passwords" - default n - help - Build support for shadow password in /etc/shadow. This file is only - readable by root and thus the encrypted passwords are no longer - publicly readable. - -config BUSYBOX_CONFIG_USE_BB_SHADOW - bool #" Use busybox shadow password functions" - default n - depends on BUSYBOX_CONFIG_USE_BB_PWD_GRP && BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS - help - If you leave this disabled, busybox will use the system's shadow - password handling functions. And if you are using the GNU C library - (glibc), you will then need to install the /etc/nsswitch.conf - configuration file and the required /lib/libnss_* libraries in - order for the shadow password functions to work. This generally - makes your embedded system quite a bit larger. - - Enabling this option will cause busybox to directly access the - system's /etc/shadow file when handling shadow passwords. This - makes your system smaller and I will get fewer emails asking about - how glibc NSS works). When this option is enabled, you will not be - able to use PAM to access shadow passwords from remote LDAP - password servers and whatnot. - -config BUSYBOX_CONFIG_USE_BB_PWD_GRP - bool "Use internal password and group functions rather than system functions" - default n - help - If you leave this disabled, busybox will use the system's password - and group functions. And if you are using the GNU C library - (glibc), you will then need to install the /etc/nsswitch.conf - configuration file and the required /lib/libnss_* libraries in - order for the password and group functions to work. This generally - makes your embedded system quite a bit larger. - - Enabling this option will cause busybox to directly access the - system's /etc/password, /etc/group files (and your system will be - smaller, and I will get fewer emails asking about how glibc NSS - works). When this option is enabled, you will not be able to use - PAM to access remote LDAP password servers and whatnot. And if you - want hostname resolution to work with glibc, you still need the - /lib/libnss_* libraries. - - If you enable this option, it will add about 1.5k to busybox. - -config BUSYBOX_CONFIG_ADDGROUP - bool "addgroup" - default n - help - Utility for creating a new group account. - -config BUSYBOX_CONFIG_DELGROUP - bool "delgroup" - default n - help - Utility for deleting a group account. - -config BUSYBOX_CONFIG_ADDUSER - bool "adduser" - default n - help - Utility for creating a new user account. - -config BUSYBOX_CONFIG_DELUSER - bool "deluser" - default n - help - Utility for deleting a user account. - -config BUSYBOX_CONFIG_GETTY - bool "getty" - default n - help - getty lets you log in on a tty, it is normally invoked by init. - -config BUSYBOX_CONFIG_FEATURE_UTMP - bool " Support utmp file" - depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO - default n - help - The file /var/run/utmp is used to track who is currently logged in. - -config BUSYBOX_CONFIG_FEATURE_WTMP - bool " Support wtmp file" - depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST - default n - select BUSYBOX_CONFIG_FEATURE_UTMP - help - The file /var/run/wtmp is used to track when user's have logged into - and logged out of the system. - -config BUSYBOX_CONFIG_LOGIN - bool "login" - default n - select BUSYBOX_CONFIG_FEATURE_SUID - help - login is used when signing onto a system. - - Note that Busybox binary must be setuid root for this applet to - work properly. - -config BUSYBOX_CONFIG_FEATURE_SECURETTY - bool " Support for /etc/securetty" - default n - depends on BUSYBOX_CONFIG_LOGIN - help - The file /etc/securetty is used by (some versions of) login(1). - The file contains the device names of tty lines (one per line, - without leading /dev/) on which root is allowed to login. - -config BUSYBOX_CONFIG_PASSWD - bool "passwd" - default y - select BUSYBOX_CONFIG_FEATURE_SUID - help - passwd changes passwords for user and group accounts. A normal user - may only change the password for his/her own account, the super user - may change the password for any account. The administrator of a group - may change the password for the group. - - Note that Busybox binary must be setuid root for this applet to - work properly. - -config BUSYBOX_CONFIG_SU - bool "su" - default n - select BUSYBOX_CONFIG_FEATURE_SUID - help - su is used to become another user during a login session. - Invoked without a username, su defaults to becoming the super user. - - Note that Busybox binary must be setuid root for this applet to - work properly. - -config BUSYBOX_CONFIG_SULOGIN - bool "sulogin" - default n - help - sulogin is invoked when the system goes into single user - mode (this is done through an entry in inittab). - -config BUSYBOX_CONFIG_VLOCK - bool "vlock" - default n - select BUSYBOX_CONFIG_FEATURE_SUID - help - Build the "vlock" applet which allows you to lock (virtual) terminals. - - Note that Busybox binary must be setuid root for this applet to - work properly. - -endmenu - diff --git a/openwrt/package/busybox/config/miscutils/Config.in b/openwrt/package/busybox/config/miscutils/Config.in deleted file mode 100644 index 4041701..0000000 --- a/openwrt/package/busybox/config/miscutils/Config.in +++ /dev/null @@ -1,312 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Miscellaneous Utilities" - -config BUSYBOX_CONFIG_ADJTIMEX - bool "adjtimex" - default n - help - Adjtimex reads and optionally sets adjustment parameters for - the Linux clock adjustment algorithm. - -config BUSYBOX_CONFIG_BBCONFIG - bool "bbconfig" - default n - help - The bbconfig applet will print the config file with which - busybox was built. - -config BUSYBOX_CONFIG_CROND - bool "crond" - default y - select BUSYBOX_CONFIG_FEATURE_SUID - help - Crond is a background daemon that parses individual crontab - files and executes commands on behalf of the users in question. - This is a port of dcron from slackware. It uses files of the - format /var/spool/cron/crontabs/<username> files, for example: - $ cat /var/spool/cron/crontabs/root - # Run daily cron jobs at 4:40 every day: - 40 4 * * * /etc/cron/daily > /dev/null 2>&1 - Note that Busybox binary must be setuid root for this applet to - work properly. - -config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL - bool " Using /usr/sbin/sendmail?" - default n - depends on BUSYBOX_CONFIG_CROND - help - Support calling /usr/sbin/sendmail for send cmd outputs. - -config BUSYBOX_CONFIG_CRONTAB - bool "crontab" - default y - select BUSYBOX_CONFIG_FEATURE_SUID - help - Crontab manipulates the crontab for a particular user. Only - the superuser may specify a different user and/or crontab directory. - -config BUSYBOX_CONFIG_DC - bool "dc" - default n - help - Dc is a reverse-polish desk calculator which supports unlimited - precision arithmetic. - -config BUSYBOX_CONFIG_DEVFSD - bool "devfsd" - default n - help - Provides compatibility with old device names on a devfs systems. - You should set it to true if you have devfs enabled. - The following keywords in devsfd.conf are supported: - "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE", - "PERMISSIONS", "EXECUTE", "COPY", "IGNORE", - "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT". - - But only if they are written UPPERCASE!!!!!!!! - -config BUSYBOX_CONFIG_DEVFSD_MODLOAD - bool "Adds support for MODLOAD keyword in devsfd.conf" - default n - depends on BUSYBOX_CONFIG_DEVFSD - help - This actually doesn't work with busybox modutils but needs the real modutils. - -config BUSYBOX_CONFIG_DEVFSD_FG_NP - bool "Enables the -fg and -np options" - default n - depends on BUSYBOX_CONFIG_DEVFSD - help - -fg Run the daemon in the foreground. - -np Exit after parsing the configuration file. Do not poll for events. - -config BUSYBOX_CONFIG_DEVFSD_VERBOSE - bool "Increases logging (and size)" - default n - depends on BUSYBOX_CONFIG_DEVFSD - help - Increases logging to stderr or syslog. - -config BUSYBOX_CONFIG_EJECT - bool "eject" - default n - help - Used to eject cdroms. (defaults to /dev/cdrom) - -config BUSYBOX_CONFIG_LAST - bool "last" - default n - select BUSYBOX_CONFIG_FEATURE_WTMP - help - 'last' displays a list of the last users that logged into the system. - -config BUSYBOX_CONFIG_LESS - bool "less" - default n - 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_CONFIG_FEATURE_LESS_BRACKETS - bool " Enable bracket searching" - default n - depends on BUSYBOX_CONFIG_LESS - help - This option adds the capability to search for matching left and right - brackets, facilitating programming. - -config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS - bool " Enable extra flags" - default n - depends on BUSYBOX_CONFIG_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_CONFIG_FEATURE_LESS_FLAGCS - bool " Enable flag changes" - default n - depends on BUSYBOX_CONFIG_LESS - help - This enables the ability to change command-line flags within - less itself. - -config BUSYBOX_CONFIG_FEATURE_LESS_MARKS - bool " Enable marks" - default n - depends on BUSYBOX_CONFIG_LESS - help - Marks enable positions in a file to be stored for easy reference. - -config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP - bool " Enable regular expressions" - default n - depends on BUSYBOX_CONFIG_LESS - help - Enable regular expressions, allowing complex file searches. - -config BUSYBOX_CONFIG_HDPARM - bool "hdparm" - default n - help - Get/Set hard drive parameters. Primarily intended for ATA - drives. Adds about 13k (or around 30k if you enable the - BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY option).... - -config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY - bool " Support obtaining detailed information directly from drives" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the -I and -Istdin options to obtain detailed information - directly from drives about their capabilities and supported ATA - feature set. Enabling this option will add about 16k... - -config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF - bool " Register an IDE interface (DANGEROUS)" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the 'hdparm -R' option to register an IDE interface. - This is dangerous stuff, so you should probably say N. - -config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF - bool " Un-register an IDE interface (DANGEROUS)" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the 'hdparm -U' option to un-register an IDE interface. - This is dangerous stuff, so you should probably say N. - -config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET - bool " perform device reset (DANGEROUS)" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the 'hdparm -w' option to perform a device reset. - This is dangerous stuff, so you should probably say N. - -config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF - bool " tristate device for hotswap (DANGEROUS)" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the 'hdparm -x' option to tristate device for hotswap, - and the '-b' option to get/set bus state. This is dangerous - stuff, so you should probably say N. - -config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA - bool " get/set using_dma flag (DANGEROUS)" - default n - depends on BUSYBOX_CONFIG_HDPARM - help - Enables the 'hdparm -d' option to get/set using_dma flag. - This is dangerous stuff, so you should probably say N. - -config BUSYBOX_CONFIG_LOCK - bool "lock" - default y - help - Small utility for using locks in scripts - -config BUSYBOX_CONFIG_MAKEDEVS - bool "makedevs" - default n - help - 'makedevs' is a utility used to create a batch of devices with - one command. - . - There are two choices for command line behaviour, the interface - as used by LEAF/Linux Router Project, or a device table file. - . - 'leaf' is traditionally what busybox follows, it allows multiple - devices of a particluar type to be created per command. - e.g. /dev/hda[0-9] - Device properties are passed as command line arguments. - . - 'table' reads device properties from a file or stdin, allowing - a batch of unrelated devices to be makde with one command. - User/group names are allowed as an alternative to uid/gid. - -choice - prompt "Choose makedevs behaviour" - depends BUSYBOX_CONFIG_MAKEDEVS - default BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE - -config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_LEAF - bool "leaf" - -config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE - bool "table" - -endchoice - -config BUSYBOX_CONFIG_MOUNTPOINT - bool "mountpoint" - default n - help - mountpoint checks if the directory is a mountpoint. - -config BUSYBOX_CONFIG_MT - bool "mt" - default n - help - mt is used to control tape devices. You can use the mt utility - to advance or rewind a tape past a specified number of archive - files on the tape. - -config BUSYBOX_CONFIG_RUNLEVEL - bool "runlevel" - default n - help - find the current and previous system runlevel. - - This applet uses utmp but does not rely on busybox supporing - utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc. - -config BUSYBOX_CONFIG_RX - bool "rx" - default n - help - Receive files using the Xmodem protocol. - -config BUSYBOX_CONFIG_STRINGS - bool "strings" - default y - help - strings prints the printable character sequences for each file - specified. - -config BUSYBOX_CONFIG_SETSID - bool "setsid" - default n - help - setsid runs a program in a new session - -config BUSYBOX_CONFIG_TIME - bool "time" - default y - help - The time command runs the specified program with the given arguments. - When the command finishes, time writes a message to standard output - giving timing statistics about this program run. - -config BUSYBOX_CONFIG_WATCHDOG - bool "watchdog" - default y - help - The watchdog utility is used with hardware or software watchdog - device drivers. It opens the specified watchdog device special file - and periodically writes a magic character to the device. If the - watchdog applet ever fails to write the magic character within a - certain amount of time, the watchdog device assumes the system has - hung, and will cause the hardware to reboot. - -endmenu - diff --git a/openwrt/package/busybox/config/modutils/Config.in b/openwrt/package/busybox/config/modutils/Config.in deleted file mode 100644 index 7c9f50f..0000000 --- a/openwrt/package/busybox/config/modutils/Config.in +++ /dev/null @@ -1,147 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Linux Module Utilities" - -config BUSYBOX_CONFIG_INSMOD - bool "insmod" - default y - help - insmod is used to load specified modules in the running kernel. - -config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING - bool "Module version checking" - default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES - help - Support checking of versions for modules. This is used to - ensure that the kernel and module are made for each other. - -config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS - bool "Add module symbols to kernel symbol table" - default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES - help - By adding module symbols to the kernel symbol table, Oops messages - occuring within kernel modules can be properly debugged. By enabling - this feature, module symbols will always be added to the kernel symbol - table for properly debugging support. If you are not interested in - Oops messages from kernel modules, say N. - -config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM - bool "In kernel memory optimization (uClinux only)" - default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES - help - This is a special uClinux only memory optimization that lets insmod - load the specified kernel module directly into kernel space, reducing - memory usage by preventing the need for two copies of the module - being loaded into memory. - -config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP - bool "Enable load map (-m) option" - default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES - help - Enabling this, one would be able to get a load map - output on stdout. This makes kernel module debugging - easier. - If you don't plan to debug kernel modules, you - don't need this option. - -config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL - bool "Symbols in load map" - default n - depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP - help - Without this option, -m will only output section - load map. With this option, -m will also output - symbols load map. - -config BUSYBOX_CONFIG_RMMOD - bool "rmmod" - default y - help - rmmod is used to unload specified modules from the kernel. - -config BUSYBOX_CONFIG_LSMOD - bool "lsmod" - default y - help - lsmod is used to display a list of loaded modules. - -config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT - bool "lsmod pretty output for 2.6.x Linux kernels " - default n - depends on BUSYBOX_CONFIG_LSMOD - help - This option makes output format of lsmod adjusted to - the format of module-init-tools for Linux kernel 2.6. - -config BUSYBOX_CONFIG_MODPROBE - bool "modprobe" - default n - help - Handle the loading of modules, and their dependancies on a high - level. - - Note that in the state, modprobe does not understand multiple - module options from the configuration file. See option below. - -config BUSYBOX_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS - bool "Multiple options parsing" - default n - depends on BUSYBOX_CONFIG_MODPROBE - help - Allow modprobe to understand more than one option to pass to - modules. - - This is a WIP, while waiting for a common argument parsing - common amongst all BB applets (shell, modprobe, etc...) and - adds around 600 bytes on x86, 700 bytes on ARM. The code is - biggish and uggly, but just works. - - Saying Y here is not a bad idea if you're not that short - on storage capacity. - -comment "Options common to multiple modutils" - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_LSMOD - -config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE - # Simulate indentation - bool " Support tainted module checking with new kernels" - default n - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD - help - Support checking for tainted modules. These are usually binary - only modules that will make the linux-kernel list ignore your - support request. - This option is required to support GPLONLY modules. - -config BUSYBOX_CONFIG_FEATURE_2_4_MODULES - # Simulate indentation - bool " Support version 2.2.x to 2.4.x Linux kernels" - default y - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD - help - Support module loading for 2.2.x and 2.4.x Linux kernels. - -config BUSYBOX_CONFIG_FEATURE_2_6_MODULES - # Simulate indentation - bool " Support version 2.6.x Linux kernels" - default y - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE - help - Support module loading for newer 2.6.x Linux kernels. - - -config BUSYBOX_CONFIG_FEATURE_QUERY_MODULE_INTERFACE - bool - default n - depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES - - -endmenu - diff --git a/openwrt/package/busybox/config/networking/Config.in b/openwrt/package/busybox/config/networking/Config.in deleted file mode 100644 index 7e280b7..0000000 --- a/openwrt/package/busybox/config/networking/Config.in +++ /dev/null @@ -1,711 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Networking Utilities" - -config BUSYBOX_CONFIG_FEATURE_IPV6 - bool "Enable IPv6 support" - default y - help - Enable IPv6 support to busybox. This makes applets that talk IP - able to work with IPv6. - -config BUSYBOX_CONFIG_ARPING - bool "arping" - default y - help - Ping hosts by ARP packets - -config BUSYBOX_CONFIG_DNSD - bool "dnsd" - default n - help - Small and static DNS server deamon. - -config BUSYBOX_CONFIG_ETHER_WAKE - bool "ether-wake" - default n - help - Send a magic packet to wake up sleeping machines. - -config BUSYBOX_CONFIG_FAKEIDENTD - bool "fakeidentd" - default n - help - fakeidentd listens to the ident port and returns a set fake - value whatever it gets. - -config BUSYBOX_CONFIG_FTPGET - bool "ftpget" - default n - help - Retrieve a remote file via FTP. - -config BUSYBOX_CONFIG_FTPPUT - bool "ftpput" - default n - help - Store a remote file via FTP. - -config BUSYBOX_CONFIG_HOSTNAME - bool "hostname" - default n - help - Show or set the system's host name - -config BUSYBOX_CONFIG_HTTPD - bool "httpd" - default y - help - Serve web pages via an HTTP server. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY - bool " Support using httpd only from inetd" - default n - depends on BUSYBOX_CONFIG_HTTPD - help - This option disables uid and port options for the httpd applet - but requires inetd server daemon. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH - bool " Enable Basic http Authentication" - default y - depends on BUSYBOX_CONFIG_HTTPD - help - Utilizes password settings from /etc/httpd.conf for basic - authentication on a per url basis. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5 - bool " Support MD5 crypted passwords for http Authentication" - default y - depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH - help - Enables basic per url authentication from /etc/httpd.conf - using md5 passwords. - -if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY -config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP - bool " Support reloading the global config file using hup signal" - default y - depends on BUSYBOX_CONFIG_HTTPD - help - This option enables processing of SIGHUP to reload cached - configuration settings. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID - bool " Enable support -u <user> option" - default n - depends on BUSYBOX_CONFIG_HTTPD - help - This option allows the server to run as a specific user - rather than defaulting to the user that starts the server. - Use of this option requires special privileges to change to a - different user. -endif - -config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES - bool " Support loading additional MIME types at run-time" - default y - depends on BUSYBOX_CONFIG_HTTPD - help - This option enables support for additional MIME types at - run-time to be specified in the configuration file. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI - bool " Support Common Gateway Interface (CGI)" - default y - depends on BUSYBOX_CONFIG_HTTPD - help - This option allows scripts and executables to be invoked - when specific urls are requested. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR - bool " Enable support for running scripts through an interpreter" - default n - depends on BUSYBOX_CONFIG_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 addition line in your httpd - config file: - *.php:/path/to/your/php - -config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV - bool " Support the REMOTE_PORT environment variable for CGI" - default y - depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI - help - Use of this option can assist scripts in generating - references that contain a unique port number. - -config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR - bool " Enable the -e option for shell script CGI simplification." - default y - depends on BUSYBOX_CONFIG_HTTPD - help - After set, this option allows html encoding arbitrary - strings for display of the browser. Output goes to stdout. - For example, httpd -e "<Hello World>" as - "<Hello World>". - -config BUSYBOX_CONFIG_IFCONFIG - bool "ifconfig" - default y - help - Ifconfig is used to configure the kernel-resident network interfaces. - -config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS - bool " Enable status reporting output (+7k)" - default y - depends on BUSYBOX_CONFIG_IFCONFIG - help - If ifconfig is called with no arguments it will display the status - of the currently active interfaces. - -config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP - bool " Enable slip-specific options \"keepalive\" and \"outfill\"" - default n - depends on BUSYBOX_CONFIG_IFCONFIG - help - Allow "keepalive" and "outfill" support for SLIP. If you're not - planning on using serial lines, leave this unchecked. - -config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ - bool " Enable options \"mem_start\", \"io_addr\", and \"irq\"" - default n - depends on BUSYBOX_CONFIG_IFCONFIG - help - Allow the start address for shared memory, start address for I/O, - and/or the interrupt line used by the specified device. - -config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW - bool " Enable option \"hw\" (ether only)" - default y - depends on BUSYBOX_CONFIG_IFCONFIG - help - Set the hardware address of this interface, if the device driver - supports this operation. Currently, we only support the 'ether' - class. - -config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS - bool " Set the broadcast automatically" - default y - depends on BUSYBOX_CONFIG_IFCONFIG - help - Setting this will make ifconfig attempt to find the broadcast - automatically if the value '+' is used. - -config BUSYBOX_CONFIG_IFUPDOWN - bool "ifupdown" - default n - select BUSYBOX_CONFIG_RUN_PARTS - help - Activate or deactivate the specified interfaces. This applet makes - use of either "ifconfig" and "route" or the "ip" command to actually - configure network interfaces. Therefore, you will probably also want - to enable either BUSYBOX_CONFIG_IFCONFIG and BUSYBOX_CONFIG_ROUTE, or enable - BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP and the various BUSYBOX_CONFIG_IP options. Of - course you could use non-busybox versions of these programs, so - against my better judgement (since this will surely result in plenty - of support questions on the mailing list), I do not force you to - enable these additional options. It is up to you to supply either - "ifconfig" and "route" or the "ip" command, either via busybox or via - standalone utilities. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP - bool " Use ip applet" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN - help - Use the iproute "ip" command to implement "ifup" and "ifdown", rather - than the default of using the older 'ifconfig' and 'route' utilities. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN - bool " Use busybox ip applet" - default n - depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP - select BUSYBOX_CONFIG_IP - select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS - select BUSYBOX_CONFIG_FEATURE_IP_LINK - select BUSYBOX_CONFIG_FEATURE_IP_ROUTE - help - Use the busybox iproute "ip" applet to implement "ifupdown". - - If leave this disabled, you must install the full-blown iproute2 - utility or the "ifup" and "ifdown" applets will not work. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN - bool " Use busybox ifconfig and route applets" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP - select BUSYBOX_CONFIG_IFCONFIG - select BUSYBOX_CONFIG_ROUTE - help - Use the busybox iproute "ifconfig" and "route" applets to - implement the "ifup" and "ifdown" utilities. - - If leave this disabled, you must install the full-blown ifconfig - and route utilities, or the "ifup" and "ifdown" applets will not - work. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4 - bool " Enable support for IPv4" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN - help - If you want busybox to talk IPv4, leave this on. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6 - bool " Enable support for IPv6" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN - help - If you need support for IPv6, turn this option on. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX - bool " Enable support for IPX" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN - help - If this option is selected you can use busybox to work with IPX - networks. - -config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING - bool " Enable mapping support" - default n - depends on BUSYBOX_CONFIG_IFUPDOWN - help - This enables support for the "mapping" stanza, unless you have - a weird network setup you don't need it. - -config BUSYBOX_CONFIG_INETD - bool "inetd" - default n - help - Internet superserver daemon - -config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO - bool " Support echo service" - default n - depends on BUSYBOX_CONFIG_INETD - help - Echo received data internal inetd service - -config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD - bool " Support discard service" - default n - depends on BUSYBOX_CONFIG_INETD - help - Internet /dev/null internal inetd service - -config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME - bool " Support time service" - default n - depends on BUSYBOX_CONFIG_INETD - help - Return 32 bit time since 1900 internal inetd service - -config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME - bool " Support daytime service" - default n - depends on BUSYBOX_CONFIG_INETD - help - Return human-readable time internal inetd service - -config BUSYBOX_CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN - bool " Support chargen service" - default n - depends on BUSYBOX_CONFIG_INETD - help - Familiar character generator internal inetd service - -config BUSYBOX_CONFIG_FEATURE_INETD_RPC - bool " Support RPC services" - default n - depends on BUSYBOX_CONFIG_INETD - help - Suuport Sun-RPC based services - - -config BUSYBOX_CONFIG_IP - bool "ip" - default n - help - The "ip" applet is a TCP/IP interface configuration and routing - utility. You generally don't need "ip" to use busybox with - TCP/IP. - -if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPADDR - config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS - default n - comment " address (forced enabled for ipaddr)" -endif -if ! (CONFIG_IP && BUSYBOX_CONFIG_IPADDR) - config BUSYBOX_CONFIG_FEATURE_IP_ADDRESS - bool " address" - default n - depends on BUSYBOX_CONFIG_IP - help - Address manipulation support for the "ip" applet. -endif - -if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPLINK - config BUSYBOX_CONFIG_FEATURE_IP_LINK - default n - comment " link (forced enabled for iplink)" -endif -if !(CONFIG_IP && BUSYBOX_CONFIG_IPLINK) - config BUSYBOX_CONFIG_FEATURE_IP_LINK - bool " link" - default n - depends on BUSYBOX_CONFIG_IP - help - Configure network devices with "ip". -endif - -if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPROUTE - config BUSYBOX_CONFIG_FEATURE_IP_ROUTE - default n - comment " route (forced enabled for iproute)" -endif -if !(CONFIG_IP && BUSYBOX_CONFIG_IPROUTE) - config BUSYBOX_CONFIG_FEATURE_IP_ROUTE - bool " route" - default n - depends on BUSYBOX_CONFIG_IP - help - Add support for routing table management to "ip". -endif - -if BUSYBOX_CONFIG_IP && BUSYBOX_CONFIG_IPTUNNEL - config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL - default n - comment " tunnel (forced enabled for iptunnel)" -endif -if !(CONFIG_IP && BUSYBOX_CONFIG_IPTUNNEL) - config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL - bool " tunnel" - default n - depends on BUSYBOX_CONFIG_IP - help - Add support for tunneling commands to "ip". -endif - -config BUSYBOX_CONFIG_IPCALC - bool "ipcalc" - default n - help - ipcalc takes an IP address and netmask and calculates the - resulting broadcast, network, and host range. - -config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY - bool " Fancy IPCALC, more options, adds 1 kbyte" - default n - depends on BUSYBOX_CONFIG_IPCALC - help - Adds the options hostname, prefix and silent to the output of "ipcalc". - -config BUSYBOX_CONFIG_IPADDR - bool "ipaddr" - default n - help - Equivalent to selecting address support to "ip", above. - -config BUSYBOX_CONFIG_IPLINK - bool "iplink" - default n - help - Equivalent to selecting link support to "ip", above. - -config BUSYBOX_CONFIG_IPROUTE - bool "iproute" - default n - help - Equivalent to selecting route support to "ip", above. - -config BUSYBOX_CONFIG_IPTUNNEL - bool "iptunnel" - default n - help - Equivalent to selecting tunnel support to "ip", above. - -config BUSYBOX_CONFIG_NAMEIF - bool "nameif" - default n - 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: IF_NAMESIZE = 16 - File fields are separated by space or tab. - File format: - # Comment - new_interface_name XX:XX:XX:XX:XX:XX - -config BUSYBOX_CONFIG_NC - bool "nc" - default y - help - A simple Unix utility which reads and writes data across network - connections. - -config BUSYBOX_CONFIG_NETMSG - bool "netmsg" - default y - help - simple program for sending udp broadcast messages - -config BUSYBOX_CONFIG_NC_GAPING_SECURITY_HOLE - bool "gaping security hole" - default n - depends on BUSYBOX_CONFIG_NC - help - Add support for executing a program after making or receiving a - successful connection (-e option). - -config BUSYBOX_CONFIG_NETSTAT - bool "netstat" - default y - help - netstat prints information about the Linux networking subsystem. - -config BUSYBOX_CONFIG_NSLOOKUP - bool "nslookup" - default y - help - nslookup is a tool to query Internet name servers. - -config BUSYBOX_CONFIG_PING - bool "ping" - default y - help - ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to - elicit an ICMP ECHO_RESPONSE from a host or gateway. - -config BUSYBOX_CONFIG_FEATURE_FANCY_PING - bool " Enable fancy ping output" - default y - depends on BUSYBOX_CONFIG_PING - help - Make the output from the ping applet include statistics, and at the - same time provide full support for ICMP packets. - -config BUSYBOX_CONFIG_PING6 - bool "ping6" - default y - depends on BUSYBOX_CONFIG_FEATURE_IPV6 - help - This will give you a ping that can talk IPv6. - -config BUSYBOX_CONFIG_FEATURE_FANCY_PING6 - bool " Enable fancy ping6 output" - default y - depends on BUSYBOX_CONFIG_PING6 - help - Make the output from the ping6 applet include statistics, and at the - same time provide full support for ICMP packets. - -config BUSYBOX_CONFIG_ROUTE - bool "route" - default y - help - Route displays or manipulates the kernel's IP routing tables. - -config BUSYBOX_CONFIG_TELNET - bool "telnet" - default y - help - Telnet is an interface to the TELNET protocol, but is also commonly - used to test other simple protocols. - -config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE - bool " Pass TERM type to remote host" - default y - depends on BUSYBOX_CONFIG_TELNET - help - Setting this option will forward the TERM environment variable to the - remote host you are connecting to. This is useful to make sure that - things like ANSI colors and other control sequences behave. - -config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN - bool " Pass USER type to remote host" - default n - depends on BUSYBOX_CONFIG_TELNET - help - Setting this option will forward the USER environment variable to the - remote host you are connecting to. This is useful when you need to - log into a machine without telling the username (autologin). This - option enables `-a' and `-l USER' arguments. - -config BUSYBOX_CONFIG_TELNETD - bool "telnetd" - default y - help - A daemon for the TELNET protocol, allowing you to log onto the host - running the daemon. Please keep in mind that the TELNET protocol - sends passwords in plain text. If you can't afford the space for an - SSH daemon and you trust your network, you may say 'y' here. As a - more secure alternative, you should seriously consider installing the - very small Dropbear SSH daemon instead: - http://matt.ucc.asn.au/dropbear/dropbear.html - - Note that for busybox telnetd to work you need several things: - First of all, your kernel needs: - BUSYBOX_CONFIG_UNIX98_PTYS=y - BUSYBOX_CONFIG_DEVPTS_FS=y - - Next, you need a /dev/pts directory on your root filesystem: - - $ ls -ld /dev/pts - drwxr-xr-x 2 root root 0 Sep 23 13:21 /dev/pts/ - - Next you need the pseudo terminal master multiplexer /dev/ptmx: - - $ ls -la /dev/ptmx - crw-rw-rw- 1 root tty 5, 2 Sep 23 13:55 /dev/ptmx - - Any /dev/ttyp[0-9]* files you may have can be removed. - Next, you need to mount the devpts filesystem on /dev/pts using: - - mount -t devpts devpts /dev/pts - - You need to be sure that Busybox has BUSYBOX_CONFIG_LOGIN and - BUSYBOX_CONFIG_FEATURE_SUID enabled. And finally, you should make - certain that Busybox has been installed setuid root: - - chown root.root /bin/busybox - chmod 4755 /bin/busybox - - with all that done, telnetd _should_ work.... - - -config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD - bool " Support call from inetd only" - default n - depends on BUSYBOX_CONFIG_TELNETD - help - Selecting this will make telnetd only callable from inetd, - removing the standalone support. - -config BUSYBOX_CONFIG_TFTP - bool "tftp" - default n - help - This enables the Trivial File Transfer Protocol client program. TFTP - is usually used for simple, small transfers such as a root image - for a network-enabled bootloader. - -config BUSYBOX_CONFIG_FEATURE_TFTP_GET - bool " Enable \"get\" command" - default n - depends on BUSYBOX_CONFIG_TFTP - help - Add support for the GET command within the TFTP client. This allows - a client to retrieve a file from a TFTP server. - -config BUSYBOX_CONFIG_FEATURE_TFTP_PUT - bool " Enable \"put\" command" - default n - depends on BUSYBOX_CONFIG_TFTP - help - Add support for the PUT command within the TFTP client. This allows - a client to transfer a file to a TFTP server. - -config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE - bool " Enable \"blocksize\" command" - default n - depends on BUSYBOX_CONFIG_TFTP - help - Allow the client to specify the desired block size for transfers. - -config BUSYBOX_CONFIG_FEATURE_TFTP_DEBUG - bool " Enable debug" - default n - depends on BUSYBOX_CONFIG_TFTP - help - Enable debug settings for tftp. This is useful if you're running - into problems with tftp as the protocol doesn't help you much when - you run into problems. - -config BUSYBOX_CONFIG_TRACEROUTE - bool "traceroute" - default y - help - Utility to trace the route of IP packets - -config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE - bool " Enable verbose output" - default y - depends on BUSYBOX_CONFIG_TRACEROUTE - help - Add some verbosity to traceroute. This includes amongst other things - hostnames and ICMP response types. - -config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE - bool " Enable loose source route" - default n - depends on BUSYBOX_CONFIG_TRACEROUTE - help - Add option to specify a loose source route gateway - (8 maximum). - -config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP - bool " Use ICMP instead of UDP" - default n - depends on BUSYBOX_CONFIG_TRACEROUTE - help - Add feature to allow for ICMP ECHO instead of UDP datagrams. - - -config BUSYBOX_CONFIG_VCONFIG - bool "vconfig" - default y - help - Creates, removes, and configures VLAN interfaces - -config BUSYBOX_CONFIG_WGET - bool "wget" - default y - help - wget is a utility for non-interactive download of files from HTTP, - HTTPS, and FTP servers. - -config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR - bool " Enable a nifty process meter (+2k)" - default y - depends on BUSYBOX_CONFIG_WGET - help - Enable the transfer progress bar for wget transfers. - -config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION - bool " Enable HTTP authentication" - default y - depends on BUSYBOX_CONFIG_WGET - help - Support authenticated HTTP transfers. - -config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL - bool " Enable IPv6 literal addresses" - default y - depends on BUSYBOX_CONFIG_WGET - help - Support IPv6 address literal notation in URLs. - -source package/busybox/config/networking/udhcp/Config.in - -config BUSYBOX_CONFIG_ZCIP - bool "zcip" - default n - help - ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927. - It's a daemon that allocates and defends a dynamically assigned - address on the 169.254/16 network, requiring no system administrator. - - See http://www.zeroconf.org for further details, and "zcip.script" - in the busybox examples. - -endmenu - diff --git a/openwrt/package/busybox/config/networking/udhcp/Config.in b/openwrt/package/busybox/config/networking/udhcp/Config.in deleted file mode 100644 index d15128c..0000000 --- a/openwrt/package/busybox/config/networking/udhcp/Config.in +++ /dev/null @@ -1,62 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "udhcp Server/Client" - -config BUSYBOX_CONFIG_UDHCPD - bool "udhcp Server (udhcpd)" - default n - help - uDHCPd is a DHCP server geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. - - See http://udhcp.busybox.net for further details. - -config BUSYBOX_CONFIG_UDHCPC - bool "udhcp Client (udhcpc)" - default y - help - uDHCPc is a DHCP client geared primarily toward embedded systems, - while striving to be fully functional and RFC compliant. - - The udhcp client negotiates a lease with the DHCP server and - notifies a set of scripts when a lease is obtained or lost. - - See http://udhcp.busybox.net for further details. - -config BUSYBOX_CONFIG_DUMPLEASES - bool "Lease display utility (dumpleases)" - default n - depends on BUSYBOX_CONFIG_UDHCPD - help - dumpleases displays the leases written out by the udhcpd server. - Lease times are stored in the file by time remaining in lease, or - by the absolute time that it expires in seconds from epoch. - - See http://udhcp.busybox.net for further details. - -config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG - bool " Log udhcp messages to syslog (instead of stdout)" - default n - depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC - help - If selected, udhcpd will log all its messages to syslog, otherwise, - it will attempt to log them to stdout. - - See http://udhcp.busybox.net for further details. - -config BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG - bool " Compile udhcp with noisy debugging messages" - default n - depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC - help - If selected, udhcpd will output extra debugging output. If using - this option, compile uDHCP with "-g", and do not fork the daemon to - the background. - - See http://udhcp.busybox.net for further details. - -endmenu - diff --git a/openwrt/package/busybox/config/procps/Config.in b/openwrt/package/busybox/config/procps/Config.in deleted file mode 100644 index b94632b..0000000 --- a/openwrt/package/busybox/config/procps/Config.in +++ /dev/null @@ -1,121 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Process Utilities" - -config BUSYBOX_CONFIG_FREE - bool "free" - default y - 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. - The shared memory column should be ignored; it is obsolete. - -config BUSYBOX_CONFIG_FUSER - bool "fuser" - default n - help - fuser lists all PIDs (Process IDs) that currently have a given - file open. fuser can also list all PIDs that have a given network - (TCP or UDP) port open. - -config BUSYBOX_CONFIG_KILL - bool "kill" - default y - help - The command kill sends the specified signal to the specified - process or process group. If no signal is specified, the TERM - signal is sent. - -config BUSYBOX_CONFIG_KILLALL - bool "killall" - default y - depends on BUSYBOX_CONFIG_KILL - help - killall sends a signal to all processes running any of the - specified commands. If no signal name is specified, SIGTERM is - sent. - -config BUSYBOX_CONFIG_KILLALL5 - bool "killall5" - default y - depends on BUSYBOX_CONFIG_KILL - -config BUSYBOX_CONFIG_PIDOF - bool "pidof" - 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_CONFIG_FEATURE_PIDOF_SINGLE - bool " Enable argument for single shot (-s)" - default n - depends on BUSYBOX_CONFIG_PIDOF - help - Support argument '-s' for returning only the first pid found. - -config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT - bool " Enable argument for omitting pids (-o)" - default n - depends on BUSYBOX_CONFIG_PIDOF - help - Support argument '-o' for omitting the given pids in output. - The special pid %PPID can be used to name the parent process - of the pidof, in other words the calling shell or shell script. - -config BUSYBOX_CONFIG_PS - bool "ps" - default y - help - ps gives a snapshot of the current processes. - -config BUSYBOX_CONFIG_FEATURE_PS_WIDE - bool " Enable argument for wide output (-w)" - default n - depends on BUSYBOX_CONFIG_PS - help - Support argument 'w' for wide output. - If given once, 132 chars are printed and given more than - one, the length is unlimited. - -config BUSYBOX_CONFIG_RENICE - bool "renice" - default n - help - Renice alters the scheduling priority of one or more running - processes. - -config BUSYBOX_CONFIG_BB_SYSCTL - bool "sysctl" - default y - help - Configure kernel parameters at runtime. - -config BUSYBOX_CONFIG_TOP - bool "top" - default y - help - The top program provides a dynamic real-time view of a running - system. - -config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE - bool " Support showing CPU usage percentage (add 2k bytes)" - default y - depends on BUSYBOX_CONFIG_TOP - help - Make top display CPU usage. - -config BUSYBOX_CONFIG_UPTIME - bool "uptime" - default y - 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. - - -endmenu - diff --git a/openwrt/package/busybox/config/shell/Config.in b/openwrt/package/busybox/config/shell/Config.in deleted file mode 100644 index b9a1b4d..0000000 --- a/openwrt/package/busybox/config/shell/Config.in +++ /dev/null @@ -1,288 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Shells" - -choice - prompt "Choose your default shell" - default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH - help - Choose a shell. The ash shell is the most bash compatible - and full featured one. - -config BUSYBOX_CONFIG_FEATURE_SH_IS_ASH - select BUSYBOX_CONFIG_ASH - bool "ash" - -config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH - select BUSYBOX_CONFIG_HUSH - bool "hush" - -config BUSYBOX_CONFIG_FEATURE_SH_IS_LASH - select BUSYBOX_CONFIG_LASH - bool "lash" - -config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH - select BUSYBOX_CONFIG_MSH - bool "msh" - -config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE - bool "none" - -endchoice - -config BUSYBOX_CONFIG_ASH - bool "ash" - default y - select BUSYBOX_CONFIG_TEST - help - Tha 'ash' shell adds about 60k in the default configuration and is - the most complete and most pedantically correct shell included with - busybox. This shell is actually a derivative of the Debian 'dash' - shell (by Herbert Xu), which was created by porting the 'ash' shell - (written by Kenneth Almquist) from NetBSD. - -comment "Ash Shell Options" - depends on BUSYBOX_CONFIG_ASH - -config BUSYBOX_CONFIG_ASH_JOB_CONTROL - bool " Enable Job control" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable job control in the ash shell. - -config BUSYBOX_CONFIG_ASH_READ_NCHARS - bool " Enable 'read -n N' and 'read -s' support" - default n - depends on BUSYBOX_CONFIG_ASH - help - 'read -n N' will return a value after N characters have been read. - 'read -s' will read without echoing the user's input. - -config BUSYBOX_CONFIG_ASH_READ_TIMEOUT - bool " Enable 'read -t S' support." - default y - depends on BUSYBOX_CONFIG_ASH - help - 'read -t S' will return a value after S seconds have passed. - This implementation will allow fractional seconds, expressed - as a decimal fraction, e.g. 'read -t 2.5 foo'. - -config BUSYBOX_CONFIG_ASH_ALIAS - bool " Enable alias support" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable alias support in the ash shell. - -config BUSYBOX_CONFIG_ASH_MATH_SUPPORT - bool " Enable Posix math support" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable math support in the ash shell. - -config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64 - bool " Extend Posix math support to 64 bit" - default n - depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT - help - Enable 64-bit math support in the ash shell. This will make - the shell slightly larger, but will allow computation with very - large numbers. - -config BUSYBOX_CONFIG_ASH_GETOPTS - bool " Enable getopts builtin to parse positional parameters" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable getopts builtin in the ash shell. - -config BUSYBOX_CONFIG_ASH_CMDCMD - bool " Enable cmdcmd to override shell builtins" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable support for the ash 'command' builtin, which allows - you to run the specified command with the specified arguments, - even when there is an ash builtin command with the same name. - -config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO - bool " Enable builtin version of 'echo'" - default y - depends on BUSYBOX_CONFIG_ASH - help - Enable support for echo, built in to ash. - -# this entry also appears in coreutils/Config.in, next to the echo applet -config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO - bool " Enable echo options (-n and -e)" - default y - depends on BUSYBOX_CONFIG_ASH_BUILTIN_ECHO - help - This adds options (-n and -e) to echo. - -config BUSYBOX_CONFIG_ASH_MAIL - bool " Check for new mail on interactive shells" - default n - depends on BUSYBOX_CONFIG_ASH - help - Enable "check for new mail" in the ash shell. - -config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE - bool " Optimize for size instead of speed" - default y - depends on BUSYBOX_CONFIG_ASH - help - Compile ash for reduced size at the price of speed. - -config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT - bool " Enable pseudorandom generator and variable $RANDOM" - default n - depends on BUSYBOX_CONFIG_ASH - help - Enable pseudorandom generator and dynamic variable "$RANDOM". - Each read of "$RANDOM" will generate a new pseudorandom value. - You can reset the generator by using a specified start value. - After "unset RANDOM" then generator will switch off and this - variable will no longer have special treatment. - -config BUSYBOX_CONFIG_ASH_EXPAND_PRMT - bool " Expand prompt string" - default n - depends on BUSYBOX_CONFIG_ASH - help - "PS#" may be contain volatile content, such as backquote commands. - This option recreates the prompt string from the environment - variable each time it is displayed. - -config BUSYBOX_CONFIG_HUSH - bool "hush" - default n - select BUSYBOX_CONFIG_TRUE - select BUSYBOX_CONFIG_FALSE - select BUSYBOX_CONFIG_TEST - help - hush is a very small shell (just 18k) and it has fairly complete - Bourne shell grammar. It even handles all the normal flow control - options such as if/then/elif/else/fi, for/in/do/done, while loops, - etc. - - It does not handle case/esac, select, function, here documents ( << - word ), arithmetic expansion, aliases, brace expansion, tilde - expansion, &> and >& redirection of stdout+stderr, etc. - - -config BUSYBOX_CONFIG_LASH - bool "lash" - default n - select BUSYBOX_CONFIG_TRUE - select BUSYBOX_CONFIG_FALSE - select BUSYBOX_CONFIG_TEST - help - lash is the very smallest shell (adds just 10k) and it is quite - usable as a command prompt, but it is not suitable for any but the - most trivial scripting (such as an initrd that calls insmod a few - times) since it does not understand any Bourne shell grammar. It - does handle pipes, redirects, and job control though. Adding in - command editing makes it a very nice lightweight command prompt. - - -config BUSYBOX_CONFIG_MSH - bool "msh" - default n - select BUSYBOX_CONFIG_TRUE - select BUSYBOX_CONFIG_FALSE - select BUSYBOX_CONFIG_TEST - help - The minix shell (adds just 30k) is quite complete and handles things - like for/do/done, case/esac and all the things you expect a Bourne - shell to do. It is not always pedantically correct about Bourne - shell grammar (try running the shell testscript "tests/sh.testcases" - on it and compare vs bash) but for most things it works quite well. - It also uses only vfork, so it can be used on uClinux systems. - -comment "Bourne Shell Options" - depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH - -config BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET - bool "Hide message on interactive shell startup" - default n - depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH - help - Remove the busybox introduction when starting a shell. - -config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL - bool "Standalone shell" - default n - depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH - help - This option causes the selected busybox shell to use busybox applets - in preference to executables in the PATH whenever possible. For - example, entering the command 'ifconfig' into the shell would cause - busybox to use the ifconfig busybox applet. Specifying the fully - qualified executable name, such as '/sbin/ifconfig' will still - execute the /sbin/ifconfig executable on the filesystem. This option - is generally used when creating a statically linked version of busybox - for use as a rescue shell, in the event that you screw up your system. - - Note that when using this option, the shell will attempt to directly - run '/bin/busybox'. If you do not have the busybox binary sitting in - that exact location with that exact name, this option will not work at - all. - -config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - bool "command line editing" - default y - depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH - help - Enable command editing in shell. - -config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING_VI - bool "vi-style line editing commands" - default n - depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - help - Enable vi-style line editing in the shell. This mode can be - turned on and off with "set -o vi" and "set +o vi". - -config BUSYBOX_CONFIG_FEATURE_COMMAND_HISTORY - int "history size" - default 15 - depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - help - Specify command history size in shell. - -config BUSYBOX_CONFIG_FEATURE_COMMAND_SAVEHISTORY - bool "history saving" - default n - depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - help - Enable history saving in ash shell. - -config BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION - bool "tab completion" - default y - depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - help - Enable tab completion in shell. - -config BUSYBOX_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION - bool "username completion" - default n - depends on BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION - help - Enable username completion in shell. - -config BUSYBOX_CONFIG_FEATURE_SH_FANCY_PROMPT - bool "Fancy shell prompts" - default y - depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING - help - Setting this option allows for prompts to use things like \w and - \$ and also using escape codes. - -endmenu diff --git a/openwrt/package/busybox/config/sysklogd/Config.in b/openwrt/package/busybox/config/sysklogd/Config.in deleted file mode 100644 index 209bdff..0000000 --- a/openwrt/package/busybox/config/sysklogd/Config.in +++ /dev/null @@ -1,109 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "System Logging Utilities" - -config BUSYBOX_CONFIG_SYSLOGD - bool "syslogd" - default y - help - The syslogd utility is used to record logs of all the - significant events that occur on a system. Every - message that is logged records the date and time of the - event, and will generally also record the name of the - application that generated the message. When used in - conjunction with klogd, messages from the Linux kernel - can also be recorded. This is terribly useful, - especially for finding what happened when something goes - wrong. And something almost always will go wrong if - you wait long enough.... - -config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE - bool " Rotate message files" - default y - depends on BUSYBOX_CONFIG_SYSLOGD - help - This enables syslogd to rotate the message files - on his own. No need to use an external rotatescript. - -config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG - bool " Remote Log support" - default y - depends on BUSYBOX_CONFIG_SYSLOGD - help - When you enable this feature, the syslogd utility can - be used to send system log messages to another system - connected via a network. This allows the remote - machine to log all the system messages, which can be - terribly useful for reducing the number of serial - cables you use. It can also be a very good security - measure to prevent system logs from being tampered with - by an intruder. - -config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG - bool " Circular Buffer support" - default y - depends on BUSYBOX_CONFIG_SYSLOGD - help - When you enable this feature, the syslogd utility will - use a circular buffer to record system log messages. - When the buffer is filled it will continue to overwrite - the oldest messages. This can be very useful for - systems with little or no permanent storage, since - otherwise system logs can eventually fill up your - entire filesystem, which may cause your system to - break badly. - -config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE - int " Circular buffer size in Kbytes (minimum 4KB)" - default 16 - depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG - help - This option sets the size of the circular buffer - used to record system log messages. - -config BUSYBOX_CONFIG_LOGREAD - bool " logread" - default y - depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG - help - If you enabled Circular Buffer support, you almost - certainly want to enable this feature as well. This - utility will allow you to read the messages that are - stored in the syslogd circular buffer. - -config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING - bool " logread double buffering" - default n - depends on BUSYBOX_CONFIG_LOGREAD - help - 'logread' ouput to slow serial terminals can have - side effects on syslog because of the semaphore. - This option make logread to double buffer copy - from circular buffer, minimizing semaphore - contention at some minor memory expense. - -config BUSYBOX_CONFIG_KLOGD - bool "klogd" - default y - depends on BUSYBOX_CONFIG_SYSLOGD - help - klogd is a utility which intercepts and logs all - messages from the Linux kernel and sends the messages - out to the 'syslogd' utility so they can be logged. If - you wish to record the messages produced by the kernel, - you should enable this option. - -config BUSYBOX_CONFIG_LOGGER - bool "logger" - default y - help - The logger utility allows you to send arbitrary text - messages to the system log (i.e. the 'syslogd' utility) so - they can be logged. This is generally used to help locate - problems that occur within programs and scripts. - -endmenu - diff --git a/openwrt/package/busybox/config/util-linux/Config.in b/openwrt/package/busybox/config/util-linux/Config.in deleted file mode 100644 index 474ef02..0000000 --- a/openwrt/package/busybox/config/util-linux/Config.in +++ /dev/null @@ -1,451 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. -# - -menu "Linux System Utilities" - -config BUSYBOX_CONFIG_DMESG - bool "dmesg" - default y - 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 - the kernel ring buffer. You can use dmesg to print the kernel's ring - buffer, clear the kernel ring buffer, change the size of the kernel - ring buffer, and change the priority level at which kernel messages - are also logged to the system console. Enable this option if you - wish to enable the 'dmesg' utility. - -config BUSYBOX_CONFIG_FBSET - bool "fbset" - default n - 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 - interface to access a graphics display. Enable this option - if you wish to enable the 'fbset' utility. - -config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY - bool " Turn on extra fbset options" - default n - depends on BUSYBOX_CONFIG_FBSET - help - This option enables extended fbset options, allowing one to set the - framebuffer size, color depth, etc. interface to access a graphics - display. Enable this option if you wish to enable extended fbset - options. - -config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE - bool " Turn on fbset readmode support" - default n - depends on BUSYBOX_CONFIG_FBSET - help - This option allows fbset to read the video mode database stored by - default n /etc/fb.modes, which can be used to set frame buffer - device to pre-defined video modes. - -config BUSYBOX_CONFIG_FDFLUSH - bool "fdflush" - default n - help - fdflush is only needed when changing media on slightly-broken - removable media drives. It is used to make Linux believe that a - hardware disk-change switch has been actuated, which causes Linux to - forget anything it has cached from the previous media. If you have - such a slightly-broken drive, you will need to run fdflush every time - you change a disk. Most people have working hardware and can safely - leave this disabled. - -config BUSYBOX_CONFIG_FDFORMAT - bool "fdformat" - default n - help - fdformat is used to low-level format a floppy disk. - -config BUSYBOX_CONFIG_FDISK - bool "fdisk" - default n - help - The fdisk utility is used to divide hard disks into one or more - logical disks, which are generally called partitions. This utility - can be used to list and edit the set of partitions or BSD style - 'disk slices' that are defined on a hard drive. - -config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS - bool - default y - depends on BUSYBOX_CONFIG_FDISK - help - Enable this option to support large disks > 4GB. - -config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - bool " Write support" - default n - depends on BUSYBOX_CONFIG_FDISK - help - Enabling this option allows you to create or change a partition table - and write those changes out to disk. If you leave this option - disabled, you will only be able to view the partition table. - -config BUSYBOX_CONFIG_FEATURE_AIX_LABEL - bool " Support AIX disklabels" - default n - depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - help - Enabling this option allows you to create or change AIX disklabels. - Most people can safely leave this option disabled. - -config BUSYBOX_CONFIG_FEATURE_SGI_LABEL - bool " Support SGI disklabels" - default n - depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - help - Enabling this option allows you to create or change SGI disklabels. - Most people can safely leave this option disabled. - -config BUSYBOX_CONFIG_FEATURE_SUN_LABEL - bool " Support SUN disklabels" - default n - depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - help - Enabling this option allows you to create or change SUN disklabels. - Most people can safely leave this option disabled. - -config BUSYBOX_CONFIG_FEATURE_OSF_LABEL - bool " Support BSD disklabels" - default n - depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - help - Enabling this option allows you to create or change BSD disklabels - and define and edit BSD disk slices. - -config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED - bool " Support expert mode" - default n - depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE - help - Enabling this option allows you to do terribly unsafe things like - define arbitrary drive geometry, move the beginning of data in a - partition, and similarly evil things. Unless you have a very good - reason you would be wise to leave this disabled. - -config BUSYBOX_CONFIG_FREERAMDISK - bool "freeramdisk" - default n - help - Linux allows you to create ramdisks. This utility allows you to - delete them and completely free all memory that was used for the - ramdisk. For example, if you boot Linux into a ramdisk and later - pivot_root, you may want to free the memory that is allocated to the - ramdisk. If you have no use for freeing memory from a ramdisk, leave - this disabled. - -config BUSYBOX_CONFIG_FSCK_MINIX - bool "fsck_minix" - default n - help - The minix filesystem is a nice, small, compact, read-write filesystem - with little overhead. It is not a journaling filesystem however and - can experience corruption if it is not properly unmounted or if the - power goes off in the middle of a write. This utility allows you to - check for and attempt to repair any corruption that occurs to a minix - filesystem. - -config BUSYBOX_CONFIG_MKFS_MINIX - bool "mkfs_minix" - default n - 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_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX - -config BUSYBOX_CONFIG_FEATURE_MINIX2 - bool " Support Minix fs v2 (fsck_minix/mkfs_minix)" - default n - depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX - help - If you wish to be able to create version 2 minix filesystems, enable this. - If you enabled 'mkfs_minix' then you almost certainly want to be using the - version 2 filesystem support. - -config BUSYBOX_CONFIG_GETOPT - bool "getopt" - default n - 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 - for legal (and illegal) options. If you want to write horribly - complex shell scripts, or use some horribly complex shell script - written by others, this utility may be for you. Most people will - wisely leave this disabled. - -config BUSYBOX_CONFIG_HEXDUMP - bool "hexdump" - default y - help - The hexdump utility is used to display binary data in a readable - way that is comparable to the output from most hex editors. - -config BUSYBOX_CONFIG_HWCLOCK - bool "hwclock" - default n - 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 - shutdown in the hardware clock, so the hardware will keep the - correct time when Linux is _not_ running. - -config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONGOPTIONS - bool " Support long options (--hctosys,...)" - default n - depends on BUSYBOX_CONFIG_HWCLOCK - help - By default, the hwclock utility only uses short options. If you - are overly fond of its long options, such as --hctosys, --utc, etc) - then enable this option. - -config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS - bool " Use FHS /var/lib/hwclock/adjtime" - default n - depends on BUSYBOX_CONFIG_HWCLOCK - help - Starting with FHS 2.3, the adjtime state file is supposed to exist - at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish - to use the FHS behavior, answer Y here, otherwise answer N for the - classic /etc/adjtime path. - - http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO - -config BUSYBOX_CONFIG_IPCRM - bool "ipcrm" - default n - select BUSYBOX_CONFIG_FEATURE_SUID - help - The ipcrm utility allows the removal of System V interprocess - communication (IPC) objects and the associated data structures - from the system. - -config BUSYBOX_CONFIG_IPCS - bool "ipcs" - default n - select BUSYBOX_CONFIG_FEATURE_SUID - help - The ipcs utility is used to provide information on the currently - allocated System V interprocess (IPC) objects in the system. - -config BUSYBOX_CONFIG_LOSETUP - bool "losetup" - default n - 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 - version does not currently support enabling data encryption. - -config BUSYBOX_CONFIG_MDEV - bool "mdev" - default n - help - mdev is a mini-udev implementation: call it with -s to populate - /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to - have it handle hotplug events afterwards. Device names are taken - from sysfs. - -config BUSYBOX_CONFIG_FEATURE_MDEV_CONF - bool " Support /etc/mdev.conf" - default n - depends on BUSYBOX_CONFIG_MDEV - help - The mdev config file contains lines that look like: - - hd[a-z][0-9]* 0:3 660 - - That's device name (with regex match), uid:gid, and permissions. - - Optionally, that can be followed (on the same line) by an asterisk - and a command line to run after creating the corresponding device(s), - ala: - - hdc root:cdrom 660 *ln -s hdc cdrom - - Config file parsing stops on the first matching line. If no config - entry is matched, devices are created with default 0:0 660. (Make - the last line match .* to override this.) - -config BUSYBOX_CONFIG_MKSWAP - bool "mkswap" - default n - 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 - partition as if it were additional RAM, which can greatly increase - the capability of low-memory machines. This additional memory is - much slower than real RAM, but can be very helpful at preventing your - applications being killed by the Linux out of memory (OOM) killer. - Once you have created swap space using 'mkswap' you need to enable - the swap space using the 'swapon' utility. - -config BUSYBOX_CONFIG_MORE - bool "more" - default y - help - more is a simple utility which allows you to read text one screen - sized page at a time. If you want to read text that is larger than - the screen, and you are using anything faster than a 300 baud modem, - 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_CONFIG_FEATURE_USE_TERMIOS - bool " Use termios to manipulate the screen" - default y - depends on BUSYBOX_CONFIG_MORE - 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_CONFIG_MOUNT - bool "mount" - default y - 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 - particular part of the tree. A filesystem can either live on a block - device, or it can be accessible over the network, as is the case with - NFS filesystems. Most people using BusyBox will also want to enable - the 'mount' utility. - -config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS - bool " Support mounting NFS file systems" - default y - depends on BUSYBOX_CONFIG_MOUNT - help - Enable mounting of NFS file systems. - -config BUSYBOX_CONFIG_PIVOT_ROOT - bool "pivot_root" - default y - 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 - of wild and crazy things with your Linux system and is far more - powerful than 'chroot'. - - Note: This is for initrd in linux 2.4. Under initramfs (introduced - in linux 2.6) use switch_root instead. - -config BUSYBOX_CONFIG_RDATE - bool "rdate" - default y - help - The rdate utility allows you to synchronize the date and time of your - system clock with the date and time of a remote networked system using - the RFC868 protocol, which is built into the inetd daemon on most - systems. - -config BUSYBOX_CONFIG_READPROFILE - bool "readprofile" - default n - help - This allows you to parse /proc/profile for basic profiling. - -config BUSYBOX_CONFIG_SETARCH - bool "setarch" - default n - help - The linux32 utility is used to create a 32bit environment for the - specified program (usually a shell). It only makes sense to have - this util on a system that supports both 64bit and 32bit userland - (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...). - -config BUSYBOX_CONFIG_SWAPONOFF - bool "swaponoff" - default n - help - This option enables both the 'swapon' and the 'swapoff' utilities. - Once you have created some swap space using 'mkswap', you also need - to enable your swap space with the 'swapon' utility. The 'swapoff' - utility is used, typically at system shutdown, to disable any swap - space. If you are not using any swap space, you can leave this - option disabled. - -config BUSYBOX_CONFIG_SWITCH_ROOT - bool "switch_root" - default y - help - The switch_root utility is used from initramfs to select a new - root device. Under initramfs, you have to use this instead of - pivot_root. (Stop reading here if you don't care why.) - - Booting with initramfs extracts a gzipped cpio archive into rootfs - (which is a variant of ramfs/tmpfs). Because rootfs can't be moved - or unmounted*, pivot_root will not work from initramfs. Instead, - switch_root deletes everything out of rootfs (including itself), - does a mount --move that overmounts rootfs with the new root, and - then execs the specified init program. - - * Because the Linux kernel uses rootfs internally as the starting - and ending point for searching through the kernel's doubly linked - list of active mount points. That's why. - -config BUSYBOX_CONFIG_UMOUNT - bool "umount" - default y - help - When you want to remove a mounted filesystem from its current mount point, - for example when you are shutting down the system, the 'umount' utility is - the tool to use. If you enabled the 'mount' utility, you almost certainly - also want to enable 'umount'. - -config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL - bool " umount -a option" - default y - depends on BUSYBOX_CONFIG_UMOUNT - help - Support -a option to unmount all currently mounted filesystems. - -comment "Common options for mount/umount" - depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT - -config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP - bool " Support loopback mounts" - default y - depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT - help - Enabling this feature allows automatic mounting of files (containing - filesystem images) via the linux kernel's loopback devices. The mount - command will detect you are trying to mount a file instead of a block - device, and transparently associate the file with a loopback device. - The umount command will also free that loopback device. - - You can still use the 'losetup' utility (to manually associate files - with loop devices) if you need to do something advanced, such as - specify an offset or cryptographic options to the loopback device. - (If you don't want umount to free the loop device, use "umount -D".) - -config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT - bool " Support for the old /etc/mtab file" - default n - depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT - help - Historically, Unix systems kept track of the currently mounted - partitions in the file "/etc/mtab". These days, the kernel exports - the list of currently mounted partitions in "/proc/mounts", rendering - the old mtab file obsolete. (In modern systems, /etc/mtab should be - a symlink to /proc/mounts.) - - The only reason to have mount maintain an /etc/mtab file itself is if - your stripped-down embedded system does not have a /proc directory. - If you must use this, keep in mind it's inherently brittle (for - example a mount under chroot won't update it), can't handle modern - features like separate per-process filesystem namespaces, requires - that your /etc directory be writeable, tends to get easily confused - by --bind or --move mounts, and so on. (In brief: avoid.) - -endmenu - diff --git a/openwrt/package/busybox/ipkg/busybox.control b/openwrt/package/busybox/ipkg/busybox.control deleted file mode 100644 index e7fc84a..0000000 --- a/openwrt/package/busybox/ipkg/busybox.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: busybox -Priority: optional -Section: net -Description: Core utilities for embedded Linux systems diff --git a/openwrt/package/busybox/patches/100-killall5.patch b/openwrt/package/busybox/patches/100-killall5.patch deleted file mode 100644 index 6f1585d..0000000 --- a/openwrt/package/busybox/patches/100-killall5.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h ---- busybox-1.1.1/include/applets.h 2006-03-22 22:16:24.000000000 +0100 -+++ busybox-1.1.1-owrt/include/applets.h 2006-04-01 18:23:43.000000000 +0200 -@@ -154,6 +154,7 @@ - USE_IPTUNNEL(APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_KILL(APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_KILLALL(APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -+USE_KILLALL5(APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_KLOGD(APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) - USE_LASH(APPLET(lash, lash_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_LAST(APPLET(last, last_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h ---- busybox-1.1.1/include/usage.h 2006-03-22 22:16:24.000000000 +0100 -+++ busybox-1.1.1-owrt/include/usage.h 2006-04-01 18:22:53.000000000 +0200 -@@ -1598,6 +1598,13 @@ - #define killall_example_usage \ - "$ killall apache\n" - -+#define killall5_trivial_usage \ -+ "" -+#define killall5_full_usage \ -+ "" -+#define killall5_example_usage \ -+ "" -+ - #define klogd_trivial_usage \ - "[-c n] [-n]" - #define klogd_full_usage \ -diff -Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt/procps/Config.in ---- busybox-1.1.1/procps/Config.in 2006-03-22 22:16:25.000000000 +0100 -+++ busybox-1.1.1-owrt/procps/Config.in 2006-04-01 18:22:53.000000000 +0200 -@@ -38,6 +38,11 @@ - specified commands. If no signal name is specified, SIGTERM is - sent. - -+config CONFIG_KILLALL5 -+ bool "killall5" -+ default n -+ depends on CONFIG_KILL -+ - config CONFIG_PIDOF - bool "pidof" - default n -diff -Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt/procps/kill.c ---- busybox-1.1.1/procps/kill.c 2006-03-22 22:16:25.000000000 +0100 -+++ busybox-1.1.1-owrt/procps/kill.c 2006-04-01 18:22:53.000000000 +0200 -@@ -34,6 +34,7 @@ - - #define KILL 0 - #define KILLALL 1 -+#define KILLALL5 2 - - int kill_main(int argc, char **argv) - { -@@ -48,6 +49,9 @@ - #else - whichApp = KILL; - #endif -+#ifdef CONFIG_KILLALL5 -+ whichApp = (strcmp(bb_applet_name, "killall5") == 0)? KILLALL5 : whichApp; -+#endif - - /* Parse any options */ - if (argc < 2) -@@ -126,6 +130,20 @@ - } - - } -+#ifdef CONFIG_KILLALL5 -+ else if (whichApp == KILLALL5) { -+ procps_status_t * p; -+ pid_t myPid=getpid(); -+ while ((p = procps_scan(0)) != 0) { -+ if (p->pid != 1 && p->pid != myPid && p->pid != p->ppid) { -+ if (kill(p->pid, signo) != 0) { -+ bb_perror_msg( "Could not kill pid '%d'", p->pid); -+ errors++; -+ } -+ } -+ } -+ } -+#endif - #ifdef CONFIG_KILLALL - else { - pid_t myPid=getpid(); diff --git a/openwrt/package/busybox/patches/110-telnetd.patch b/openwrt/package/busybox/patches/110-telnetd.patch deleted file mode 100644 index f14143a..0000000 --- a/openwrt/package/busybox/patches/110-telnetd.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnetd.c ---- busybox-1.1.0/networking/telnetd.c 2006-01-11 06:43:51.000000000 +0100 -+++ busybox-1.1.0-owrt/networking/telnetd.c 2006-01-14 17:41:20.000000000 +0100 -@@ -45,6 +45,7 @@ - #include <arpa/telnet.h> - #include <ctype.h> - #include <sys/syslog.h> -+#include <net/if.h> - - #include "busybox.h" - -@@ -394,11 +395,13 @@ - struct in_addr bind_addr = { .s_addr = 0x0 }; - #endif /* CONFIG_FEATURE_TELNETD_INETD */ - int c; -+ char *interface_name = NULL; -+ struct ifreq interface; - static const char options[] = - #ifdef CONFIG_FEATURE_TELNETD_INETD -- "f:l:"; -+ "i:f:l:"; - #else /* CONFIG_EATURE_TELNETD_INETD */ -- "f:l:p:b:"; -+ "i:f:l:p:b:"; - #endif /* CONFIG_FEATURE_TELNETD_INETD */ - int maxlen, w, r; - -@@ -413,6 +416,9 @@ - case 'f': - issuefile = optarg; - break; -+ case 'i': -+ interface_name = strdup(optarg); -+ break; - case 'l': - loginpath = optarg; - break; -@@ -465,6 +471,13 @@ - sa.sin_addr = bind_addr; - #endif - -+ /* Set it to listen on the specified interface */ -+ if (interface_name) { -+ strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ); -+ (void)setsockopt(master_fd, SOL_SOCKET, -+ SO_BINDTODEVICE, &interface, sizeof(interface)); -+ } -+ - if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { - bb_perror_msg_and_die("bind"); - } diff --git a/openwrt/package/busybox/patches/140-unlink-passwd.patch b/openwrt/package/busybox/patches/140-unlink-passwd.patch deleted file mode 100644 index 07b6767..0000000 --- a/openwrt/package/busybox/patches/140-unlink-passwd.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- busybox-1.00.old/loginutils/passwd.c 2004-09-15 04:39:09.000000000 +0200 -+++ busybox-1.00/loginutils/passwd.c 2005-03-23 15:31:07.000000000 +0100 -@@ -54,11 +54,12 @@ - snprintf(filename, sizeof filename, "%s", bb_path_passwd_file); - } - -- if (((fp = fopen(filename, "r+")) == 0) || (fstat(fileno(fp), &sb))) { -+ if (((fp = fopen(filename, "r")) == 0) || (fstat(fileno(fp), &sb))) { - /* return 0; */ - return 1; - } - -+#if 0 - /* Lock the password file before updating */ - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; -@@ -69,6 +70,7 @@ - return 1; - } - lock.l_type = F_UNLCK; -+#endif - - snprintf(buf, sizeof buf, "%s-", filename); - if (create_backup(buf, fp)) { -@@ -119,6 +121,7 @@ - fclose(fp); - return 1; - } -+ unlink(filename); - if (rename(buf, filename) < 0) { - fcntl(fileno(fp), F_SETLK, &lock); - fclose(fp); diff --git a/openwrt/package/busybox/patches/150-udhcp-release.patch b/openwrt/package/busybox/patches/150-udhcp-release.patch deleted file mode 100644 index 6420ae6..0000000 --- a/openwrt/package/busybox/patches/150-udhcp-release.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt/include/usage.h ---- busybox-1.1.1/include/usage.h 2006-04-01 18:26:21.000000000 +0200 -+++ busybox-1.1.1-owrt/include/usage.h 2006-04-01 18:27:45.000000000 +0200 -@@ -3268,6 +3268,7 @@ - "\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \ - "\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \ - "\t-q,\t--quit\tQuit after obtaining lease\n" \ -+ "\t-R,\t--release\tRelease IP on quit\n" \ - "\t-r,\t--request=IP\tIP address to request (default: none)\n" \ - "\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \ - "\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\ -diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt/networking/udhcp/dhcpc.c ---- busybox-1.1.1/networking/udhcp/dhcpc.c 2006-03-22 22:16:19.000000000 +0100 -+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.c 2006-04-01 18:28:19.000000000 +0200 -@@ -49,6 +49,7 @@ - .abort_if_no_lease = 0, - .foreground = 0, - .quit_after_lease = 0, -+ .release_on_quit = 0, - .background_if_no_lease = 0, - .interface = "eth0", - .pidfile = NULL, -@@ -82,6 +83,7 @@ - " immediately negotiated.\n" - " -p, --pidfile=file Store process ID of daemon in file\n" - " -q, --quit Quit after obtaining lease\n" -+" -R, --release Release IP on quit\n" - " -r, --request=IP IP address to request (default: none)\n" - " -s, --script=file Run file at dhcp events (default:\n" - " " DEFAULT_SCRIPT ")\n" -@@ -203,6 +205,7 @@ - {"now", no_argument, 0, 'n'}, - {"pidfile", required_argument, 0, 'p'}, - {"quit", no_argument, 0, 'q'}, -+ {"release", no_argument, 0, 'R'}, - {"request", required_argument, 0, 'r'}, - {"script", required_argument, 0, 's'}, - {"timeout", required_argument, 0, 'T'}, -@@ -214,7 +217,7 @@ - /* get options */ - while (1) { - int option_index = 0; -- c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:T:t:v", arg_options, &option_index); -+ c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", arg_options, &option_index); - if (c == -1) break; - - switch (c) { -@@ -284,6 +287,9 @@ - case 'q': - client_config.quit_after_lease = 1; - break; -+ case 'R': -+ client_config.release_on_quit = 1; -+ break; - case 'r': - requested_ip = inet_addr(optarg); - break; -@@ -527,8 +533,11 @@ - - state = BOUND; - change_mode(LISTEN_NONE); -- if (client_config.quit_after_lease) -+ if (client_config.quit_after_lease) { -+ if (client_config.release_on_quit) -+ perform_release(); - return 0; -+ } - if (!client_config.foreground) - client_background(); - -@@ -553,12 +562,13 @@ - case SIGUSR1: - perform_renew(); - break; -- case SIGUSR2: -- perform_release(); -- break; - case SIGTERM: - LOG(LOG_INFO, "Received SIGTERM"); -+ if (!client_config.release_on_quit) - return 0; -+ case SIGUSR2: -+ perform_release(); -+ break; - } - } else if (retval == -1 && errno == EINTR) { - /* a signal was caught */ -diff -Nur busybox-1.1.1/networking/udhcp/dhcpc.h busybox-1.1.1-owrt/networking/udhcp/dhcpc.h ---- busybox-1.1.1/networking/udhcp/dhcpc.h 2006-03-22 22:16:19.000000000 +0100 -+++ busybox-1.1.1-owrt/networking/udhcp/dhcpc.h 2006-04-01 18:27:45.000000000 +0200 -@@ -19,6 +19,7 @@ - struct client_config_t { - char foreground; /* Do not fork */ - char quit_after_lease; /* Quit after obtaining lease */ -+ char release_on_quit; /* perform release on quit */ - char abort_if_no_lease; /* Abort if no lease */ - char background_if_no_lease; /* Fork to background if no lease */ - char *interface; /* The name of the interface to use */ diff --git a/openwrt/package/busybox/patches/170-udhcp-options.patch b/openwrt/package/busybox/patches/170-udhcp-options.patch deleted file mode 100644 index b03810a..0000000 --- a/openwrt/package/busybox/patches/170-udhcp-options.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur busybox-1.00.orig/networking/udhcp/options.c busybox-1.00/networking/udhcp/options.c ---- busybox-1.00.orig/networking/udhcp/options.c 2004-03-15 09:29:01.000000000 +0100 -+++ busybox-1.00/networking/udhcp/options.c 2005-09-14 13:27:23.792609800 +0200 -@@ -39,8 +39,11 @@ - {"dhcptype", OPTION_U8, 0x35}, - {"serverid", OPTION_IP, 0x36}, - {"message", OPTION_STRING, 0x38}, -+ {"vendorclass", OPTION_STRING, 0x3C}, -+ {"clientid", OPTION_STRING, 0x3D}, - {"tftp", OPTION_STRING, 0x42}, - {"bootfile", OPTION_STRING, 0x43}, -+ {"userclass", OPTION_STRING, 0x4D}, - {"", 0x00, 0x00} - }; - diff --git a/openwrt/package/busybox/patches/180-telnetd_ipv6.patch b/openwrt/package/busybox/patches/180-telnetd_ipv6.patch deleted file mode 100644 index fb8df6f..0000000 --- a/openwrt/package/busybox/patches/180-telnetd_ipv6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN busybox.old/networking/telnetd.c busybox.dev/networking/telnetd.c ---- busybox.old/networking/telnetd.c 2005-08-17 03:29:10.000000000 +0200 -+++ busybox.dev/networking/telnetd.c 2005-10-22 19:37:49.976396000 +0200 -@@ -49,6 +49,8 @@ - - #define BUFSIZE 4000 - -+#undef CONFIG_FEATURE_IPV6 -+ - #ifdef CONFIG_FEATURE_IPV6 - #define SOCKET_TYPE AF_INET6 - typedef struct sockaddr_in6 sockaddr_type; diff --git a/openwrt/package/busybox/patches/190-ash_performance.patch b/openwrt/package/busybox/patches/190-ash_performance.patch deleted file mode 100644 index 2231fd7..0000000 --- a/openwrt/package/busybox/patches/190-ash_performance.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -urN busybox.old/shell/ash.c busybox.dev/shell/ash.c ---- busybox.old/shell/ash.c 2005-11-12 22:39:19.853826250 +0100 -+++ busybox.dev/shell/ash.c 2005-11-12 22:39:42.771258500 +0100 -@@ -1414,6 +1414,13 @@ - - #define NUMBUILTINS (sizeof (builtincmd) / sizeof (struct builtincmd) ) - -+static const char *safe_applets[] = { -+ "[", "test", "echo", "cat", -+ "ln", "cp", "touch", "mkdir", "rm", -+ "cut", "hexdump", "awk", "sort", -+ "find", "xargs", "ls", "dd", -+ "chown", "chmod" -+}; - - - struct cmdentry { -@@ -2050,6 +2057,19 @@ - static void exitshell(void) __attribute__((__noreturn__)); - static int decode_signal(const char *, int); - -+ -+static int is_safe_applet(char *name) -+{ -+ int n = sizeof(safe_applets) / sizeof(char *); -+ int i; -+ for (i = 0; i < n; i++) -+ if (strcmp(safe_applets[i], name) == 0) -+ return 1; -+ -+ return 0; -+} -+ -+ - /* - * This routine is called when an error or an interrupt occurs in an - * interactive shell and control is returned to the main command loop. -@@ -3680,6 +3700,7 @@ - clearredir(1); - envp = environment(); - if (strchr(argv[0], '/') != NULL -+ || is_safe_applet(argv[0]) - #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL - || find_applet_by_name(argv[0]) - #endif -@@ -3721,6 +3742,18 @@ - tryexec(char *cmd, char **argv, char **envp) - { - int repeated = 0; -+ struct BB_applet *a; -+ int argc = 0; -+ char **c; -+ -+ if(strchr(cmd, '/') == NULL && is_safe_applet(cmd) && (a = find_applet_by_name(cmd)) != NULL) { -+ c = argv; -+ while (*c != NULL) { -+ c++; argc++; -+ } -+ bb_applet_name = cmd; -+ exit(a->main(argc, argv)); -+ } - #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL - int flg_bb = 0; - char *name = cmd; -@@ -3919,6 +3952,12 @@ - } - #endif - -+ if (is_safe_applet(name)) { -+ entry->cmdtype = CMDNORMAL; -+ entry->u.index = -1; -+ return; -+ } -+ - updatetbl = (path == pathval()); - if (!updatetbl) { - act |= DO_ALTPATH; diff --git a/openwrt/package/busybox/patches/200-etc_crontabs.patch b/openwrt/package/busybox/patches/200-etc_crontabs.patch deleted file mode 100644 index 5ec01c1..0000000 --- a/openwrt/package/busybox/patches/200-etc_crontabs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN busybox.old/miscutils/crond.c busybox.dev/miscutils/crond.c ---- busybox.old/miscutils/crond.c 2004-04-14 19:51:21.000000000 +0200 -+++ busybox.dev/miscutils/crond.c 2005-12-11 22:54:07.878256250 +0100 -@@ -36,7 +36,7 @@ - #define arysize(ary) (sizeof(ary)/sizeof((ary)[0])) - - #ifndef CRONTABS --#define CRONTABS "/var/spool/cron/crontabs" -+#define CRONTABS "/etc/crontabs" - #endif - #ifndef TMPDIR - #define TMPDIR "/var/spool/cron" -diff -urN busybox.old/miscutils/crontab.c busybox.dev/miscutils/crontab.c ---- busybox.old/miscutils/crontab.c 2004-04-14 19:51:21.000000000 +0200 -+++ busybox.dev/miscutils/crontab.c 2005-12-11 22:54:28.647554250 +0100 -@@ -28,7 +28,7 @@ - #include <sys/resource.h> - - #ifndef CRONTABS --#define CRONTABS "/var/spool/cron/crontabs" -+#define CRONTABS "/etc/crontabs" - #endif - #ifndef TMPDIR - #define TMPDIR "/var/spool/cron" diff --git a/openwrt/package/busybox/patches/210-passwd_limit.patch b/openwrt/package/busybox/patches/210-passwd_limit.patch deleted file mode 100644 index 50c7ed8..0000000 --- a/openwrt/package/busybox/patches/210-passwd_limit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN busybox.old/loginutils/passwd.c busybox.dev/loginutils/passwd.c ---- busybox.old/loginutils/passwd.c 2005-12-11 22:52:46.185150000 +0100 -+++ busybox.dev/loginutils/passwd.c 2005-12-11 23:19:15.276596500 +0100 -@@ -353,7 +353,7 @@ - } else { - orig[0] = '\0'; - } -- if (! (cp=bb_askpass(0, "Enter the new password (minimum of 5, maximum of 8 characters)\n" -+ if (! (cp=bb_askpass(0, "Enter the new password (minimum of 5 characters)\n" - "Please use a combination of upper and lower case letters and numbers.\n" - "Enter new password: "))) - { diff --git a/openwrt/package/busybox/patches/220-awk_bitops.patch b/openwrt/package/busybox/patches/220-awk_bitops.patch deleted file mode 100644 index 2b85729..0000000 --- a/openwrt/package/busybox/patches/220-awk_bitops.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- busybox-1.00/editors/awk.c.orig 2004-09-24 05:24:27 -04:00 -+++ busybox-1.00/editors/awk.c 2006-03-08 02:16:52 -05:00 -@@ -271,7 +271,8 @@ - /* builtins */ - enum { - B_a2=0, B_ix, B_ma, B_sp, B_ss, B_ti, B_lo, B_up, -- B_ge, B_gs, B_su -+ B_ge, B_gs, B_su, -+ B_an, B_co, B_ls, B_or, B_rs, B_xo, - }; - - /* tokens and their corresponding info values */ -@@ -311,6 +312,8 @@ - "\5while" NTC - "\4else" NTC - -+ "\3and" "\5compl" "\6lshift" "\2or" -+ "\6rshift" "\3xor" - "\5close" "\6system" "\6fflush" "\5atan2" /* BUILTIN */ - "\3cos" "\3exp" "\3int" "\3log" - "\4rand" "\3sin" "\4sqrt" "\5srand" -@@ -364,6 +367,8 @@ - ST_WHILE, - 0, - -+ OC_B|B_an|P(0x83), OC_B|B_co|P(0x41), OC_B|B_ls|P(0x83), OC_B|B_or|P(0x83), -+ OC_B|B_rs|P(0x83), OC_B|B_xo|P(0x83), - OC_FBLTIN|Sx|F_cl, OC_FBLTIN|Sx|F_sy, OC_FBLTIN|Sx|F_ff, OC_B|B_a2|P(0x83), - OC_FBLTIN|Nx|F_co, OC_FBLTIN|Nx|F_ex, OC_FBLTIN|Nx|F_in, OC_FBLTIN|Nx|F_lg, - OC_FBLTIN|F_rn, OC_FBLTIN|Nx|F_si, OC_FBLTIN|Nx|F_sq, OC_FBLTIN|Nx|F_sr, -@@ -1942,6 +1947,30 @@ - strncpy(s, as[0]+i, n); - s[n] = '\0'; - setvar_p(res, s); -+ break; -+ -+ case B_an: -+ setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1])); -+ break; -+ -+ case B_co: -+ setvar_i(res, ~(long)getvar_i(av[0])); -+ break; -+ -+ case B_ls: -+ setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1])); -+ break; -+ -+ case B_or: -+ setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1])); -+ break; -+ -+ case B_rs: -+ setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1]))); -+ break; -+ -+ case B_xo: -+ setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1])); - break; - - case B_lo: diff --git a/openwrt/package/busybox/patches/300-netmsg.patch b/openwrt/package/busybox/patches/300-netmsg.patch deleted file mode 100644 index ef6c0f4..0000000 --- a/openwrt/package/busybox/patches/300-netmsg.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt/include/applets.h ---- busybox-1.1.1/include/applets.h 2006-04-01 18:26:21.000000000 +0200 -+++ busybox-1.1.1-owrt/include/applets.h 2006-04-01 18:36:28.000000000 +0200 -@@ -197,6 +197,7 @@ - USE_MV(APPLET(mv, mv_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_NAMEIF(APPLET(nameif, nameif_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) - USE_NC(APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -+USE_NETMSG(APPLET_NOUSAGE(netmsg, netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) - USE_NETSTAT(APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_NICE(APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_NOHUP(APPLET(nohup, nohup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -Nur busybox-1.1.1/networking/Config.in busybox-1.1.1-owrt/networking/Config.in ---- busybox-1.1.1/networking/Config.in 2006-03-22 22:16:19.000000000 +0100 -+++ busybox-1.1.1-owrt/networking/Config.in 2006-04-01 18:35:32.000000000 +0200 -@@ -451,6 +451,12 @@ - help - A simple Unix utility which reads and writes data across network - connections. -+ -+config CONFIG_NETMSG -+ bool "netmsg" -+ default n -+ help -+ simple program for sending udp broadcast messages - - config CONFIG_NC_GAPING_SECURITY_HOLE - bool "gaping security hole" -diff -Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt/networking/Makefile.in ---- busybox-1.1.1/networking/Makefile.in 2006-03-22 22:16:19.000000000 +0100 -+++ busybox-1.1.1-owrt/networking/Makefile.in 2006-04-01 18:35:32.000000000 +0200 -@@ -30,6 +30,7 @@ - NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o - NETWORKING-$(CONFIG_NAMEIF) += nameif.o - NETWORKING-$(CONFIG_NC) += nc.o -+NETWORKING-$(CONFIG_NETMSG) += netmsg.o - NETWORKING-$(CONFIG_NETSTAT) += netstat.o - NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o - NETWORKING-$(CONFIG_PING) += ping.o -diff -Nur busybox-1.1.1/networking/netmsg.c busybox-1.1.1-owrt/networking/netmsg.c ---- busybox-1.1.1/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.1-owrt/networking/netmsg.c 2006-04-01 18:35:32.000000000 +0200 -@@ -0,0 +1,58 @@ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <netdb.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include "busybox.h" -+ -+ -+#ifndef CONFIG_NETMSG -+int main(int argc, char **argv) -+#else -+int netmsg_main(int argc, char **argv) -+#endif -+{ -+ int s, i; -+ struct sockaddr_in addr; -+ int optval = 1; -+ unsigned char buf[1001]; -+ -+ if (argc != 3) { -+ fprintf(stderr, "usage: %s <ip> \"<message>\"\n", argv[0]); -+ exit(1); -+ } -+ -+ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { -+ perror("Opening socket"); -+ exit(1); -+ } -+ -+ memset(&addr, 0, sizeof(addr)); -+ addr.sin_family = AF_INET; -+ addr.sin_addr.s_addr = inet_addr(argv[1]); -+ addr.sin_port = htons(0x1337); -+ -+ memset(buf, 0, 1001); -+ buf[0] = 0xde; -+ buf[1] = 0xad; -+ -+ strncpy(buf + 2, argv[2], 998); -+ -+ if (setsockopt (s, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval, sizeof (optval)) < 0) { -+ perror("setsockopt()"); -+ goto fail; -+ } -+ -+ if (sendto(s, buf, 1001, 0, (struct sockaddr *) &addr, sizeof(addr)) < 0) { -+ perror("sendto()"); -+ goto fail; -+ } -+ -+ return 0; -+ -+fail: -+ close(s); -+ exit(1); -+} diff --git a/openwrt/package/busybox/patches/310-passwd_access.patch b/openwrt/package/busybox/patches/310-passwd_access.patch deleted file mode 100644 index 03cfe8b..0000000 --- a/openwrt/package/busybox/patches/310-passwd_access.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urN busybox.old/networking/httpd.c busybox.dev/networking/httpd.c ---- busybox.old/networking/httpd.c 2004-10-08 10:03:29.000000000 +0200 -+++ busybox.dev/networking/httpd.c 2006-02-04 01:54:19.688016250 +0100 -@@ -1467,12 +1467,22 @@ - { - char *cipher; - char *pp; -+ char *ppnew = NULL; -+ struct passwd *pwd = NULL; - - if(strncmp(p, request, u-request) != 0) { - /* user uncompared */ - continue; - } - pp = strchr(p, ':'); -+ if(pp && pp[1] == '$' && pp[2] == 'p' && -+ pp[3] == '$' && pp[4] && -+ (pwd = getpwnam(&pp[4])) != NULL) { -+ ppnew = malloc(5 + strlen(pwd->pw_passwd)); -+ ppnew[0] = ':'; -+ strcpy(ppnew + 1, pwd->pw_passwd); -+ pp = ppnew; -+ } - if(pp && pp[1] == '$' && pp[2] == '1' && - pp[3] == '$' && pp[4]) { - pp++; -@@ -1482,6 +1492,10 @@ - /* unauthorized */ - continue; - } -+ if (ppnew) { -+ free(ppnew); -+ ppnew = NULL; -+ } - } - #endif - if (strcmp(p, request) == 0) { diff --git a/openwrt/package/busybox/patches/320-httpd_address_binding.patch b/openwrt/package/busybox/patches/320-httpd_address_binding.patch deleted file mode 100644 index 288900b..0000000 --- a/openwrt/package/busybox/patches/320-httpd_address_binding.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- busybox-1.1.1/networking/httpd.c 2006-03-22 22:16:19.000000000 +0100 -+++ busybox-1.1.1.new/networking/httpd.c 2006-04-01 19:41:42.150744624 +0200 -@@ -110,6 +110,7 @@ - #include <sys/types.h> - #include <sys/socket.h> /* for connect and socket*/ - #include <netinet/in.h> /* for sockaddr_in */ -+#include <arpa/inet.h> - #include <sys/time.h> - #include <sys/stat.h> - #include <sys/wait.h> -@@ -204,8 +205,8 @@ - - void bb_show_usage(void) - { -- fprintf(stderr, "Usage: %s [-p <port>] [-c configFile] [-d/-e <string>] " -- "[-r realm] [-u user] [-h homedir]\n", bb_applet_name); -+ fprintf(stderr, "Usage: %s [-p <port>] [-l <IP address>] [-c configFile]" -+ "[-d/-e <string>] [-r realm] [-u user] [-h homedir]\n", bb_applet_name); - exit(1); - } - #endif -@@ -255,6 +256,7 @@ - #endif - unsigned port; /* server initial port and for - set env REMOTE_PORT */ -+ char *address; - union HTTPD_FOUND { - const char *found_mime_type; - const char *found_moved_temporarily; -@@ -958,7 +960,10 @@ - /* inet_addr() returns a value that is already in network order */ - memset(&lsocket, 0, sizeof(lsocket)); - lsocket.sin_family = AF_INET; -- lsocket.sin_addr.s_addr = INADDR_ANY; -+ if (inet_aton(config->address, &(lsocket.sin_addr)) == 1) { -+ if (config->address != NULL) lsocket.sin_addr.s_addr = ((struct in_addr *) ((gethostbyname(config->address))->h_addr))->s_addr; -+ else lsocket.sin_addr.s_addr = htons(INADDR_ANY); -+ } - lsocket.sin_port = htons(config->port) ; - fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd >= 0) { -@@ -1996,6 +2001,7 @@ - USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,) - USE_FEATURE_HTTPD_SETUID(u_opt_setuid,) - SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(p_opt_port,) -+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(l_opt_addr,) - }; - - static const char httpd_opts[]="c:d:h:" -@@ -2003,7 +2009,7 @@ - USE_FEATURE_HTTPD_BASIC_AUTH("r:") - USE_FEATURE_HTTPD_AUTH_MD5("m:") - USE_FEATURE_HTTPD_SETUID("u:") -- SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:"); -+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY("p:l:"); - - #define OPT_CONFIG_FILE (1<<c_opt_config_file) - #define OPT_DECODE_URL (1<<d_opt_decode_url) -@@ -2024,6 +2030,8 @@ - #define OPT_PORT SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<p_opt_port)) \ - USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) - -+#define OPT_ADDRESS SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY((1<<l_opt_addr)) \ -+ USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(0) - - #ifdef HTTPD_STANDALONE - int main(int argc, char *argv[]) -@@ -2036,6 +2044,7 @@ - char *url_for_decode; - USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) - SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_port;) -+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(const char *s_addr;) - SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(int server;) - - USE_FEATURE_HTTPD_SETUID(const char *s_uid;) -@@ -2050,6 +2059,7 @@ - - #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY - config->port = 80; -+ config->address = ""; - #endif - - config->ContentLength = -1; -@@ -2061,6 +2071,7 @@ - USE_FEATURE_HTTPD_AUTH_MD5(, &pass) - USE_FEATURE_HTTPD_SETUID(, &s_uid) - SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_port) -+ SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY(, &s_addr) - ); - - if(opt & OPT_DECODE_URL) { -@@ -2082,6 +2093,8 @@ - #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY - if(opt & OPT_PORT) - config->port = bb_xgetlarg(s_port, 10, 1, 0xffff); -+ if (opt & OPT_ADDRESS) -+ if (s_addr) config->address = (char *) s_addr; - #ifdef CONFIG_FEATURE_HTTPD_SETUID - if(opt & OPT_SETUID) { - char *e; diff --git a/openwrt/package/busybox/patches/330-httpd_user_agent.patch b/openwrt/package/busybox/patches/330-httpd_user_agent.patch deleted file mode 100644 index bbe01f7..0000000 --- a/openwrt/package/busybox/patches/330-httpd_user_agent.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur busybox-1.1.1/networking/httpd.c busybox-1.1.1-owrt/networking/httpd.c ---- busybox-1.1.1/networking/httpd.c 2006-04-01 19:42:36.000000000 +0200 -+++ busybox-1.1.1-owrt/networking/httpd.c 2006-04-01 19:43:59.000000000 +0200 -@@ -247,6 +247,7 @@ - const char *query; - - USE_FEATURE_HTTPD_CGI(char *referer;) -+ USE_FEATURE_HTTPD_CGI(char *user_agent;) - - const char *configFile; - -@@ -1208,6 +1209,7 @@ - addEnv("SERVER", "PROTOCOL", "HTTP/1.0"); - addEnv("GATEWAY_INTERFACE", "", "CGI/1.1"); - addEnv("REMOTE", "ADDR", config->rmt_ip_str); -+ addEnv("HTTP","USER_AGENT", config->user_agent); - #ifdef CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV - addEnvPort("REMOTE"); - #endif -@@ -1771,6 +1773,10 @@ - for(test = buf + 8; isspace(*test); test++) - ; - config->referer = strdup(test); -+ } else if ((strncasecmp(buf, "User-Agent:",11) ==0)) { -+ for(test = buf + 11; isspace(*test); test++) -+ ; -+ config->user_agent = strdup(test); - } - #endif - diff --git a/openwrt/package/busybox/patches/340-lock_util.patch b/openwrt/package/busybox/patches/340-lock_util.patch deleted file mode 100644 index bb1cf49..0000000 --- a/openwrt/package/busybox/patches/340-lock_util.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h ---- busybox.old/include/applets.h 2006-04-05 01:06:29.000000000 +0200 -+++ busybox.dev/include/applets.h 2006-04-05 01:19:09.000000000 +0200 -@@ -167,6 +167,7 @@ - USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) -+USE_LOCK(APPLET_NOUSAGE(lock, lock_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_LOGIN(APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) - USE_LOGNAME(APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in ---- busybox.old/miscutils/Config.in 2006-03-22 22:16:24.000000000 +0100 -+++ busybox.dev/miscutils/Config.in 2006-04-05 01:07:12.000000000 +0200 -@@ -209,6 +209,12 @@ - Enables the 'hdparm -d' option to get/set using_dma flag. - This is dangerous stuff, so you should probably say N. - -+config CONFIG_LOCK -+ bool "lock" -+ default y -+ help -+ Small utility for using locks in scripts -+ - config CONFIG_MAKEDEVS - bool "makedevs" - default n -diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in ---- busybox.old/miscutils/Makefile.in 2006-03-22 22:16:24.000000000 +0100 -+++ busybox.dev/miscutils/Makefile.in 2006-04-05 01:10:50.000000000 +0200 -@@ -20,6 +20,7 @@ - MISCUTILS-$(CONFIG_EJECT) += eject.o - MISCUTILS-$(CONFIG_HDPARM) += hdparm.o - MISCUTILS-$(CONFIG_LAST) += last.o -+MISCUTILS-$(CONFIG_LOCK) += lock.o - MISCUTILS-${CONFIG_LESS} += less.o - MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o - MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o -diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c ---- busybox.old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/miscutils/lock.c 2006-04-05 01:07:12.000000000 +0200 -@@ -0,0 +1,128 @@ -+#include <sys/types.h> -+#include <sys/file.h> -+#include <sys/stat.h> -+#include <signal.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <stdio.h> -+#include "busybox.h" -+ -+static int unlock = 0; -+static int shared = 0; -+static int waitonly = 0; -+static int fd; -+static char *file; -+ -+static void usage(char *name) -+{ -+ fprintf(stderr, "Usage: %s [-suw] <filename>\n" -+ " -s Use shared locking\n" -+ " -u Unlock\n" -+ " -w Wait for the lock to become free, don't acquire lock\n" -+ "\n", name); -+ exit(1); -+} -+ -+static void exit_unlock(int sig) -+{ -+ flock(fd, LOCK_UN); -+ unlink(file); -+ exit(0); -+} -+ -+static int do_unlock(void) -+{ -+ FILE *f; -+ int i; -+ -+ if ((f = fopen(file, "r")) == NULL) -+ return 0; -+ -+ fscanf(f, "%d", &i); -+ if (i > 0) -+ kill(i, SIGTERM); -+ -+ fclose(f); -+ -+ return 0; -+} -+ -+static int do_lock(void) -+{ -+ int pid; -+ char pidstr[8]; -+ -+ if ((fd = open(file, O_RDWR | O_CREAT, 0700)) < 0) { -+ fprintf(stderr, "Can't open %s\n", file); -+ return 1; -+ } -+ -+ if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) { -+ fprintf(stderr, "Can't lock %s\n", file); -+ return 1; -+ } -+ -+ pid = fork(); -+ -+ if (pid < 0) -+ return -1; -+ -+ if (pid == 0) { -+ signal(SIGKILL, exit_unlock); -+ signal(SIGTERM, exit_unlock); -+ signal(SIGINT, exit_unlock); -+ if (waitonly) -+ exit_unlock(0); -+ else -+ while (1) -+ sleep(1); -+ } else { -+ if (!waitonly) { -+ lseek(fd, 0, SEEK_SET); -+ ftruncate(fd, 0); -+ sprintf(pidstr, "%d\n", pid); -+ write(fd, pidstr, strlen(pidstr)); -+ close(fd); -+ } -+ -+ return 0; -+ } -+} -+ -+#ifndef CONFIG_LOCK -+int main(int argc, char **argv) -+#else -+int lock_main(int argc, char **argv) -+#endif -+{ -+ char **args = &argv[1]; -+ int c = argc - 1; -+ -+ while ((*args != NULL) && (*args)[0] == '-') { -+ char *ch = *args; -+ while (*(++ch) > 0) { -+ switch(*ch) { -+ case 'w': -+ waitonly = 1; -+ break; -+ case 's': -+ shared = 1; -+ break; -+ case 'u': -+ unlock = 1; -+ break; -+ } -+ } -+ c--; -+ args++; -+ } -+ -+ if (c != 1) -+ usage(argv[0]); -+ -+ file = *args; -+ if (unlock) -+ return do_unlock(); -+ else -+ return do_lock(); -+} diff --git a/openwrt/package/busybox/patches/911-ipkg.patch b/openwrt/package/busybox/patches/911-ipkg.patch deleted file mode 100644 index 1d7a4e3..0000000 --- a/openwrt/package/busybox/patches/911-ipkg.patch +++ /dev/null @@ -1,13896 +0,0 @@ -# -# add ipkg support to busybox -# -diff -ruN busybox-1.1.2-orig/Makefile busybox-1.1.2+ipkg-0.99.162/Makefile ---- busybox-1.1.2-orig/Makefile 2006-04-10 21:45:46.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162/Makefile 2006-05-09 02:06:48.000000000 +0200 -@@ -25,7 +25,7 @@ - export srctree=$(top_srcdir) - vpath %/Config.in $(srctree) - --DIRS:=applets archival archival/libunarchive coreutils console-tools \ -+DIRS:=applets archival archival/libipkg archival/libunarchive coreutils console-tools \ - debianutils editors findutils init miscutils modutils networking \ - networking/libiproute networking/udhcp procps loginutils shell \ - sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb -diff -ruN busybox-1.1.2-orig/archival/Config.in busybox-1.1.2+ipkg-0.99.162/archival/Config.in ---- busybox-1.1.2-orig/archival/Config.in 2006-03-22 22:16:20.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/Config.in 2006-05-09 02:06:48.000000000 +0200 -@@ -121,6 +121,14 @@ - gzip is used to compress files. - It's probably the most widely used UNIX compression program. - -+config CONFIG_IPKG -+ bool "ipkg" -+ default n -+ select CONFIG_MD5SUM -+ select CONFIG_WGET -+ help -+ ipkg is the itsy package management system. -+ - config CONFIG_RPM2CPIO - bool "rpm2cpio" - default n -diff -ruN busybox-1.1.2-orig/archival/Makefile.in busybox-1.1.2+ipkg-0.99.162/archival/Makefile.in ---- busybox-1.1.2-orig/archival/Makefile.in 2006-03-22 22:16:20.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/Makefile.in 2006-05-09 02:06:48.000000000 +0200 -@@ -20,6 +20,7 @@ - ARCHIVAL-$(CONFIG_DPKG_DEB) += dpkg_deb.o - ARCHIVAL-$(CONFIG_GUNZIP) += gunzip.o - ARCHIVAL-$(CONFIG_GZIP) += gzip.o -+ARCHIVAL-$(CONFIG_IPKG) += ipkg.o - ARCHIVAL-$(CONFIG_RPM2CPIO) += rpm2cpio.o - ARCHIVAL-$(CONFIG_RPM) += rpm.o - ARCHIVAL-$(CONFIG_TAR) += tar.o -diff -ruN busybox-1.1.2-orig/archival/dpkg.c busybox-1.1.2+ipkg-0.99.162/archival/dpkg.c ---- busybox-1.1.2-orig/archival/dpkg.c 2006-03-22 22:16:20.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/dpkg.c 2006-05-09 02:06:48.000000000 +0200 -@@ -1530,6 +1530,10 @@ - return(ar_handle->sub_archive->buffer); - } - -+/* -+ -+// moved to data_extract_all.c -+ - static void data_extract_all_prefix(archive_handle_t *archive_handle) - { - char *name_ptr = archive_handle->file_header->name; -@@ -1544,6 +1548,8 @@ - return; - } - -+*/ -+ - static void unpack_package(deb_file_t *deb_file) - { - const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; -diff -ruN busybox-1.1.2-orig/archival/ipkg.c busybox-1.1.2+ipkg-0.99.162/archival/ipkg.c ---- busybox-1.1.2-orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/ipkg.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,26 @@ -+/* ipkg.c - the itsy package management system -+ -+ Florina Boor -+ -+ Copyright (C) 2003 kernel concepts -+ -+ 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. -+ -+ ipkg command line frontend using libipkg -+ -+*/ -+ -+#include "libipkg/libipkg.h" -+ -+int ipkg_main(int argc, char **argv) -+{ -+ return ipkg_op(argc, argv); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/Makefile busybox-1.1.2+ipkg-0.99.162/archival/libipkg/Makefile ---- busybox-1.1.2-orig/archival/libipkg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/Makefile 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,32 @@ -+# Makefile for busybox -+# -+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -+# -+# 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 of the License, 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. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+# -+ -+top_srcdir=../.. -+top_builddir=../.. -+srcdir=$(top_srcdir)/archival/libipkg -+LIBIPKG_DIR:=./ -+include $(top_builddir)/Rules.mak -+include $(top_builddir)/.config -+include $(srcdir)/Makefile.in -+all: $(libraries-y) -+-include $(top_builddir)/.depend -+ -+clean: -+ rm -f *.o *.a $(AR_TARGET) -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/Makefile.in busybox-1.1.2+ipkg-0.99.162/archival/libipkg/Makefile.in ---- busybox-1.1.2-orig/archival/libipkg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/Makefile.in 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,85 @@ -+# Makefile for busybox -+# -+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> -+# -+# 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 of the License, 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. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+# -+ -+LIBIPKG_AR:=libipkg.a -+ifndef $(LIBIPKG_DIR) -+LIBIPKG_DIR:=$(top_builddir)/archival/libipkg/ -+endif -+srcdir=$(top_srcdir)/archival/libipkg -+ -+LIBIPKG_CORE_SOURCES:= \ -+ args.c \ -+ libipkg.c \ -+ user.c \ -+ -+LIBIPKG_CMD_SOURCES:= \ -+ ipkg_cmd.c \ -+ ipkg_configure.c \ -+ ipkg_download.c \ -+ ipkg_install.c \ -+ ipkg_remove.c \ -+ ipkg_upgrade.c \ -+ -+LIBIPKG_DB_SOURCES:= \ -+ hash_table.c \ -+ ipkg_conf.c \ -+ ipkg_utils.c \ -+ pkg.c \ -+ pkg_depends.c \ -+ pkg_extract.c \ -+ pkg_hash.c \ -+ pkg_parse.c \ -+ pkg_vec.c \ -+ -+LIBIPKG_LIST_SOURCES:= \ -+ conffile.c \ -+ conffile_list.c \ -+ nv_pair.c \ -+ nv_pair_list.c \ -+ pkg_dest.c \ -+ pkg_dest_list.c \ -+ pkg_src.c \ -+ pkg_src_list.c \ -+ str_list.c \ -+ void_list.c \ -+ -+LIBIPKG_UTIL_SOURCES:= \ -+ file_util.c \ -+ ipkg_message.c \ -+ md5.c \ -+ str_util.c \ -+ xsystem.c \ -+ -+LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_CORE_SOURCES) -+LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_CMD_SOURCES) -+LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_DB_SOURCES) -+LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_LIST_SOURCES) -+LIBIPKG-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_SOURCES) -+LIBIPKG_OBJS=$(patsubst %.c,$(LIBIPKG_DIR)%.o, $(LIBIPKG-y)) -+ -+CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(TARGET_ARCH)\"" -+ -+libraries-$(CONFIG_IPKG) += $(LIBIPKG_DIR)$(LIBIPKG_AR) -+ -+$(LIBIPKG_DIR)$(LIBIPKG_AR): $(LIBIPKG_OBJS) -+ $(do_ar) -+ -+$(LIBIPKG_OBJS): $(LIBIPKG_DIR)%.o : $(srcdir)/%.c -+ $(compile.c) -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/args.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/args.c ---- busybox-1.1.2-orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/args.c 2006-05-09 02:12:03.000000000 +0200 -@@ -0,0 +1,242 @@ -+/* args.c - parse command-line args -+ -+ Carl D. Worth -+ -+ Copyright 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. -+ */ -+ -+#include <getopt.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+ -+#include "ipkg.h" -+#include "ipkg_message.h" -+ -+#include "args.h" -+#include "sprintf_alloc.h" -+ -+#include "libbb.h" -+ -+ -+static void print_version(void); -+ -+enum long_args_opt -+{ -+ ARGS_OPT_FORCE_DEFAULTS = 129, -+ ARGS_OPT_FORCE_DEPENDS, -+ ARGS_OPT_FORCE_OVERWRITE, -+ ARGS_OPT_FORCE_DOWNGRADE, -+ ARGS_OPT_FORCE_REINSTALL, -+ ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES, -+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES, -+ ARGS_OPT_FORCE_SPACE, -+ ARGS_OPT_NOACTION, -+ ARGS_OPT_NODEPS, -+ ARGS_OPT_VERBOSE_WGET, -+ ARGS_OPT_VERBOSITY, -+ ARGS_OPT_MULTIPLE_PROVIDERS -+}; -+ -+int args_init(args_t *args) -+{ -+ char *conf_file_dir; -+ -+ memset(args, 0, sizeof(args_t)); -+ -+ args->dest = ARGS_DEFAULT_DEST; -+ -+ conf_file_dir = getenv("IPKG_CONF_DIR"); -+ if (conf_file_dir == NULL || conf_file_dir[0] == '\0') { -+ conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR; -+ } -+ sprintf_alloc(&args->conf_file, "%s/%s", conf_file_dir, -+ ARGS_DEFAULT_CONF_FILE_NAME); -+ -+ args->force_defaults = ARGS_DEFAULT_FORCE_DEFAULTS; -+ args->force_depends = ARGS_DEFAULT_FORCE_DEPENDS; -+ args->force_overwrite = ARGS_DEFAULT_FORCE_OVERWRITE; -+ args->force_downgrade = ARGS_DEFAULT_FORCE_DOWNGRADE; -+ args->force_reinstall = ARGS_DEFAULT_FORCE_REINSTALL; -+ args->force_removal_of_dependent_packages = ARGS_DEFAULT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES; -+ args->force_removal_of_essential_packages = ARGS_DEFAULT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES; -+ args->noaction = ARGS_DEFAULT_NOACTION; -+ args->nodeps = ARGS_DEFAULT_NODEPS; -+ args->verbose_wget = ARGS_DEFAULT_VERBOSE_WGET; -+ args->verbosity = ARGS_DEFAULT_VERBOSITY; -+ args->offline_root = ARGS_DEFAULT_OFFLINE_ROOT; -+ args->offline_root_pre_script_cmd = ARGS_DEFAULT_OFFLINE_ROOT_PRE_SCRIPT_CMD; -+ args->offline_root_post_script_cmd = ARGS_DEFAULT_OFFLINE_ROOT_POST_SCRIPT_CMD; -+ args->multiple_providers = 0; -+ args->nocheckfordirorfile = 0; -+ args->noreadfeedsfile = 0; -+ -+ return 1; -+} -+ -+void args_deinit(args_t *args) -+{ -+ free(args->conf_file); -+ args->conf_file = NULL; -+} -+ -+int args_parse(args_t *args, int argc, char *argv[]) -+{ -+ int c; -+ int option_index = 0; -+ int parse_err = 0; -+ static struct option long_options[] = { -+ {"query-all", 0, 0, 'A'}, -+ {"conf-file", 1, 0, 'f'}, -+ {"conf", 1, 0, 'f'}, -+ {"dest", 1, 0, 'd'}, -+ {"force-defaults", 0, 0, ARGS_OPT_FORCE_DEFAULTS}, -+ {"force_defaults", 0, 0, ARGS_OPT_FORCE_DEFAULTS}, -+ {"force-depends", 0, 0, ARGS_OPT_FORCE_DEPENDS}, -+ {"force_depends", 0, 0, ARGS_OPT_FORCE_DEPENDS}, -+ {"force-overwrite", 0, 0, ARGS_OPT_FORCE_OVERWRITE}, -+ {"force_overwrite", 0, 0, ARGS_OPT_FORCE_OVERWRITE}, -+ {"force_downgrade", 0, 0, ARGS_OPT_FORCE_DOWNGRADE}, -+ {"force-downgrade", 0, 0, ARGS_OPT_FORCE_DOWNGRADE}, -+ {"force-reinstall", 0, 0, ARGS_OPT_FORCE_REINSTALL}, -+ {"force_reinstall", 0, 0, ARGS_OPT_FORCE_REINSTALL}, -+ {"force-space", 0, 0, ARGS_OPT_FORCE_SPACE}, -+ {"force_space", 0, 0, ARGS_OPT_FORCE_SPACE}, -+ {"recursive", 0, 0, -+ ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES}, -+ {"force-removal-of-dependent-packages", 0, 0, -+ ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES}, -+ {"force_removal_of_dependent_packages", 0, 0, -+ ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES}, -+ {"force-removal-of-essential-packages", 0, 0, -+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES}, -+ {"force_removal_of_essential_packages", 0, 0, -+ ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES}, -+ {"multiple-providers", 0, 0, ARGS_OPT_MULTIPLE_PROVIDERS}, -+ {"multiple_providers", 0, 0, ARGS_OPT_MULTIPLE_PROVIDERS}, -+ {"noaction", 0, 0, ARGS_OPT_NOACTION}, -+ {"nodeps", 0, 0, ARGS_OPT_NODEPS}, -+ {"offline", 1, 0, 'o'}, -+ {"offline-root", 1, 0, 'o'}, -+ {"test", 0, 0, ARGS_OPT_NOACTION}, -+ {"tmp-dir", 1, 0, 't'}, -+ {"verbose-wget", 0, 0, ARGS_OPT_VERBOSE_WGET}, -+ {"verbose_wget", 0, 0, ARGS_OPT_VERBOSE_WGET}, -+ {"verbosity", 2, 0, 'V'}, -+ {"version", 0, 0, 'v'}, -+ {0, 0, 0, 0} -+ }; -+ -+ while (1) { -+ c = getopt_long_only(argc, argv, "Ad:f:no:t:vV:", long_options, &option_index); -+ if (c == -1) -+ break; -+ -+ switch (c) { -+ case 'A': -+ args->query_all = 1; -+ break; -+ case 'd': -+ args->dest = optarg; -+ break; -+ case 'f': -+ free(args->conf_file); -+ args->conf_file = strdup(optarg); -+ break; -+ case 'o': -+ args->offline_root = optarg; -+ break; -+ case 'n': -+ args->noaction = 1; -+ break; -+ case 't': -+ args->tmp_dir = strdup(optarg); -+ break; -+ case 'v': -+ print_version(); -+ exit(0); -+ case 'V': -+ case ARGS_OPT_VERBOSITY: -+ if (optarg) -+ args->verbosity = atoi(optarg); -+ else -+ args->verbosity += 1; -+ break; -+ case ARGS_OPT_FORCE_DEFAULTS: -+ args->force_defaults = 1; -+ break; -+ case ARGS_OPT_FORCE_DEPENDS: -+ args->force_depends = 1; -+ break; -+ case ARGS_OPT_FORCE_OVERWRITE: -+ args->force_overwrite = 1; -+ break; -+ case ARGS_OPT_FORCE_DOWNGRADE: -+ args->force_downgrade = 1; -+ break; -+ case ARGS_OPT_FORCE_REINSTALL: -+ args->force_reinstall = 1; -+ break; -+ case ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES: -+ args->force_removal_of_essential_packages = 1; -+ break; -+ case ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES: -+ args->force_removal_of_dependent_packages = 1; -+ break; -+ case ARGS_OPT_FORCE_SPACE: -+ args->force_space = 1; -+ break; -+ case ARGS_OPT_VERBOSE_WGET: -+ args->verbose_wget = 1; -+ break; -+ case ARGS_OPT_MULTIPLE_PROVIDERS: -+ args->multiple_providers = 1; -+ break; -+ case ARGS_OPT_NODEPS: -+ args->nodeps = 1; -+ break; -+ case ARGS_OPT_NOACTION: -+ args->noaction = 1; -+ break; -+ case ':': -+ parse_err++; -+ break; -+ case '?': -+ parse_err++; -+ break; -+ default: -+ bb_error_msg("Confusion: getopt_long returned %d\n", c); -+ } -+ } -+ -+ if (parse_err) { -+ return -parse_err; -+ } else { -+ return optind; -+ } -+} -+ -+void args_usage(char *complaint) -+{ -+ if (complaint) { -+ bb_error_msg("%s\n", complaint); -+ } -+ print_version(); -+ bb_show_usage(); -+ exit(1); -+} -+ -+static void print_version(void) -+{ -+ bb_error_msg("version %s\n", IPKG_VERSION); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/args.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/args.h ---- busybox-1.1.2-orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/args.h 2006-05-09 02:12:03.000000000 +0200 -@@ -0,0 +1,72 @@ -+/* args.h - parse command-line args -+ -+ Carl D. Worth -+ -+ Copyright 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 ARGS_H -+#define ARGS_H -+ -+struct args -+{ -+ char *conf_file; -+ char *dest; -+ char *tmp_dir; -+ int force_defaults; -+ int force_depends; -+ int force_overwrite; -+ int force_downgrade; -+ int force_reinstall; -+ int force_removal_of_essential_packages; -+ int force_removal_of_dependent_packages; -+ int force_space; -+ int noaction; -+ int nodeps; -+ int multiple_providers; -+ int query_all; -+ int verbose_wget; -+ int verbosity; -+ int nocheckfordirorfile; -+ int noreadfeedsfile; -+ char *offline_root; -+ char *offline_root_pre_script_cmd; -+ char *offline_root_post_script_cmd; -+}; -+typedef struct args args_t; -+ -+#define ARGS_DEFAULT_CONF_FILE_DIR "/etc" -+#define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf" -+#define ARGS_DEFAULT_DEST NULL -+#define ARGS_DEFAULT_FORCE_DEFAULTS 0 -+#define ARGS_DEFAULT_FORCE_DEPENDS 0 -+#define ARGS_DEFAULT_FORCE_OVERWRITE 0 -+#define ARGS_DEFAULT_FORCE_DOWNGRADE 0 -+#define ARGS_DEFAULT_FORCE_REINSTALL 0 -+#define ARGS_DEFAULT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES 0 -+#define ARGS_DEFAULT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES 0 -+#define ARGS_DEFAULT_FORCE_SPACE 0 -+#define ARGS_DEFAULT_OFFLINE_ROOT NULL -+#define ARGS_DEFAULT_OFFLINE_ROOT_PRE_SCRIPT_CMD NULL -+#define ARGS_DEFAULT_OFFLINE_ROOT_POST_SCRIPT_CMD NULL -+#define ARGS_DEFAULT_NOACTION 0 -+#define ARGS_DEFAULT_NODEPS 0 -+#define ARGS_DEFAULT_VERBOSE_WGET 0 -+#define ARGS_DEFAULT_VERBOSITY 1 -+ -+int args_init(args_t *args); -+void args_deinit(args_t *args); -+int args_parse(args_t *args, int argc, char *argv[]); -+void args_usage(char *complaint); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/conffile.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile.c ---- busybox-1.1.2-orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,64 @@ -+/* conffile.c - 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. -+*/ -+ -+#include <string.h> -+#include <stdlib.h> -+ -+#include "ipkg.h" -+#include "ipkg_message.h" -+ -+#include "conffile.h" -+#include "file_util.h" -+#include "sprintf_alloc.h" -+ -+int conffile_init(conffile_t *conffile, const char *file_name, const char *md5sum) -+{ -+ return nv_pair_init(conffile, file_name, md5sum); -+} -+ -+void conffile_deinit(conffile_t *conffile) -+{ -+ nv_pair_deinit(conffile); -+} -+ -+int conffile_has_been_modified(ipkg_conf_t *conf, conffile_t *conffile) -+{ -+ char *md5sum; -+ char *filename = conffile->name; -+ char *root_filename; -+ int ret; -+ -+ if (conffile->value == NULL) { -+ ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s has no md5sum\n", __FUNCTION__, conffile->name); -+ return 1; -+ } -+ -+ root_filename = root_filename_alloc(conf, filename); -+ -+ md5sum = file_md5sum_alloc(root_filename); -+ -+ ret = strcmp(md5sum, conffile->value); -+ if (ret) { -+ ipkg_message(conf, IPKG_NOTICE, "%s: conffile %s: \t\nold md5=%s \t\nnew md5=%s\n", __FUNCTION__, -+ conffile->name, md5sum, conffile->value); -+ } -+ -+ free(root_filename); -+ free(md5sum); -+ -+ return ret; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/conffile.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile.h ---- busybox-1.1.2-orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,30 @@ -+/* conffile.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 CONFFILE_H -+#define CONFFILE_H -+ -+#include "nv_pair.h" -+ -+typedef struct nv_pair conffile_t; -+ -+int conffile_init(conffile_t *conffile, const char *file_name, const char *md5sum); -+void conffile_deinit(conffile_t *conffile); -+int conffile_has_been_modified(struct ipkg_conf *conf, conffile_t *conffile); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/conffile_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile_list.c ---- busybox-1.1.2-orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,47 @@ -+/* conffile_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "conffile_list.h" -+ -+int conffile_list_init(conffile_list_t *list) -+{ -+ return nv_pair_list_init(list); -+} -+ -+void conffile_list_deinit(conffile_list_t *list) -+{ -+ nv_pair_list_deinit(list); -+} -+ -+conffile_t *conffile_list_append(conffile_list_t *list, const char *file_name, -+ const char *md5sum) -+{ -+ return nv_pair_list_append(list, file_name, md5sum); -+} -+ -+int conffile_list_push(conffile_list_t *list, conffile_t *data) -+{ -+ return nv_pair_list_push(list, data); -+} -+ -+conffile_list_elt_t *conffile_list_pop(conffile_list_t *list) -+{ -+ return nv_pair_list_pop(list); -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/conffile_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile_list.h ---- busybox-1.1.2-orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/conffile_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,36 @@ -+/* conffile_list.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 CONFFILE_LIST_H -+#define CONFFILE_LIST_H -+ -+#include "conffile.h" -+#include "nv_pair_list.h" -+ -+typedef struct nv_pair_list_elt conffile_list_elt_t; -+typedef struct nv_pair_list conffile_list_t; -+ -+int conffile_list_init(conffile_list_t *list); -+void conffile_list_deinit(conffile_list_t *list); -+ -+conffile_t *conffile_list_append(conffile_list_t *list, const char *name, -+ const char *root_dir); -+int conffile_list_push(conffile_list_t *list, conffile_t *data); -+conffile_list_elt_t *conffile_list_pop(conffile_list_t *list); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/file_util.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c ---- busybox-1.1.2-orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,177 @@ -+/* file_util.c - convenience routines for common stat operations -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#include "sprintf_alloc.h" -+#include "file_util.h" -+#include "md5.h" -+#include "libbb.h" -+#undef strlen -+ -+int file_exists(const char *file_name) -+{ -+ int err; -+ struct stat stat_buf; -+ -+ err = stat(file_name, &stat_buf); -+ if (err == 0) { -+ return 1; -+ } else { -+ return 0; -+ } -+} -+ -+int file_is_dir(const char *file_name) -+{ -+ int err; -+ struct stat stat_buf; -+ -+ err = stat(file_name, &stat_buf); -+ if (err) { -+ return 0; -+ } -+ -+ return S_ISDIR(stat_buf.st_mode); -+} -+ -+/* read a single line from a file, stopping at a newline or EOF. -+ If a newline is read, it will appear in the resulting string. -+ Return value is a malloc'ed char * which should be freed at -+ some point by the caller. -+ -+ Return value is NULL if the file is at EOF when called. -+*/ -+#define FILE_READ_LINE_BUF_SIZE 1024 -+char *file_read_line_alloc(FILE *file) -+{ -+ char buf[FILE_READ_LINE_BUF_SIZE]; -+ int buf_len; -+ char *line = NULL; -+ int line_size = 0; -+ -+ memset(buf, 0, FILE_READ_LINE_BUF_SIZE); -+ while (fgets(buf, FILE_READ_LINE_BUF_SIZE, file)) { -+ buf_len = strlen(buf); -+ if (line) { -+ line_size += buf_len; -+ line = realloc(line, line_size); -+ if (line == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ break; -+ } -+ strcat(line, buf); -+ } else { -+ line_size = buf_len + 1; -+ line = strdup(buf); -+ } -+ if (buf[buf_len - 1] == '\n') { -+ break; -+ } -+ } -+ -+ return line; -+} -+ -+int file_move(const char *src, const char *dest) -+{ -+ int err; -+ -+ err = rename(src, dest); -+ -+ if (err && errno == EXDEV) { -+ err = file_copy(src, dest); -+ unlink(src); -+ } else if (err) { -+ fprintf(stderr, "%s: ERROR: failed to rename %s to %s: %s\n", -+ __FUNCTION__, src, dest, strerror(errno)); -+ } -+ -+ return err; -+} -+ -+/* I put these here to keep libbb dependencies from creeping all over -+ the ipkg code */ -+int file_copy(const char *src, const char *dest) -+{ -+ int err; -+ -+ err = copy_file(src, dest, FILEUTILS_FORCE | FILEUTILS_PRESERVE_STATUS); -+ if (err) { -+ fprintf(stderr, "%s: ERROR: failed to copy %s to %s\n", -+ __FUNCTION__, src, dest); -+ } -+ -+ return err; -+} -+ -+int file_mkdir_hier(const char *path, long mode) -+{ -+ return bb_make_directory(path, mode, FILEUTILS_RECUR); -+} -+ -+char *file_md5sum_alloc(const char *file_name) -+{ -+ static const int md5sum_bin_len = 16; -+ static const int md5sum_hex_len = 32; -+ -+ static const unsigned char bin2hex[16] = { -+ '0', '1', '2', '3', -+ '4', '5', '6', '7', -+ '8', '9', 'a', 'b', -+ 'c', 'd', 'e', 'f' -+ }; -+ -+ int i, err; -+ FILE *file; -+ unsigned char *md5sum_hex; -+ unsigned char md5sum_bin[md5sum_bin_len]; -+ -+ md5sum_hex = malloc(md5sum_hex_len + 1); -+ if (md5sum_hex == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return strdup(""); -+ } -+ -+ file = fopen(file_name, "r"); -+ if (file == NULL) { -+ fprintf(stderr, "%s: Failed to open file %s: %s\n", -+ __FUNCTION__, file_name, strerror(errno)); -+ return strdup(""); -+ } -+ -+ err = md5_stream(file, md5sum_bin); -+ if (err) { -+ fprintf(stderr, "%s: ERROR computing md5sum for %s: %s\n", -+ __FUNCTION__, file_name, strerror(err)); -+ return strdup(""); -+ } -+ -+ fclose(file); -+ -+ for (i=0; i < md5sum_bin_len; i++) { -+ md5sum_hex[i*2] = bin2hex[md5sum_bin[i] >> 4]; -+ md5sum_hex[i*2+1] = bin2hex[md5sum_bin[i] & 0xf]; -+ } -+ -+ md5sum_hex[md5sum_hex_len] = '\0'; -+ -+ return md5sum_hex; -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/file_util.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.h ---- busybox-1.1.2-orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,29 @@ -+/* file_util.h - convenience routines for common file operations -+ -+ 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 FILE_UTIL_H -+#define FILE_UTIL_H -+ -+int file_exists(const char *file_name); -+int file_is_dir(const char *file_name); -+char *file_read_line_alloc(FILE *file); -+int file_move(const char *src, const char *dest); -+int file_copy(const char *src, const char *dest); -+int file_mkdir_hier(const char *path, long mode); -+char *file_md5sum_alloc(const char *file_name); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/hash_table.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/hash_table.c ---- busybox-1.1.2-orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/hash_table.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,155 @@ -+/* hash.c - hash tables for ipkg -+ -+ Steven M. Ayer, Jamey Hicks -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include <errno.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include "hash_table.h" -+#include "ipkg_message.h" -+ -+ -+static int hash_index(hash_table_t *hash, const char *pkg_name); -+static int rotating(const char *key, int len, int prime); -+ -+static int hash_index(hash_table_t *hash, const char *pkg_name) -+{ -+ return rotating(pkg_name, strlen(pkg_name), hash->n_entries); -+} -+ -+static int rotating(const char *key, int len, int prime) -+{ -+ unsigned int hash, i; -+ for (hash=len, i=0; i<len; ++i) -+ hash = (hash<<4)^(hash>>28)^key[i]; -+ return (hash % prime); -+} -+ -+ -+/* -+ * this is an open table keyed by strings -+ */ -+int hash_table_init(const char *name, hash_table_t *hash, int len) -+{ -+ static int primes_table[] = { -+ 379, 761, 983, 1423, 2711, 3361, 3931, 4679, 5519, 6701, 9587, -+ 19471, 23143, 33961, 46499, 49727, 99529, 0 -+ }; -+ int *picker; -+ -+ if (hash->entries != NULL) { -+ /* we have been here already */ -+ return 0; -+ } -+ -+ hash->name = name; -+ hash->entries = NULL; -+ hash->n_entries = 0; -+ hash->hash_entry_key = NULL; -+ -+ picker = primes_table; -+ while(*picker && (*picker++ < len)); -+ if(!*picker) -+ fprintf(stderr, "%s: primes table might not be big enough (! << %d)\n", __FUNCTION__, len); -+ --picker; -+ -+ hash->n_entries = *picker; -+ hash->entries = (hash_entry_t *)calloc(hash->n_entries, sizeof(hash_entry_t)); -+ if (hash->entries == NULL) { -+ fprintf(stderr, "%s: Out of memory.\n", __FUNCTION__); -+ return ENOMEM; -+ } -+ return 0; -+} -+ -+void hash_table_deinit(hash_table_t *hash) -+{ -+ free(hash->entries); -+ hash->entries = NULL; -+ hash->n_entries = 0; -+} -+ -+void *hash_table_get(hash_table_t *hash, const char *key) -+{ -+ int ndx= hash_index(hash, key); -+ hash_entry_t *hash_entry = hash->entries + ndx; -+ while (hash_entry) -+ { -+ if (hash_entry->key) -+ { -+ if (strcmp(key, hash_entry->key) == 0) { -+ // ipkg_message(NULL, IPKG_DEBUG, "Function: %s. Key found for '%s' \n", __FUNCTION__, key); -+ return hash_entry->data; -+ } -+ } -+ hash_entry = hash_entry->next; -+ } -+ return NULL; -+} -+ -+int hash_table_insert(hash_table_t *hash, const char *key, void *value) -+{ -+ int ndx= hash_index(hash, key); -+ hash_entry_t *hash_entry = hash->entries + ndx; -+ if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Inserting in hash for '%s' \n", __FUNCTION__, key); -+ if (hash_entry->key) { -+ if (strcmp(hash_entry->key, key) == 0) { -+ /* alread in table, update the value */ -+ if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash for '%s' \n", __FUNCTION__, key); -+ hash_entry->data = value; -+ return 0; -+ } else { -+ /* -+ * if this is a collision, we have to go to the end of the ll, -+ * then add a new entry -+ * before we can hook up the value -+ */ -+ if (0) ipkg_message(NULL, IPKG_DEBUG2, "Function: %s. Value already in hash by collision for '%s' \n", __FUNCTION__, key); -+ while (hash_entry->next) -+ hash_entry = hash_entry->next; -+ hash_entry->next = (hash_entry_t *)malloc(sizeof(hash_entry_t)); -+ if (!hash_entry->next) { -+ return -ENOMEM; -+ } -+ hash_entry = hash_entry->next; -+ hash_entry->next = NULL; -+ } -+ } -+ hash->n_elements++; -+ hash_entry->key = strdup(key); -+ hash_entry->data = value; -+ -+ return 0; -+} -+ -+ -+void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data) -+{ -+ int i; -+ if (!hash || !f) -+ return; -+ -+ for (i = 0; i < hash->n_entries; i++) { -+ hash_entry_t *hash_entry = (hash->entries + i); -+ do { -+ if(hash_entry->key) { -+ f(hash_entry->key, hash_entry->data, data); -+ } -+ } while((hash_entry = hash_entry->next)); -+ } -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/hash_table.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/hash_table.h ---- busybox-1.1.2-orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/hash_table.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,44 @@ -+/* hash.h - hash tables for ipkg -+ -+ Steven M. Ayer, Jamey Hicks -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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 _HASH_TABLE_H_ -+#define _HASH_TABLE_H_ -+ -+typedef struct hash_entry hash_entry_t; -+typedef struct hash_table hash_table_t; -+ -+struct hash_entry { -+ const char * key; -+ void * data; -+ struct hash_entry * next; -+}; -+ -+struct hash_table { -+ const char *name; -+ hash_entry_t * entries; -+ int n_entries; /* number of buckets */ -+ int n_elements; -+ const char * (*hash_entry_key)(void * data); -+}; -+ -+int hash_table_init(const char *name, hash_table_t *hash, int len); -+void hash_table_deinit(hash_table_t *hash); -+void *hash_table_get(hash_table_t *hash, const char *key); -+int hash_table_insert(hash_table_t *hash, const char *key, void *value); -+void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); -+ -+#endif /* _HASH_TABLE_H_ */ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,74 @@ -+/* 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 -+ -+/* -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+*/ -+ -+#if 0 -+#define IPKG_DEBUG_NO_TMP_CLEANUP -+#endif -+ -+#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 "0.99.162" -+ -+ -+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; -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_cmd.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c 2006-05-09 02:23:37.000000000 +0200 -@@ -0,0 +1,1431 @@ -+/* ipkg_cmd.c - 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. -+*/ -+ -+#include <string.h> -+ -+#include "ipkg.h" -+#include <libgen.h> -+#include <glob.h> -+#include <errno.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <signal.h> -+#include <stdio.h> -+#include <dirent.h> -+ -+#include "ipkg_conf.h" -+#include "ipkg_cmd.h" -+#include "ipkg_message.h" -+#include "pkg.h" -+#include "pkg_dest.h" -+#include "pkg_parse.h" -+#include "sprintf_alloc.h" -+#include "pkg.h" -+#include "file_util.h" -+#include "str_util.h" -+#include "libbb.h" -+#include "unarchive.h" -+ -+#include <fnmatch.h> -+ -+ -+#include "ipkg_download.h" -+#include "ipkg_install.h" -+#include "ipkg_upgrade.h" -+#include "ipkg_remove.h" -+#include "ipkg_configure.h" -+#include "ipkg_message.h" -+ -+#ifdef IPKG_LIB -+#include "libipkg.h" -+static void *p_userdata = NULL; -+#endif -+ -+static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv); -+static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv); -+ -+/* XXX: CLEANUP: The usage strings should be incorporated into this -+ array for easier maintenance */ -+static ipkg_cmd_t cmds[] = { -+ {"update", 0, (ipkg_cmd_fun_t)ipkg_update_cmd}, -+ {"upgrade", 0, (ipkg_cmd_fun_t)ipkg_upgrade_cmd}, -+ {"list", 0, (ipkg_cmd_fun_t)ipkg_list_cmd}, -+ {"list_installed", 0, (ipkg_cmd_fun_t)ipkg_list_installed_cmd}, -+ {"info", 0, (ipkg_cmd_fun_t)ipkg_info_cmd}, -+ {"flag", 1, (ipkg_cmd_fun_t)ipkg_flag_cmd}, -+ {"status", 0, (ipkg_cmd_fun_t)ipkg_status_cmd}, -+ {"install_pending", 0, (ipkg_cmd_fun_t)ipkg_install_pending_cmd}, -+ {"install", 1, (ipkg_cmd_fun_t)ipkg_install_cmd}, -+ {"remove", 1, (ipkg_cmd_fun_t)ipkg_remove_cmd}, -+ {"purge", 1, (ipkg_cmd_fun_t)ipkg_purge_cmd}, -+ {"configure", 0, (ipkg_cmd_fun_t)ipkg_configure_cmd}, -+ {"files", 1, (ipkg_cmd_fun_t)ipkg_files_cmd}, -+ {"search", 1, (ipkg_cmd_fun_t)ipkg_search_cmd}, -+ {"download", 1, (ipkg_cmd_fun_t)ipkg_download_cmd}, -+ {"compare_versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd}, -+ {"compare-versions", 1, (ipkg_cmd_fun_t)ipkg_compare_versions_cmd}, -+ {"print-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd}, -+ {"print_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd}, -+ {"print-installation-architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd}, -+ {"print_installation_architecture", 0, (ipkg_cmd_fun_t)ipkg_print_architecture_cmd}, -+ {"depends", 1, (ipkg_cmd_fun_t)ipkg_depends_cmd}, -+ {"whatdepends", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_cmd}, -+ {"whatdependsrec", 1, (ipkg_cmd_fun_t)ipkg_whatdepends_recursively_cmd}, -+ {"whatrecommends", 1, (ipkg_cmd_fun_t)ipkg_whatrecommends_cmd}, -+ {"whatsuggests", 1, (ipkg_cmd_fun_t)ipkg_whatsuggests_cmd}, -+ {"whatprovides", 1, (ipkg_cmd_fun_t)ipkg_whatprovides_cmd}, -+ {"whatreplaces", 1, (ipkg_cmd_fun_t)ipkg_whatreplaces_cmd}, -+ {"whatconflicts", 1, (ipkg_cmd_fun_t)ipkg_whatconflicts_cmd}, -+}; -+ -+int ipkg_state_changed; -+static void write_status_files_if_changed(ipkg_conf_t *conf) -+{ -+ if (ipkg_state_changed && !conf->noaction) { -+ ipkg_message(conf, IPKG_INFO, -+ " writing status file\n"); -+ ipkg_conf_write_status_files(conf); -+ pkg_write_changed_filelists(conf); -+ } else { -+ ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n"); -+ } -+} -+ -+ -+static int num_cmds = sizeof(cmds) / sizeof(ipkg_cmd_t); -+ -+ipkg_cmd_t *ipkg_cmd_find(const char *name) -+{ -+ int i; -+ ipkg_cmd_t *cmd; -+ -+ for (i=0; i < num_cmds; i++) { -+ cmd = &cmds[i]; -+ if (strcmp(name, cmd->name) == 0) { -+ return cmd; -+ } -+ } -+ -+ return NULL; -+} -+ -+#ifdef IPKG_LIB -+int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv, void *userdata) -+{ -+ int result; -+ p_userdata = userdata; -+ -+ -+ result = (cmd->fun)(conf, argc, argv); -+ if ( result == 0 ) { -+ ipkg_message(conf, IPKG_NOTICE, "Done.\n"); -+ } else { -+ ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result); -+ -+ } -+ if ( error_list ) { -+ reverse_error_list(&error_list); -+ -+ ipkg_message(conf, IPKG_NOTICE, "Collected errors:\n"); -+ /* Here we print the errors collected and free the list */ -+ while (error_list != NULL) { -+ ipkg_message(conf, IPKG_NOTICE, "%s",error_list->errmsg); -+ error_list = error_list->next; -+ -+ } -+ free_error_list(&error_list); -+ -+ } -+ -+ p_userdata = NULL; -+ return result; -+} -+#else -+int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv) -+{ -+ return (cmd->fun)(conf, argc, argv); -+} -+#endif -+ -+static int ipkg_update_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int err; -+ int failures; -+ char *lists_dir; -+ pkg_src_list_elt_t *iter; -+ pkg_src_t *src; -+ -+ -+ sprintf_alloc(&lists_dir, "%s", conf->restrict_to_default_dest ? conf->default_dest->lists_dir : conf->lists_dir); -+ -+ if (! file_is_dir(lists_dir)) { -+ if (file_exists(lists_dir)) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: ERROR: %s exists, but is not a directory\n", -+ __FUNCTION__, lists_dir); -+ free(lists_dir); -+ return EINVAL; -+ } -+ err = file_mkdir_hier(lists_dir, 0755); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: ERROR: failed to make directory %s: %s\n", -+ __FUNCTION__, lists_dir, strerror(errno)); -+ free(lists_dir); -+ return EINVAL; -+ } -+ } -+ -+ failures = 0; -+ for (iter = conf->pkg_src_list.head; iter; iter = iter->next) { -+ char *url, *list_file_name; -+ -+ src = iter->data; -+ -+ if (src->extra_data) /* debian style? */ -+ sprintf_alloc(&url, "%s/%s/%s", src->value, src->extra_data, -+ src->gzip ? "Packages.gz" : "Packages"); -+ else -+ sprintf_alloc(&url, "%s/%s", src->value, src->gzip ? "Packages.gz" : "Packages"); -+ -+ sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name); -+ if (src->gzip) { -+ char *tmp; -+ char *tmp_file_name; -+ FILE *in, *out; -+ -+ tmp = strdup ("/tmp/ipkg.XXXXXX"); -+ -+ if (mkdtemp (tmp) == NULL) { -+ perror ("mkdtemp"); -+ failures++; -+ continue; -+ } -+ -+ sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name); -+ err = ipkg_download(conf, url, tmp_file_name); -+ if (err == 0) { -+ ipkg_message (conf, IPKG_NOTICE, "Inflating %s\n", url); -+ in = fopen (tmp_file_name, "r"); -+ out = fopen (list_file_name, "w"); -+ if (in && out) -+ inflate_unzip (in, out); -+ else -+ err = 1; -+ if (in) -+ fclose (in); -+ if (out) -+ fclose (out); -+ unlink (tmp_file_name); -+ rmdir (tmp); -+ free (tmp); -+ } -+ } else -+ err = ipkg_download(conf, url, list_file_name); -+ if (err) { -+ failures++; -+ } else { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Updated list of available packages in %s\n", -+ list_file_name); -+ } -+ free(url); -+ free(list_file_name); -+ } -+ free(lists_dir); -+ -+#ifdef CONFIG_CLEAR_SW_INSTALL_FLAG -+#warning here -+ /* clear SW_INSTALL on any package where state is SS_NOT_INSTALLED. -+ * this is a hack to work around poor bookkeeping in old ipkg upgrade code -+ * -Jamey 3/1/03 -+ */ -+ { -+ int i; -+ int changed = 0; -+ pkg_vec_t *available = pkg_vec_alloc(); -+ pkg_hash_fetch_available(&conf->pkg_hash, available); -+ ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL for SS_NOT_INSTALLED packages.\n"); -+ for (i = 0; i < available->len; i++) { -+ pkg_t *pkg = available->pkgs[i]; -+ if (pkg->state_want == SW_INSTALL && pkg->state_status == SS_NOT_INSTALLED) { -+ ipkg_message(conf, IPKG_DEBUG, "Clearing SW_INSTALL on package %s.\n", pkg->name); -+ pkg->state_want = SW_UNKNOWN; -+ changed = 1; -+ } -+ } -+ pkg_vec_free(available); -+ if (changed) { -+ write_status_files_if_changed(conf); -+ } -+ } -+#endif -+ -+ return failures; -+} -+ -+ -+/* scan the args passed and cache the local filenames of the packages */ -+int ipkg_multiple_files_scan(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ int err; -+ -+ /* -+ * First scan through package names/urls -+ * For any urls, download the packages and install in database. -+ * For any files, install package info in database. -+ */ -+ for (i = 0; i < argc; i ++) { -+ char *filename = argv [i]; -+ //char *tmp = basename (tmp); -+ //int tmplen = strlen (tmp); -+ -+ //if (strcmp (tmp + (tmplen - strlen (IPKG_PKG_EXTENSION)), IPKG_PKG_EXTENSION) != 0) -+ // continue; -+ //if (strcmp (tmp + (tmplen - strlen (DPKG_PKG_EXTENSION)), DPKG_PKG_EXTENSION) != 0) -+ // continue; -+ -+ ipkg_message(conf, IPKG_DEBUG2, "Debug mfs: %s \n",filename ); -+ -+ err = ipkg_prepare_url_for_install(conf, filename, &argv[i]); -+ if (err) -+ return err; -+ } -+ return 0; -+} -+ -+struct ipkg_intercept -+{ -+ char *oldpath; -+ char *statedir; -+}; -+ -+typedef struct ipkg_intercept *ipkg_intercept_t; -+ -+ipkg_intercept_t ipkg_prep_intercepts(ipkg_conf_t *conf) -+{ -+ ipkg_intercept_t ctx; -+ char *newpath; -+ int gen; -+ -+ ctx = malloc (sizeof (*ctx)); -+ ctx->oldpath = strdup (getenv ("PATH")); -+ -+ sprintf_alloc (&newpath, "%s/ipkg/intercept:%s", IPKGLIBDIR, ctx->oldpath); -+ setenv ("PATH", newpath, 1); -+ free (newpath); -+ -+ gen = 0; -+ retry: -+ sprintf_alloc (&ctx->statedir, "/tmp/ipkg-intercept-%d-%d", getpid (), gen); -+ if (mkdir (ctx->statedir, 0770) < 0) { -+ if (errno == EEXIST) { -+ free (ctx->statedir); -+ gen++; -+ goto retry; -+ } -+ perror (ctx->statedir); -+ return NULL; -+ } -+ setenv ("IPKG_INTERCEPT_DIR", ctx->statedir, 1); -+ return ctx; -+} -+ -+int ipkg_finalize_intercepts(ipkg_intercept_t ctx) -+{ -+ char *cmd; -+ DIR *dir; -+ int err = 0; -+ -+ setenv ("PATH", ctx->oldpath, 1); -+ free (ctx->oldpath); -+ -+ dir = opendir (ctx->statedir); -+ if (dir) { -+ struct dirent *de; -+ while (de = readdir (dir), de != NULL) { -+ char *path; -+ -+ if (de->d_name[0] == '.') -+ continue; -+ -+ sprintf_alloc (&path, "%s/%s", ctx->statedir, de->d_name); -+ if (access (path, X_OK) == 0) { -+ if (system (path)) { -+ err = errno; -+ perror (de->d_name); -+ } -+ } -+ free (path); -+ } -+ } else -+ perror (ctx->statedir); -+ -+ sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir); -+ system (cmd); -+ free (cmd); -+ -+ free (ctx->statedir); -+ free (ctx); -+ -+ return err; -+} -+ -+int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name) -+{ -+ pkg_vec_t *all; -+ int i; -+ pkg_t *pkg; -+ ipkg_intercept_t ic; -+ int r, err = 0; -+ -+ ipkg_message(conf, IPKG_INFO, -+ "Configuring unpacked packages\n"); -+ fflush( stdout ); -+ -+ all = pkg_vec_alloc(); -+ pkg_hash_fetch_available(&conf->pkg_hash, all); -+ -+ ic = ipkg_prep_intercepts (conf); -+ -+ for(i = 0; i < all->len; i++) { -+ pkg = all->pkgs[i]; -+ -+ if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) -+ continue; -+ -+ if (pkg->state_status == SS_UNPACKED) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Configuring %s\n", pkg->name); -+ fflush( stdout ); -+ r = ipkg_configure(conf, pkg); -+ if (r == 0) { -+ pkg->state_status = SS_INSTALLED; -+ pkg->parent->state_status = SS_INSTALLED; -+ pkg->state_flag &= ~SF_PREFER; -+ } else { -+ if (!err) -+ err = r; -+ } -+ } -+ } -+ -+ r = ipkg_finalize_intercepts (ic); -+ if (r && !err) -+ err = r; -+ -+ pkg_vec_free(all); -+ return err; -+} -+ -+static void sigint_handler(int sig) -+{ -+ signal(sig, SIG_DFL); -+ ipkg_message(NULL, IPKG_NOTICE, -+ "ipkg: interrupted. writing out status database\n"); -+ write_status_files_if_changed(global_conf); -+ exit(128 + sig); -+} -+ -+static int ipkg_install_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ char *arg; -+ int err=0; -+ -+ global_conf = conf; -+ signal(SIGINT, sigint_handler); -+ -+ /* -+ * Now scan through package names and install -+ */ -+ for (i=0; i < argc; i++) { -+ arg = argv[i]; -+ -+ ipkg_message(conf, IPKG_DEBUG2, "Debug install_cmd: %s \n",arg ); -+ err = ipkg_prepare_url_for_install(conf, arg, &argv[i]); -+ if (err != EINVAL && err != 0) -+ return err; -+ } -+ pkg_info_preinstall_check(conf); -+ -+ for (i=0; i < argc; i++) { -+ arg = argv[i]; -+ if (conf->multiple_providers) -+ err = ipkg_install_multi_by_name(conf, arg); -+ else{ -+ err = ipkg_install_by_name(conf, arg); -+ } -+ if (err == IPKG_PKG_HAS_NO_CANDIDATE) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Cannot find package %s.\n" -+ "Check the spelling or perhaps run 'ipkg update'\n", -+ arg); -+ } -+ } -+ -+ /* recheck to verify that all dependences are satisfied */ -+ if (0) ipkg_satisfy_all_dependences(conf); -+ -+ ipkg_configure_packages(conf, NULL); -+ -+ write_status_files_if_changed(conf); -+ -+ return err; -+} -+ -+static int ipkg_upgrade_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ pkg_t *pkg; -+ int err; -+ -+ global_conf = conf; -+ signal(SIGINT, sigint_handler); -+ -+ if (argc) { -+ for (i=0; i < argc; i++) { -+ char *arg = argv[i]; -+ -+ err = ipkg_prepare_url_for_install(conf, arg, &arg); -+ if (err != EINVAL && err != 0) -+ return err; -+ } -+ pkg_info_preinstall_check(conf); -+ -+ for (i=0; i < argc; i++) { -+ char *arg = argv[i]; -+ if (conf->restrict_to_default_dest) { -+ pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash, -+ argv[i], -+ conf->default_dest); -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Package %s not installed in %s\n", -+ argv[i], conf->default_dest->name); -+ continue; -+ } -+ } else { -+ pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, -+ argv[i]); -+ } -+ if (pkg) -+ ipkg_upgrade_pkg(conf, pkg); -+ else { -+ ipkg_install_by_name(conf, arg); -+ } -+ } -+ } else { -+ pkg_vec_t *installed = pkg_vec_alloc(); -+ -+ pkg_info_preinstall_check(conf); -+ -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, installed); -+ for (i = 0; i < installed->len; i++) { -+ pkg = installed->pkgs[i]; -+ ipkg_upgrade_pkg(conf, pkg); -+ } -+ pkg_vec_free(installed); -+ } -+ -+ /* recheck to verify that all dependences are satisfied */ -+ if (0) ipkg_satisfy_all_dependences(conf); -+ -+ ipkg_configure_packages(conf, NULL); -+ -+ write_status_files_if_changed(conf); -+ -+ return 0; -+} -+ -+static int ipkg_download_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i, err; -+ char *arg; -+ pkg_t *pkg; -+ -+ pkg_info_preinstall_check(conf); -+ for (i = 0; i < argc; i++) { -+ arg = argv[i]; -+ -+ pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg); -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Cannot find package %s.\n" -+ "Check the spelling or perhaps run 'ipkg update'\n", -+ arg); -+ continue; -+ } -+ -+ err = ipkg_download_pkg(conf, pkg, "."); -+ -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Failed to download %s\n", pkg->name); -+ } else { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Downloaded %s as %s\n", -+ pkg->name, pkg->local_filename); -+ } -+ } -+ -+ return 0; -+} -+ -+ -+static int ipkg_list_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i ; -+ pkg_vec_t *available; -+ pkg_t *pkg; -+ char desc_short[IPKG_LIST_DESCRIPTION_LENGTH]; -+ char *newline; -+ char *pkg_name = NULL; -+ char *version_str; -+ -+ if (argc > 0) { -+ pkg_name = argv[0]; -+ } -+ available = pkg_vec_alloc(); -+ pkg_hash_fetch_available(&conf->pkg_hash, available); -+ for (i=0; i < available->len; i++) { -+ pkg = available->pkgs[i]; -+ /* if we have package name or pattern and pkg does not match, then skip it */ -+ if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) -+ continue; -+ if (pkg->description) { -+ strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH); -+ } else { -+ desc_short[0] = '\0'; -+ } -+ desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0'; -+ newline = strchr(desc_short, '\n'); -+ if (newline) { -+ *newline = '\0'; -+ } -+#ifndef IPKG_LIB -+ printf("%s - %s\n", pkg->name, desc_short); -+#else -+ if (ipkg_cb_list) { -+ version_str = pkg_version_str_alloc(pkg); -+ ipkg_cb_list(pkg->name,desc_short, -+ version_str, -+ pkg->state_status, -+ p_userdata); -+ free(version_str); -+ } -+#endif -+ } -+ pkg_vec_free(available); -+ -+ return 0; -+} -+ -+ -+static int ipkg_list_installed_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i ; -+ pkg_vec_t *available; -+ pkg_t *pkg; -+ char desc_short[IPKG_LIST_DESCRIPTION_LENGTH]; -+ char *newline; -+ char *pkg_name = NULL; -+ char *version_str; -+ -+ if (argc > 0) { -+ pkg_name = argv[0]; -+ } -+ available = pkg_vec_alloc(); -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available); -+ for (i=0; i < available->len; i++) { -+ pkg = available->pkgs[i]; -+ /* if we have package name or pattern and pkg does not match, then skip it */ -+ if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) -+ continue; -+ if (pkg->description) { -+ strncpy(desc_short, pkg->description, IPKG_LIST_DESCRIPTION_LENGTH); -+ } else { -+ desc_short[0] = '\0'; -+ } -+ desc_short[IPKG_LIST_DESCRIPTION_LENGTH - 1] = '\0'; -+ newline = strchr(desc_short, '\n'); -+ if (newline) { -+ *newline = '\0'; -+ } -+#ifndef IPKG_LIB -+ printf("%s - %s\n", pkg->name, desc_short); -+#else -+ if (ipkg_cb_list) { -+ version_str = pkg_version_str_alloc(pkg); -+ ipkg_cb_list(pkg->name,desc_short, -+ version_str, -+ pkg->state_status, -+ p_userdata); -+ free(version_str); -+ } -+#endif -+ } -+ -+ return 0; -+} -+ -+static int ipkg_info_status_cmd(ipkg_conf_t *conf, int argc, char **argv, int installed_only) -+{ -+ int i; -+ pkg_vec_t *available; -+ pkg_t *pkg; -+ char *pkg_name = NULL; -+ char **pkg_fields = NULL; -+ int n_fields = 0; -+ char *buff ; // = (char *)malloc(1); -+ -+ if (argc > 0) { -+ pkg_name = argv[0]; -+ } -+ if (argc > 1) { -+ pkg_fields = &argv[1]; -+ n_fields = argc - 1; -+ } -+ -+ available = pkg_vec_alloc(); -+ if (installed_only) -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available); -+ else -+ pkg_hash_fetch_available(&conf->pkg_hash, available); -+ for (i=0; i < available->len; i++) { -+ pkg = available->pkgs[i]; -+ if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) { -+ continue; -+ } -+#ifndef IPKG_LIB -+ if (n_fields) { -+ for (j = 0; j < n_fields; j++) -+ pkg_print_field(pkg, stdout, pkg_fields[j]); -+ } else { -+ pkg_print_info(pkg, stdout); -+ } -+#else -+ -+ buff = pkg_formatted_info(pkg); -+ if ( buff ) { -+ if (ipkg_cb_status) ipkg_cb_status(pkg->name, -+ pkg->state_status, -+ buff, -+ p_userdata); -+/* -+ We should not forget that actually the pointer is allocated. -+ We need to free it :) ( Thanks florian for seeing the error ) -+*/ -+ free(buff); -+ } -+#endif -+ if (conf->verbosity > 1) { -+ conffile_list_elt_t *iter; -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ conffile_t *cf = iter->data; -+ int modified = conffile_has_been_modified(conf, cf); -+ ipkg_message(conf, IPKG_NOTICE, "conffile=%s md5sum=%s modified=%d\n", -+ cf->name, cf->value, modified); -+ } -+ } -+ } -+#ifndef IPKG_LIB -+ if (buff) -+ free(buff); -+#endif -+ pkg_vec_free(available); -+ -+ return 0; -+} -+ -+static int ipkg_info_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_info_status_cmd(conf, argc, argv, 0); -+} -+ -+static int ipkg_status_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_info_status_cmd(conf, argc, argv, 1); -+} -+ -+static int ipkg_configure_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ -+ int err; -+ if (argc > 0) { -+ char *pkg_name = NULL; -+ -+ pkg_name = argv[0]; -+ -+ err = ipkg_configure_packages (conf, pkg_name); -+ -+ } else { -+ err = ipkg_configure_packages (conf, NULL); -+ } -+ -+ write_status_files_if_changed(conf); -+ -+ return err; -+} -+ -+static int ipkg_install_pending_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i, err; -+ char *globpattern; -+ glob_t globbuf; -+ -+ sprintf_alloc(&globpattern, "%s/*" IPKG_PKG_EXTENSION, conf->pending_dir); -+ err = glob(globpattern, 0, NULL, &globbuf); -+ free(globpattern); -+ if (err) { -+ return 0; -+ } -+ -+ ipkg_message(conf, IPKG_NOTICE, -+ "The following packages in %s will now be installed.\n", -+ conf->pending_dir); -+ for (i = 0; i < globbuf.gl_pathc; i++) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "%s%s", i == 0 ? "" : " ", globbuf.gl_pathv[i]); -+ } -+ ipkg_message(conf, IPKG_NOTICE, "\n"); -+ for (i = 0; i < globbuf.gl_pathc; i++) { -+ err = ipkg_install_from_file(conf, globbuf.gl_pathv[i]); -+ if (err == 0) { -+ err = unlink(globbuf.gl_pathv[i]); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: ERROR: failed to unlink %s: %s\n", -+ __FUNCTION__, globbuf.gl_pathv[i], strerror(err)); -+ return err; -+ } -+ } -+ } -+ globfree(&globbuf); -+ -+ return err; -+} -+ -+static int ipkg_remove_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i,a,done; -+ pkg_t *pkg; -+ pkg_t *pkg_to_remove; -+ pkg_vec_t *available; -+ char *pkg_name = NULL; -+ global_conf = conf; -+ signal(SIGINT, sigint_handler); -+ -+// ENH: Add the "no pkg removed" just in case. -+ -+ done = 0; -+ -+ available = pkg_vec_alloc(); -+ pkg_info_preinstall_check(conf); -+ if ( argc > 0 ) { -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available); -+ for (i=0; i < argc; i++) { -+ pkg_name = malloc(strlen(argv[i])+2); -+ strcpy(pkg_name,argv[i]); -+ for (a=0; a < available->len; a++) { -+ pkg = available->pkgs[a]; -+ if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) { -+ continue; -+ } -+ if (conf->restrict_to_default_dest) { -+ pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash, -+ pkg->name, -+ conf->default_dest); -+ } else { -+ pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name ); -+ } -+ -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_ERROR, "Package %s is not installed.\n", pkg->name); -+ continue; -+ } -+ if (pkg->state_status == SS_NOT_INSTALLED) { // Added the control, so every already removed package could be skipped -+ ipkg_message(conf, IPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name); -+ continue; -+ } -+ ipkg_remove_pkg(conf, pkg_to_remove,0); -+ done = 1; -+ } -+ free (pkg_name); -+ } -+ pkg_vec_free(available); -+ } else { -+ pkg_vec_t *installed_pkgs = pkg_vec_alloc(); -+ int i; -+ int flagged_pkg_count = 0; -+ int removed; -+ -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, installed_pkgs); -+ -+ for (i = 0; i < installed_pkgs->len; i++) { -+ pkg_t *pkg = installed_pkgs->pkgs[i]; -+ if (pkg->state_flag & SF_USER) { -+ flagged_pkg_count++; -+ } else { -+ if (!pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) -+ ipkg_message(conf, IPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name); -+ } -+ } -+ if (!flagged_pkg_count) { -+ ipkg_message(conf, IPKG_NOTICE, "No packages flagged as installed by user, \n" -+ "so refusing to uninstall unflagged non-leaf packages\n"); -+ return 0; -+ } -+ -+ /* find packages not flagged SF_USER (i.e., installed to -+ * satisfy a dependence) and not having any dependents, and -+ * remove them */ -+ do { -+ removed = 0; -+ for (i = 0; i < installed_pkgs->len; i++) { -+ pkg_t *pkg = installed_pkgs->pkgs[i]; -+ if (!(pkg->state_flag & SF_USER) -+ && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) { -+ removed++; -+ ipkg_message(conf, IPKG_NOTICE, "Removing non-user leaf package %s\n"); -+ ipkg_remove_pkg(conf, pkg,0); -+ done = 1; -+ } -+ } -+ } while (removed); -+ pkg_vec_free(installed_pkgs); -+ } -+ -+ if ( done == 0 ) -+ ipkg_message(conf, IPKG_NOTICE, "No packages removed.\n"); -+ -+ write_status_files_if_changed(conf); -+ return 0; -+} -+ -+static int ipkg_purge_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ pkg_t *pkg; -+ -+ global_conf = conf; -+ signal(SIGINT, sigint_handler); -+ -+ pkg_info_preinstall_check(conf); -+ -+ for (i=0; i < argc; i++) { -+ if (conf->restrict_to_default_dest) { -+ pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash, -+ argv[i], -+ conf->default_dest); -+ } else { -+ pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]); -+ } -+ -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Package %s is not installed.\n", argv[i]); -+ continue; -+ } -+ ipkg_purge_pkg(conf, pkg); -+ } -+ -+ write_status_files_if_changed(conf); -+ return 0; -+} -+ -+static int ipkg_flag_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ pkg_t *pkg; -+ const char *flags = argv[0]; -+ -+ global_conf = conf; -+ signal(SIGINT, sigint_handler); -+ -+ for (i=1; i < argc; i++) { -+ if (conf->restrict_to_default_dest) { -+ pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash, -+ argv[i], -+ conf->default_dest); -+ } else { -+ pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]); -+ } -+ -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Package %s is not installed.\n", argv[i]); -+ continue; -+ } -+ if (( strcmp(flags,"hold")==0)||( strcmp(flags,"noprune")==0)|| -+ ( strcmp(flags,"user")==0)||( strcmp(flags,"ok")==0)) { -+ pkg->state_flag = pkg_state_flag_from_str(flags); -+ } -+/* pb_ asked this feature 03292004 */ -+/* Actually I will use only this two, but this is an open for various status */ -+ if (( strcmp(flags,"installed")==0)||( strcmp(flags,"unpacked")==0)){ -+ pkg->state_status = pkg_state_status_from_str(flags); -+ } -+ ipkg_state_changed++; -+ ipkg_message(conf, IPKG_NOTICE, -+ "Setting flags for package %s to %s\n", -+ pkg->name, flags); -+ } -+ -+ write_status_files_if_changed(conf); -+ return 0; -+} -+ -+static int ipkg_files_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ pkg_t *pkg; -+ str_list_t *installed_files; -+ str_list_elt_t *iter; -+ char *pkg_version; -+ size_t buff_len = 8192; -+ size_t used_len; -+ char *buff ; -+ -+ buff = (char *)malloc(buff_len); -+ if ( buff == NULL ) { -+ fprintf( stderr,"%s: Unable to allocate memory \n",__FUNCTION__); -+ return ENOMEM; -+ } -+ -+ if (argc < 1) { -+ return EINVAL; -+ } -+ -+ pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, -+ argv[0]); -+ if (pkg == NULL) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Package %s not installed.\n", argv[0]); -+ return 0; -+ } -+ -+ installed_files = pkg_get_installed_files(pkg); -+ pkg_version = pkg_version_str_alloc(pkg); -+ -+#ifndef IPKG_LIB -+ printf("Package %s (%s) is installed on %s and has the following files:\n", -+ pkg->name, pkg_version, pkg->dest->name); -+ for (iter = installed_files->head; iter; iter = iter->next) { -+ puts(iter->data); -+ } -+#else -+ if (buff) { -+ try_again: -+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n", -+ pkg->name, pkg_version, pkg->dest->name) + 1; -+ if (used_len > buff_len) { -+ buff_len *= 2; -+ buff = realloc (buff, buff_len); -+ goto try_again; -+ } -+ for (iter = installed_files->head; iter; iter = iter->next) { -+ used_len += strlen (iter->data) + 1; -+ while (buff_len <= used_len) { -+ buff_len *= 2; -+ buff = realloc (buff, buff_len); -+ } -+ strncat(buff, iter->data, buff_len); -+ strncat(buff, "\n", buff_len); -+ } -+ if (ipkg_cb_list) ipkg_cb_list(pkg->name, -+ buff, -+ pkg_version_str_alloc(pkg), -+ pkg->state_status, -+ p_userdata); -+ free(buff); -+ } -+#endif -+ -+ free(pkg_version); -+ pkg_free_installed_files(pkg); -+ -+ return 0; -+} -+ -+static int ipkg_depends_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ -+ if (argc > 0) { -+ pkg_vec_t *available_pkgs = pkg_vec_alloc(); -+ const char *rel_str = "depends on"; -+ int i; -+ -+ pkg_info_preinstall_check(conf); -+ -+ if (conf->query_all) -+ pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs); -+ else -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs); -+ for (i = 0; i < argc; i++) { -+ const char *target = argv[i]; -+ int j; -+ -+ ipkg_message(conf, IPKG_ERROR, "target=%s\n", target); -+ -+ for (j = 0; j < available_pkgs->len; j++) { -+ pkg_t *pkg = available_pkgs->pkgs[j]; -+ if (fnmatch(target, pkg->name, 0) == 0) { -+ int k; -+ int count = pkg->depends_count + pkg->pre_depends_count; -+ ipkg_message(conf, IPKG_ERROR, "What %s (arch=%s) %s\n", -+ target, pkg->architecture, rel_str); -+ for (k = 0; k < count; k++) { -+ compound_depend_t *cdepend = &pkg->depends[k]; -+ int l; -+ for (l = 0; l < cdepend->possibility_count; l++) { -+ depend_t *possibility = cdepend->possibilities[l]; -+ ipkg_message(conf, IPKG_ERROR, " %s", possibility->pkg->name); -+ if (conf->verbosity > 0) { -+ // char *ver = abstract_pkg_version_str_alloc(possibility->pkg); -+ ipkg_message(conf, IPKG_NOTICE, " %s", possibility->version); -+ if (possibility->version) { -+ char *typestr = NULL; -+ switch (possibility->constraint) { -+ case NONE: typestr = "none"; break; -+ case EARLIER: typestr = "<"; break; -+ case EARLIER_EQUAL: typestr = "<="; break; -+ case EQUAL: typestr = "="; break; -+ case LATER_EQUAL: typestr = ">="; break; -+ case LATER: typestr = ">"; break; -+ } -+ ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version); -+ } -+ // free(ver); -+ } -+ ipkg_message(conf, IPKG_ERROR, "\n"); -+ } -+ } -+ } -+ } -+ } -+ pkg_vec_free(available_pkgs); -+ } -+ return 0; -+} -+ -+enum what_field_type { -+ WHATDEPENDS, -+ WHATCONFLICTS, -+ WHATPROVIDES, -+ WHATREPLACES, -+ WHATRECOMMENDS, -+ WHATSUGGESTS -+}; -+ -+static int ipkg_what_depends_conflicts_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv) -+{ -+ -+ if (argc > 0) { -+ pkg_vec_t *available_pkgs = pkg_vec_alloc(); -+ const char *rel_str = NULL; -+ int i; -+ int changed; -+ -+ switch (what_field_type) { -+ case WHATDEPENDS: rel_str = "depends on"; break; -+ case WHATCONFLICTS: rel_str = "conflicts with"; break; -+ case WHATSUGGESTS: rel_str = "suggests"; break; -+ case WHATRECOMMENDS: rel_str = "recommends"; break; -+ case WHATPROVIDES: rel_str = "provides"; break; -+ case WHATREPLACES: rel_str = "replaces"; break; -+ } -+ -+ if (conf->query_all) -+ pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs); -+ else -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs); -+ -+ /* mark the root set */ -+ pkg_vec_clear_marks(available_pkgs); -+ ipkg_message(conf, IPKG_NOTICE, "Root set:\n"); -+ for (i = 0; i < argc; i++) { -+ const char *dependee_pattern = argv[i]; -+ pkg_vec_mark_if_matches(available_pkgs, dependee_pattern); -+ } -+ for (i = 0; i < available_pkgs->len; i++) { -+ pkg_t *pkg = available_pkgs->pkgs[i]; -+ if (pkg->state_flag & SF_MARKED) { -+ /* mark the parent (abstract) package */ -+ pkg_mark_provides(pkg); -+ ipkg_message(conf, IPKG_NOTICE, " %s\n", pkg->name); -+ } -+ } -+ -+ ipkg_message(conf, IPKG_NOTICE, "What %s root set\n", rel_str); -+ do { -+ int j; -+ changed = 0; -+ -+ for (j = 0; j < available_pkgs->len; j++) { -+ pkg_t *pkg = available_pkgs->pkgs[j]; -+ int k; -+ int count = ((what_field_type == WHATCONFLICTS) -+ ? pkg->conflicts_count -+ : pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count); -+ /* skip this package if it is already marked */ -+ if (pkg->parent->state_flag & SF_MARKED) { -+ continue; -+ } -+ for (k = 0; k < count; k++) { -+ compound_depend_t *cdepend = -+ (what_field_type == WHATCONFLICTS) ? &pkg->conflicts[k] : &pkg->depends[k]; -+ int l; -+ for (l = 0; l < cdepend->possibility_count; l++) { -+ depend_t *possibility = cdepend->possibilities[l]; -+ if (possibility->pkg->state_flag & SF_MARKED) { -+ /* mark the depending package so we won't visit it again */ -+ pkg->state_flag |= SF_MARKED; -+ pkg_mark_provides(pkg); -+ changed++; -+ -+ ipkg_message(conf, IPKG_NOTICE, " %s", pkg->name); -+ if (conf->verbosity > 0) { -+ char *ver = pkg_version_str_alloc(pkg); -+ ipkg_message(conf, IPKG_NOTICE, " %s", ver); -+ ipkg_message(conf, IPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name); -+ if (possibility->version) { -+ char *typestr = NULL; -+ switch (possibility->constraint) { -+ case NONE: typestr = "none"; break; -+ case EARLIER: typestr = "<"; break; -+ case EARLIER_EQUAL: typestr = "<="; break; -+ case EQUAL: typestr = "="; break; -+ case LATER_EQUAL: typestr = ">="; break; -+ case LATER: typestr = ">"; break; -+ } -+ ipkg_message(conf, IPKG_NOTICE, " (%s %s)", typestr, possibility->version); -+ } -+ free(ver); -+ if (!pkg_dependence_satisfiable(conf, possibility)) -+ ipkg_message(conf, IPKG_NOTICE, " unsatisfiable"); -+ } -+ ipkg_message(conf, IPKG_NOTICE, "\n"); -+ goto next_package; -+ } -+ } -+ } -+ next_package: -+ ; -+ } -+ } while (changed && recursive); -+ pkg_vec_free(available_pkgs); -+ } -+ -+ return 0; -+} -+ -+int pkg_mark_provides(pkg_t *pkg) -+{ -+ int provides_count = pkg->provides_count; -+ abstract_pkg_t **provides = pkg->provides; -+ int i; -+ pkg->parent->state_flag |= SF_MARKED; -+ for (i = 0; i < provides_count; i++) { -+ provides[i]->state_flag |= SF_MARKED; -+ } -+ return 0; -+} -+ -+static int ipkg_whatdepends_recursively_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv); -+} -+static int ipkg_whatdepends_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv); -+} -+ -+static int ipkg_whatsuggests_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv); -+} -+ -+static int ipkg_whatrecommends_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv); -+} -+ -+static int ipkg_whatconflicts_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv); -+} -+ -+static int ipkg_what_provides_replaces_cmd(ipkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv) -+{ -+ -+ if (argc > 0) { -+ pkg_vec_t *available_pkgs = pkg_vec_alloc(); -+ const char *rel_str = (what_field_type == WHATPROVIDES ? "provides" : "replaces"); -+ int i; -+ -+ pkg_info_preinstall_check(conf); -+ -+ if (conf->query_all) -+ pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs); -+ else -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs); -+ for (i = 0; i < argc; i++) { -+ const char *target = argv[i]; -+ int j; -+ -+ ipkg_message(conf, IPKG_ERROR, "What %s %s\n", -+ rel_str, target); -+ for (j = 0; j < available_pkgs->len; j++) { -+ pkg_t *pkg = available_pkgs->pkgs[j]; -+ int k; -+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count; -+ for (k = 0; k < count; k++) { -+ abstract_pkg_t *apkg = -+ ((what_field_type == WHATPROVIDES) -+ ? pkg->provides[k] -+ : pkg->replaces[k]); -+ if (fnmatch(target, apkg->name, 0) == 0) { -+ ipkg_message(conf, IPKG_ERROR, " %s", pkg->name); -+ if (strcmp(target, apkg->name) != 0) -+ ipkg_message(conf, IPKG_ERROR, "\t%s %s\n", rel_str, apkg->name); -+ ipkg_message(conf, IPKG_ERROR, "\n"); -+ } -+ } -+ } -+ } -+ pkg_vec_free(available_pkgs); -+ } -+ return 0; -+} -+ -+static int ipkg_whatprovides_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_provides_replaces_cmd(conf, WHATPROVIDES, argc, argv); -+} -+ -+static int ipkg_whatreplaces_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ return ipkg_what_provides_replaces_cmd(conf, WHATREPLACES, argc, argv); -+} -+ -+static int ipkg_search_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ int i; -+ -+ pkg_vec_t *installed; -+ pkg_t *pkg; -+ str_list_t *installed_files; -+ str_list_elt_t *iter; -+ char *installed_file; -+ -+ if (argc < 1) { -+ return EINVAL; -+ } -+ -+ installed = pkg_vec_alloc(); -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, installed); -+ -+ for (i=0; i < installed->len; i++) { -+ pkg = installed->pkgs[i]; -+ -+ installed_files = pkg_get_installed_files(pkg); -+ -+ for (iter = installed_files->head; iter; iter = iter->next) { -+ installed_file = iter->data; -+ if (fnmatch(argv[0], installed_file, 0)==0) { -+#ifndef IPKG_LIB -+ printf("%s: %s\n", pkg->name, installed_file); -+#else -+ if (ipkg_cb_list) ipkg_cb_list(pkg->name, -+ installed_file, -+ pkg_version_str_alloc(pkg), -+ pkg->state_status, p_userdata); -+#endif -+ } -+ } -+ -+ pkg_free_installed_files(pkg); -+ } -+ -+ /* XXX: CLEANUP: It's not obvious from the name of -+ pkg_hash_fetch_all_installed that we need to call -+ pkg_vec_free to avoid a memory leak. */ -+ pkg_vec_free(installed); -+ -+ return 0; -+} -+ -+static int ipkg_compare_versions_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ if (argc == 3) { -+ /* this is a bit gross */ -+ struct pkg p1, p2; -+ parseVersion(&p1, argv[0]); -+ parseVersion(&p2, argv[2]); -+ return pkg_version_satisfied(&p1, &p2, argv[1]); -+ } else { -+ ipkg_message(conf, IPKG_ERROR, -+ "ipkg compare_versions <v1> <op> <v2>\n" -+ "<op> is one of <= >= << >> =\n"); -+ return -1; -+ } -+} -+ -+#ifndef HOST_CPU_STR -+#define HOST_CPU_STR__(X) #X -+#define HOST_CPU_STR_(X) HOST_CPU_STR__(X) -+#define HOST_CPU_STR HOST_CPU_STR_(HOST_CPU_FOO) -+#endif -+ -+static int ipkg_print_architecture_cmd(ipkg_conf_t *conf, int argc, char **argv) -+{ -+ nv_pair_list_elt_t *l; -+ -+ l = conf->arch_list.head; -+ while (l) { -+ nv_pair_t *nv = l->data; -+ printf("arch %s %s\n", nv->name, nv->value); -+ l = l->next; -+ } -+ return 0; -+} -+ -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_cmd.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,46 @@ -+/* ipkg_cmd.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_CMD_H -+#define IPKG_CMD_H -+ -+typedef int (*ipkg_cmd_fun_t)(ipkg_conf_t *conf, int argc, const char **argv); -+ -+struct ipkg_cmd -+{ -+ char *name; -+ int requires_args; -+ ipkg_cmd_fun_t fun; -+}; -+typedef struct ipkg_cmd ipkg_cmd_t; -+ -+ipkg_cmd_t *ipkg_cmd_find(const char *name); -+#ifdef IPKG_LIB -+int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, -+ const char **argv, void *userdata); -+#else -+int ipkg_cmd_exec(ipkg_cmd_t *cmd, ipkg_conf_t *conf, int argc, const char **argv); -+#endif -+int ipkg_multiple_files_scan (ipkg_conf_t *conf, int argc, char *argv[]); -+/* install any packges with state_want == SW_INSTALL */ -+int ipkg_install_wanted_packages(ipkg_conf_t *conf); -+/* ensure that all dependences are satisfied */ -+int ipkg_configure_packages(ipkg_conf_t *conf, char *pkg_name); -+ -+int pkg_mark_provides(pkg_t *pkg); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_conf.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,711 @@ -+/* ipkg_conf.c - 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. -+*/ -+ -+#include <glob.h> -+ -+#include "ipkg.h" -+#include "ipkg_conf.h" -+ -+#include "xregex.h" -+#include "sprintf_alloc.h" -+#include "ipkg_conf.h" -+#include "ipkg_message.h" -+#include "file_util.h" -+#include "str_util.h" -+#include "xsystem.h" -+ -+ -+ipkg_conf_t *global_conf; -+ -+static int ipkg_conf_parse_file(ipkg_conf_t *conf, const char *filename, -+ pkg_src_list_t *pkg_src_list, -+ nv_pair_list_t *tmp_dest_nv_pair_list, -+ char **tmp_lists_dir); -+static int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options); -+static int ipkg_conf_set_option(const ipkg_option_t *options, -+ const char *name, const char *value); -+static int ipkg_conf_set_default_dest(ipkg_conf_t *conf, -+ const char *default_dest_name); -+static int set_and_load_pkg_src_list(ipkg_conf_t *conf, -+ pkg_src_list_t *nv_pair_list); -+static int set_and_load_pkg_dest_list(ipkg_conf_t *conf, -+ nv_pair_list_t *nv_pair_list, char * lists_dir); -+ -+int ipkg_init_options_array(const ipkg_conf_t *conf, ipkg_option_t **options) -+{ -+ ipkg_option_t tmp[] = { -+ { "force_defaults", IPKG_OPT_TYPE_BOOL, &conf->force_defaults }, -+ { "force_depends", IPKG_OPT_TYPE_BOOL, &conf->force_depends }, -+ { "force_overwrite", IPKG_OPT_TYPE_BOOL, &conf->force_overwrite }, -+ { "force_downgrade", IPKG_OPT_TYPE_BOOL, &conf->force_downgrade }, -+ { "force_reinstall", IPKG_OPT_TYPE_BOOL, &conf->force_reinstall }, -+ { "force_space", IPKG_OPT_TYPE_BOOL, &conf->force_space }, -+ { "ftp_proxy", IPKG_OPT_TYPE_STRING, &conf->ftp_proxy }, -+ { "http_proxy", IPKG_OPT_TYPE_STRING, &conf->http_proxy }, -+ { "multiple_providers", IPKG_OPT_TYPE_BOOL, &conf->multiple_providers }, -+ { "no_proxy", IPKG_OPT_TYPE_STRING, &conf->no_proxy }, -+ { "test", IPKG_OPT_TYPE_INT, &conf->noaction }, -+ { "noaction", IPKG_OPT_TYPE_INT, &conf->noaction }, -+ { "nodeps", IPKG_OPT_TYPE_BOOL, &conf->nodeps }, -+ { "offline_root", IPKG_OPT_TYPE_STRING, &conf->offline_root }, -+ { "offline_root_post_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_post_script_cmd }, -+ { "offline_root_pre_script_cmd", IPKG_OPT_TYPE_STRING, &conf->offline_root_pre_script_cmd }, -+ { "proxy_passwd", IPKG_OPT_TYPE_STRING, &conf->proxy_passwd }, -+ { "proxy_user", IPKG_OPT_TYPE_STRING, &conf->proxy_user }, -+ { "query-all", IPKG_OPT_TYPE_BOOL, &conf->query_all }, -+ { "verbose-wget", IPKG_OPT_TYPE_BOOL, &conf->verbose_wget }, -+ { "verbosity", IPKG_OPT_TYPE_BOOL, &conf->verbosity }, -+ { NULL } -+ }; -+ -+ *options = (ipkg_option_t *)malloc(sizeof(tmp)); -+ if ( options == NULL ){ -+ fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__); -+ return -1; -+ } -+ -+ memcpy(*options, tmp, sizeof(tmp)); -+ return 0; -+}; -+ -+static void ipkg_conf_override_string(char **conf_str, char *arg_str) -+{ -+ if (arg_str) { -+ if (*conf_str) { -+ free(*conf_str); -+ } -+ *conf_str = strdup(arg_str); -+ } -+} -+ -+static void ipkg_conf_free_string(char **conf_str) -+{ -+ if (*conf_str) { -+ free(*conf_str); -+ *conf_str = NULL; -+ } -+} -+ -+int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args) -+{ -+ int err; -+ char *tmp_dir_base; -+ nv_pair_list_t tmp_dest_nv_pair_list; -+ char * lists_dir =NULL; -+ glob_t globbuf; -+ char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf"; -+ char *pending_dir =NULL; -+ -+ memset(conf, 0, sizeof(ipkg_conf_t)); -+ -+ pkg_src_list_init(&conf->pkg_src_list); -+ -+ nv_pair_list_init(&tmp_dest_nv_pair_list); -+ pkg_dest_list_init(&conf->pkg_dest_list); -+ -+ nv_pair_list_init(&conf->arch_list); -+ -+ conf->restrict_to_default_dest = 0; -+ conf->default_dest = NULL; -+ -+ -+ if (args->tmp_dir) -+ tmp_dir_base = args->tmp_dir; -+ else -+ tmp_dir_base = getenv("TMPDIR"); -+ sprintf_alloc(&conf->tmp_dir, "%s/%s", -+ tmp_dir_base ? tmp_dir_base : IPKG_CONF_DEFAULT_TMP_DIR_BASE, -+ IPKG_CONF_TMP_DIR_SUFFIX); -+ conf->tmp_dir = mkdtemp(conf->tmp_dir); -+ if (conf->tmp_dir == NULL) { -+ fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n", -+ __FUNCTION__, conf->tmp_dir, strerror(errno)); -+ return errno; -+ } -+ -+ conf->force_depends = 0; -+ conf->force_defaults = 0; -+ conf->force_overwrite = 0; -+ conf->force_downgrade = 0; -+ conf->force_reinstall = 0; -+ conf->force_space = 0; -+ conf->force_removal_of_essential_packages = 0; -+ conf->force_removal_of_dependent_packages = 0; -+ conf->nodeps = 0; -+ conf->verbose_wget = 0; -+ conf->offline_root = NULL; -+ conf->offline_root_pre_script_cmd = NULL; -+ conf->offline_root_post_script_cmd = NULL; -+ conf->multiple_providers = 0; -+ conf->verbosity = 1; -+ conf->noaction = 0; -+ -+ conf->http_proxy = NULL; -+ conf->ftp_proxy = NULL; -+ conf->no_proxy = NULL; -+ conf->proxy_user = NULL; -+ conf->proxy_passwd = NULL; -+ -+ pkg_hash_init("pkg-hash", &conf->pkg_hash, IPKG_CONF_DEFAULT_HASH_LEN); -+ hash_table_init("file-hash", &conf->file_hash, IPKG_CONF_DEFAULT_HASH_LEN); -+ hash_table_init("obs-file-hash", &conf->obs_file_hash, IPKG_CONF_DEFAULT_HASH_LEN); -+ lists_dir=(char *)malloc(1); -+ lists_dir[0]='\0'; -+ if (args->conf_file) { -+ struct stat stat_buf; -+ err = stat(args->conf_file, &stat_buf); -+ if (err == 0) -+ if (ipkg_conf_parse_file(conf, args->conf_file, -+ &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) { -+ /* Memory leakage from ipkg_conf_parse-file */ -+ return -1; -+ } -+ -+ } -+ -+ /* if (!lists_dir ){*/ -+ if (strlen(lists_dir)<=1 ){ -+ lists_dir = realloc(lists_dir,strlen(IPKG_CONF_LISTS_DIR)+2); -+ sprintf (lists_dir,"%s",IPKG_CONF_LISTS_DIR); -+ } -+ -+ if (args->offline_root) { -+ char *tmp = malloc(strlen(lists_dir) + strlen(args->offline_root) + 1); -+ sprintf_alloc(&tmp, "%s/%s",args->offline_root,lists_dir); -+ free(lists_dir); -+ lists_dir = tmp; -+ } -+ -+ pending_dir = malloc(strlen(lists_dir)+strlen("/pending")+5); -+ snprintf(pending_dir,strlen(lists_dir)+strlen("/pending") ,"%s%s",lists_dir,"/pending"); -+ -+ conf->lists_dir = strdup(lists_dir); -+ conf->pending_dir = strdup(pending_dir); -+ -+ if (args->offline_root) -+ sprintf_alloc(&etc_ipkg_conf_pattern, "%s/etc/ipkg/*.conf", args->offline_root); -+ memset(&globbuf, 0, sizeof(globbuf)); -+ err = glob(etc_ipkg_conf_pattern, 0, NULL, &globbuf); -+ if (!err) { -+ int i; -+ for (i = 0; i < globbuf.gl_pathc; i++) { -+ if (globbuf.gl_pathv[i]) -+ if ( ipkg_conf_parse_file(conf, globbuf.gl_pathv[i], -+ &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) { -+ /* Memory leakage from ipkg_conf_parse-file */ -+ return -1; -+ } -+ } -+ } -+ globfree(&globbuf); -+ -+ /* if no architectures were defined, then default all, noarch, and host architecture */ -+ if (nv_pair_list_empty(&conf->arch_list)) { -+ nv_pair_list_append(&conf->arch_list, "all", "1"); -+ nv_pair_list_append(&conf->arch_list, "noarch", "1"); -+ nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10"); -+ } -+ -+ /* Even if there is no conf file, we'll need at least one dest. */ -+ if (tmp_dest_nv_pair_list.head == NULL) { -+ nv_pair_list_append(&tmp_dest_nv_pair_list, -+ IPKG_CONF_DEFAULT_DEST_NAME, -+ IPKG_CONF_DEFAULT_DEST_ROOT_DIR); -+ } -+ -+ /* After parsing the file, set options from command-line, (so that -+ command-line arguments take precedence) */ -+ /* XXX: CLEANUP: The interaction between args.c and ipkg_conf.c -+ really needs to be cleaned up. There is so much duplication -+ right now it is ridiculous. Maybe ipkg_conf_t should just save -+ a pointer to args_t (which could then not be freed), rather -+ than duplicating every field here? */ -+ if (args->force_depends) { -+ conf->force_depends = 1; -+ } -+ if (args->force_defaults) { -+ conf->force_defaults = 1; -+ } -+ if (args->force_overwrite) { -+ conf->force_overwrite = 1; -+ } -+ if (args->force_downgrade) { -+ conf->force_downgrade = 1; -+ } -+ if (args->force_reinstall) { -+ conf->force_reinstall = 1; -+ } -+ if (args->force_removal_of_dependent_packages) { -+ conf->force_removal_of_dependent_packages = 1; -+ } -+ if (args->force_removal_of_essential_packages) { -+ conf->force_removal_of_essential_packages = 1; -+ } -+ if (args->nodeps) { -+ conf->nodeps = 1; -+ } -+ if (args->noaction) { -+ conf->noaction = 1; -+ } -+ if (args->query_all) { -+ conf->query_all = 1; -+ } -+ if (args->verbose_wget) { -+ conf->verbose_wget = 1; -+ } -+ if (args->multiple_providers) { -+ conf->multiple_providers = 1; -+ } -+ if (args->verbosity != conf->verbosity) { -+ conf->verbosity = args->verbosity; -+ } -+ -+ ipkg_conf_override_string(&conf->offline_root, -+ args->offline_root); -+ ipkg_conf_override_string(&conf->offline_root_pre_script_cmd, -+ args->offline_root_pre_script_cmd); -+ ipkg_conf_override_string(&conf->offline_root_post_script_cmd, -+ args->offline_root_post_script_cmd); -+ -+/* Pigi: added a flag to disable the checking of structures if the command does not need to -+ read anything from there. -+*/ -+ if ( !(args->nocheckfordirorfile)){ -+ /* need to run load the source list before dest list -Jamey */ -+ if ( !(args->noreadfeedsfile)) -+ set_and_load_pkg_src_list(conf, &conf->pkg_src_list); -+ -+ /* Now that we have resolved conf->offline_root, we can commit to -+ the directory names for the dests and load in all the package -+ lists. */ -+ set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list,lists_dir); -+ -+ if (args->dest) { -+ err = ipkg_conf_set_default_dest(conf, args->dest); -+ if (err) { -+ return err; -+ } -+ } -+ } -+ nv_pair_list_deinit(&tmp_dest_nv_pair_list); -+ free(lists_dir); -+ free(pending_dir); -+ -+ return 0; -+} -+ -+void ipkg_conf_deinit(ipkg_conf_t *conf) -+{ -+#ifdef IPKG_DEBUG_NO_TMP_CLEANUP -+#error -+ fprintf(stderr, "%s: Not cleaning up %s since ipkg compiled " -+ "with IPKG_DEBUG_NO_TMP_CLEANUP\n", -+ __FUNCTION__, conf->tmp_dir); -+#else -+ int err; -+ -+ err = rmdir(conf->tmp_dir); -+ if (err) { -+ if (errno == ENOTEMPTY) { -+ char *cmd; -+ sprintf_alloc(&cmd, "rm -fr %s\n", conf->tmp_dir); -+ err = xsystem(cmd); -+ free(cmd); -+ } -+ if (err) -+ fprintf(stderr, "WARNING: Unable to remove temporary directory: %s: %s\n", conf->tmp_dir, strerror(errno)); -+ } -+#endif /* IPKG_DEBUG_NO_TMP_CLEANUP */ -+ -+ free(conf->tmp_dir); /*XXX*/ -+ -+ pkg_src_list_deinit(&conf->pkg_src_list); -+ pkg_dest_list_deinit(&conf->pkg_dest_list); -+ nv_pair_list_deinit(&conf->arch_list); -+ if (&conf->pkg_hash) -+ pkg_hash_deinit(&conf->pkg_hash); -+ if (&conf->file_hash) -+ hash_table_deinit(&conf->file_hash); -+ if (&conf->obs_file_hash) -+ hash_table_deinit(&conf->obs_file_hash); -+ -+ ipkg_conf_free_string(&conf->offline_root); -+ ipkg_conf_free_string(&conf->offline_root_pre_script_cmd); -+ ipkg_conf_free_string(&conf->offline_root_post_script_cmd); -+ -+ if (conf->verbosity > 1) { -+ int i; -+ hash_table_t *hashes[] = { -+ &conf->pkg_hash, -+ &conf->file_hash, -+ &conf->obs_file_hash }; -+ for (i = 0; i < 3; i++) { -+ hash_table_t *hash = hashes[i]; -+ int c = 0; -+ int n_conflicts = 0; -+ int j; -+ for (j = 0; j < hash->n_entries; j++) { -+ int len = 0; -+ hash_entry_t *e = &hash->entries[j]; -+ if (e->next) -+ n_conflicts++; -+ while (e && e->key) { -+ len++; -+ e = e->next; -+ } -+ if (len > c) -+ c = len; -+ } -+ ipkg_message(conf, IPKG_DEBUG, "hash_table[%s] n_buckets=%d n_elements=%d max_conflicts=%d n_conflicts=%d\n", -+ hash->name, hash->n_entries, hash->n_elements, c, n_conflicts); -+ hash_table_deinit(hash); -+ } -+ } -+} -+ -+static int ipkg_conf_set_default_dest(ipkg_conf_t *conf, -+ const char *default_dest_name) -+{ -+ pkg_dest_list_elt_t *iter; -+ pkg_dest_t *dest; -+ -+ for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) { -+ dest = iter->data; -+ if (strcmp(dest->name, default_dest_name) == 0) { -+ conf->default_dest = dest; -+ conf->restrict_to_default_dest = 1; -+ return 0; -+ } -+ } -+ -+ fprintf(stderr, "ERROR: Unknown dest name: `%s'\n", default_dest_name); -+ -+ return 1; -+} -+ -+static int set_and_load_pkg_src_list(ipkg_conf_t *conf, pkg_src_list_t *pkg_src_list) -+{ -+ pkg_src_list_elt_t *iter; -+ pkg_src_t *src; -+ char *list_file; -+ -+ for (iter = pkg_src_list->head; iter; iter = iter->next) { -+ src = iter->data; -+ if (src == NULL) { -+ continue; -+ } -+ -+ sprintf_alloc(&list_file, "%s/%s", -+ conf->restrict_to_default_dest ? conf->default_dest->lists_dir : conf->lists_dir, -+ src->name); -+ -+ if (file_exists(list_file)) { -+ pkg_hash_add_from_file(conf, list_file, src, NULL, 0); -+ } -+ free(list_file); -+ } -+ -+ return 0; -+} -+ -+static int set_and_load_pkg_dest_list(ipkg_conf_t *conf, nv_pair_list_t *nv_pair_list, char *lists_dir ) -+{ -+ nv_pair_list_elt_t *iter; -+ nv_pair_t *nv_pair; -+ pkg_dest_t *dest; -+ char *root_dir; -+ -+ for (iter = nv_pair_list->head; iter; iter = iter->next) { -+ nv_pair = iter->data; -+ -+ if (conf->offline_root) { -+ sprintf_alloc(&root_dir, "%s%s", conf->offline_root, nv_pair->value); -+ } else { -+ root_dir = strdup(nv_pair->value); -+ } -+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir); -+ free(root_dir); -+ if (dest == NULL) { -+ continue; -+ } -+ if (conf->default_dest == NULL) { -+ conf->default_dest = dest; -+ } -+ if (file_exists(dest->status_file_name)) { -+ pkg_hash_add_from_file(conf, dest->status_file_name, -+ NULL, dest, 1); -+ } -+ } -+ -+ return 0; -+} -+ -+static int ipkg_conf_parse_file(ipkg_conf_t *conf, const char *filename, -+ pkg_src_list_t *pkg_src_list, -+ nv_pair_list_t *tmp_dest_nv_pair_list, -+ char **lists_dir) -+{ -+ ipkg_option_t * options; -+ FILE *file = fopen(filename, "r"); -+ regex_t valid_line_re, comment_re; -+#define regmatch_size 12 -+ regmatch_t regmatch[regmatch_size]; -+ -+ if (ipkg_init_options_array(conf, &options)<0) -+ return ENOMEM; -+ -+ if (file == NULL) { -+ fprintf(stderr, "%s: failed to open %s: %s\n", -+ __FUNCTION__, filename, strerror(errno)); -+ free(options); -+ return errno; -+ } -+ ipkg_message(conf, IPKG_NOTICE, "loading conf file %s\n", filename); -+ -+ xregcomp(&comment_re, -+ "^[[:space:]]*(#.*|[[:space:]]*)$", -+ REG_EXTENDED); -+ xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED); -+ -+ while(1) { -+ int line_num = 0; -+ char *line; -+ char *type, *name, *value, *extra; -+ -+ line = file_read_line_alloc(file); -+ line_num++; -+ if (line == NULL) { -+ break; -+ } -+ -+ str_chomp(line); -+ -+ if (regexec(&comment_re, line, 0, 0, 0) == 0) { -+ goto NEXT_LINE; -+ } -+ -+ if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) { -+ str_chomp(line); -+ fprintf(stderr, "%s:%d: Ignoring invalid line: `%s'\n", -+ filename, line_num, line); -+ goto NEXT_LINE; -+ } -+ -+ /* This has to be so ugly to deal with optional quotation marks */ -+ if (regmatch[2].rm_so > 0) { -+ type = strndup(line + regmatch[2].rm_so, -+ regmatch[2].rm_eo - regmatch[2].rm_so); -+ } else { -+ type = strndup(line + regmatch[3].rm_so, -+ regmatch[3].rm_eo - regmatch[3].rm_so); -+ } -+ if (regmatch[5].rm_so > 0) { -+ name = strndup(line + regmatch[5].rm_so, -+ regmatch[5].rm_eo - regmatch[5].rm_so); -+ } else { -+ name = strndup(line + regmatch[6].rm_so, -+ regmatch[6].rm_eo - regmatch[6].rm_so); -+ } -+ if (regmatch[8].rm_so > 0) { -+ value = strndup(line + regmatch[8].rm_so, -+ regmatch[8].rm_eo - regmatch[8].rm_so); -+ } else { -+ value = strndup(line + regmatch[9].rm_so, -+ regmatch[9].rm_eo - regmatch[9].rm_so); -+ } -+ extra = NULL; -+ if (regmatch[11].rm_so > 0) { -+ extra = strndup (line + regmatch[11].rm_so, -+ regmatch[11].rm_eo - regmatch[11].rm_so); -+ } -+ -+ /* We use the tmp_dest_nv_pair_list below instead of -+ conf->pkg_dest_list because we might encounter an -+ offline_root option later and that would invalidate the -+ directories we would have computed in -+ pkg_dest_list_init. (We do a similar thing with -+ tmp_src_nv_pair_list for sake of symmetry.) */ -+ if (strcmp(type, "option") == 0) { -+ ipkg_conf_set_option(options, name, value); -+ } else if (strcmp(type, "src") == 0) { -+ if (!nv_pair_list_find(pkg_src_list, name)) { -+ pkg_src_list_append (pkg_src_list, name, value, extra, 0); -+ } else { -+ ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n", -+ name, value); -+ } -+ } else if (strcmp(type, "src/gz") == 0) { -+ if (!nv_pair_list_find(pkg_src_list, name)) { -+ pkg_src_list_append (pkg_src_list, name, value, extra, 1); -+ } else { -+ ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n", -+ name, value); -+ } -+ } else if (strcmp(type, "dest") == 0) { -+ nv_pair_list_append(tmp_dest_nv_pair_list, name, value); -+ } else if (strcmp(type, "lists_dir") == 0) { -+ *lists_dir = realloc(*lists_dir,strlen(value)+1); -+ if (*lists_dir == NULL) { -+ ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n"); -+ free(options); -+ return EINVAL; -+ } -+ sprintf (*lists_dir,"%s",value); -+ } else if (strcmp(type, "arch") == 0) { -+ ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value); -+ if (!value) { -+ ipkg_message(conf, IPKG_NOTICE, "defaulting architecture %s priority to 10\n", name); -+ value = strdup("10"); -+ } -+ nv_pair_list_append(&conf->arch_list, strdup(name), strdup(value)); -+ } else { -+ fprintf(stderr, "WARNING: Ignoring unknown configuration " -+ "parameter: %s %s %s\n", type, name, value); -+ free(options); -+ return EINVAL; -+ } -+ -+ free(type); -+ free(name); -+ free(value); -+ if (extra) -+ free (extra); -+ -+ NEXT_LINE: -+ free(line); -+ } -+ -+ free(options); -+ regfree(&comment_re); -+ regfree(&valid_line_re); -+ fclose(file); -+ -+ return 0; -+} -+ -+static int ipkg_conf_set_option(const ipkg_option_t *options, -+ const char *name, const char *value) -+{ -+ int i = 0; -+ while (options[i].name) { -+ if (strcmp(options[i].name, name) == 0) { -+ switch (options[i].type) { -+ case IPKG_OPT_TYPE_BOOL: -+ *((int *)options[i].value) = 1; -+ return 0; -+ case IPKG_OPT_TYPE_INT: -+ if (value) { -+ *((int *)options[i].value) = atoi(value); -+ return 0; -+ } else { -+ printf("%s: Option %s need an argument\n", -+ __FUNCTION__, name); -+ return EINVAL; -+ } -+ case IPKG_OPT_TYPE_STRING: -+ if (value) { -+ *((char **)options[i].value) = strdup(value); -+ return 0; -+ } else { -+ printf("%s: Option %s need an argument\n", -+ __FUNCTION__, name); -+ return EINVAL; -+ } -+ } -+ } -+ i++; -+ } -+ -+ fprintf(stderr, "%s: Unrecognized option: %s=%s\n", -+ __FUNCTION__, name, value); -+ return EINVAL; -+} -+ -+int ipkg_conf_write_status_files(ipkg_conf_t *conf) -+{ -+ pkg_dest_list_elt_t *iter; -+ pkg_dest_t *dest; -+ pkg_vec_t *all; -+ pkg_t *pkg; -+ register int i; -+ int err; -+ -+ if (conf->noaction) -+ return 0; -+ for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) { -+ dest = iter->data; -+ dest->status_file = fopen(dest->status_file_tmp_name, "w"); -+ if (dest->status_file == NULL) { -+ fprintf(stderr, "%s: Can't open status file: %s for writing: %s\n", -+ __FUNCTION__, dest->status_file_name, strerror(errno)); -+ } -+ } -+ -+ all = pkg_vec_alloc(); -+ pkg_hash_fetch_available(&conf->pkg_hash, all); -+ -+ for(i = 0; i < all->len; i++) { -+ pkg = all->pkgs[i]; -+ /* We don't need most uninstalled packages in the status file */ -+ if (pkg->state_status == SS_NOT_INSTALLED -+ && (pkg->state_want == SW_UNKNOWN -+ || pkg->state_want == SW_DEINSTALL -+ || pkg->state_want == SW_PURGE)) { -+ continue; -+ } -+ if (!pkg) { -+ fprintf(stderr, "Null package\n"); -+ } -+ if (pkg->dest == NULL) { -+ fprintf(stderr, "%s: ERROR: Can't write status for " -+ "package %s since it has a NULL dest\n", -+ __FUNCTION__, pkg->name); -+ continue; -+ } -+ if (pkg->dest->status_file) { -+ pkg_print_status(pkg, pkg->dest->status_file); -+ } -+ } -+ -+ pkg_vec_free(all); -+ -+ for (iter = conf->pkg_dest_list.head; iter; iter = iter->next) { -+ dest = iter->data; -+ if (dest->status_file) { -+ err = ferror(dest->status_file); -+ fclose(dest->status_file); -+ dest->status_file = NULL; -+ if (!err) { -+ file_move(dest->status_file_tmp_name, dest->status_file_name); -+ } else { -+ fprintf(stderr, "%s: ERROR: An error has occurred writing %s, " -+ "retaining old %s\n", __FUNCTION__, -+ dest->status_file_tmp_name, dest->status_file_name); -+ } -+ } -+ } -+ -+ return 0; -+} -+ -+ -+char *root_filename_alloc(ipkg_conf_t *conf, char *filename) -+{ -+ char *root_filename; -+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); -+ return root_filename; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_conf.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,107 @@ -+/* ipkg_conf.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_CONF_H -+#define IPKG_CONF_H -+ -+typedef struct ipkg_conf ipkg_conf_t; -+ -+#include "hash_table.h" -+#include "ipkg.h" -+#include "args.h" -+#include "pkg.h" -+#include "pkg_hash.h" -+#include "pkg_src_list.h" -+#include "pkg_dest_list.h" -+#include "nv_pair_list.h" -+ -+#define IPKG_CONF_DEFAULT_TMP_DIR_BASE "/tmp" -+#define IPKG_CONF_TMP_DIR_SUFFIX "ipkg-XXXXXX" -+#define IPKG_CONF_LISTS_DIR IPKG_STATE_DIR_PREFIX "/lists" -+#define IPKG_CONF_PENDING_DIR IPKG_STATE_DIR_PREFIX "/pending" -+ -+/* In case the config file defines no dest */ -+#define IPKG_CONF_DEFAULT_DEST_NAME "root" -+#define IPKG_CONF_DEFAULT_DEST_ROOT_DIR "/" -+ -+#define IPKG_CONF_DEFAULT_HASH_LEN 1024 -+ -+struct ipkg_conf -+{ -+ pkg_src_list_t pkg_src_list; -+ pkg_dest_list_t pkg_dest_list; -+ nv_pair_list_t arch_list; -+ -+ int restrict_to_default_dest; -+ pkg_dest_t *default_dest; -+ -+ char *tmp_dir; -+ const char *lists_dir; -+ const char *pending_dir; -+ -+ /* options */ -+ int force_depends; -+ int force_defaults; -+ int force_overwrite; -+ int force_downgrade; -+ int force_reinstall; -+ int force_space; -+ int force_removal_of_dependent_packages; -+ int force_removal_of_essential_packages; -+ int nodeps; /* do not follow dependences */ -+ int verbose_wget; -+ int multiple_providers; -+ char *offline_root; -+ char *offline_root_pre_script_cmd; -+ char *offline_root_post_script_cmd; -+ int query_all; -+ int verbosity; -+ int noaction; -+ -+ /* proxy options */ -+ char *http_proxy; -+ char *ftp_proxy; -+ char *no_proxy; -+ char *proxy_user; -+ char *proxy_passwd; -+ -+ hash_table_t pkg_hash; -+ hash_table_t file_hash; -+ hash_table_t obs_file_hash; -+}; -+ -+enum ipkg_option_type { -+ IPKG_OPT_TYPE_BOOL, -+ IPKG_OPT_TYPE_INT, -+ IPKG_OPT_TYPE_STRING -+}; -+typedef enum ipkg_option_type ipkg_option_type_t; -+ -+typedef struct ipkg_option ipkg_option_t; -+struct ipkg_option { -+ const char *name; -+ const ipkg_option_type_t type; -+ const void *value; -+}; -+ -+int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args); -+void ipkg_conf_deinit(ipkg_conf_t *conf); -+ -+int ipkg_conf_write_status_files(ipkg_conf_t *conf); -+char *root_filename_alloc(ipkg_conf_t *conf, char *filename); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_configure.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,40 @@ -+/* ipkg_configure.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "ipkg_configure.h" -+ -+int ipkg_configure(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int err; -+ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg actually does some conffile handling here, rather than at the -+ end of ipkg_install(). Do we care? */ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg actually includes a version number to this script call */ -+ err = pkg_run_script(conf, pkg, "postinst", "configure"); -+ if (err) { -+ printf("ERROR: %s.postinst returned %d\n", pkg->name, err); -+ return err; -+ } -+ -+ ipkg_state_changed++; -+ return 0; -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_configure.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,25 @@ -+/* ipkg_configure.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_CONFIGURE_H -+#define IPKG_CONFIGURE_H -+ -+#include "ipkg_conf.h" -+ -+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_download.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,195 @@ -+/* ipkg_download.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include "ipkg_download.h" -+#include "ipkg_message.h" -+ -+#include "sprintf_alloc.h" -+#include "xsystem.h" -+#include "file_util.h" -+#include "str_util.h" -+ -+int ipkg_download(ipkg_conf_t *conf, const char *src, const char *dest_file_name) -+{ -+ int err = 0; -+ -+ char *src_basec = strdup(src); -+ char *src_base = basename(src_basec); -+ char *tmp_file_location; -+ char *cmd; -+ -+ ipkg_message(conf,IPKG_NOTICE,"Downloading %s\n", src); -+ -+ fflush(stdout); -+ -+ if (str_starts_with(src, "file:")) { -+ int ret; -+ const char *file_src = src + 5; -+ ipkg_message(conf,IPKG_INFO,"Copying %s to %s...", file_src, dest_file_name); -+ ret = file_copy(src + 5, dest_file_name); -+ ipkg_message(conf,IPKG_INFO,"Done.\n"); -+ return ret; -+ } -+ -+ sprintf_alloc(&tmp_file_location, "%s/%s", conf->tmp_dir, src_base); -+ err = unlink(tmp_file_location); -+ if (err && errno != ENOENT) { -+ ipkg_message(conf,IPKG_ERROR, "%s: ERROR: failed to unlink %s: %s\n", -+ __FUNCTION__, tmp_file_location, strerror(errno)); -+ free(tmp_file_location); -+ return errno; -+ } -+ -+ if (conf->http_proxy) { -+ ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: http_proxy = %s\n", conf->http_proxy); -+ setenv("http_proxy", conf->http_proxy, 1); -+ } -+ if (conf->ftp_proxy) { -+ ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: ftp_proxy = %s\n", conf->ftp_proxy); -+ setenv("ftp_proxy", conf->ftp_proxy, 1); -+ } -+ if (conf->no_proxy) { -+ ipkg_message(conf,IPKG_DEBUG,"Setting environment variable: no_proxy = %s\n", conf->no_proxy); -+ setenv("no_proxy", conf->no_proxy, 1); -+ } -+ -+ /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ -+ sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s", -+ (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "", -+ conf->proxy_user ? "--proxy-user=" : "", -+ conf->proxy_user ? conf->proxy_user : "", -+ conf->proxy_passwd ? "--proxy-passwd=" : "", -+ conf->proxy_passwd ? conf->proxy_passwd : "", -+ conf->verbose_wget ? "" : "-q", -+ conf->tmp_dir, -+ src); -+ err = xsystem(cmd); -+ if (err) { -+ if (err != -1) { -+ ipkg_message(conf,IPKG_ERROR, "%s: ERROR: Command failed with return value %d: `%s'\n", -+ __FUNCTION__, err, cmd); -+ } -+ unlink(tmp_file_location); -+ free(tmp_file_location); -+ free(src_basec); -+ free(cmd); -+ return EINVAL; -+ } -+ free(cmd); -+ -+ err = file_move(tmp_file_location, dest_file_name); -+ -+ free(tmp_file_location); -+ free(src_basec); -+ -+ if (err) { -+ return err; -+ } -+ -+ return 0; -+} -+ -+int ipkg_download_pkg(ipkg_conf_t *conf, pkg_t *pkg, const char *dir) -+{ -+ int err; -+ char *url; -+ -+ if (pkg->src == NULL) { -+ ipkg_message(conf,IPKG_ERROR, "ERROR: Package %s (parent %s) is not available from any configured src.\n", -+ pkg->name, pkg->parent->name); -+ return -1; -+ } -+ -+ sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename); -+ -+ /* XXX: BUG: The pkg->filename might be something like -+ "../../foo.ipk". While this is correct, and exactly what we -+ want to use to construct url above, here we actually need to -+ use just the filename part, without any directory. */ -+ sprintf_alloc(&pkg->local_filename, "%s/%s", dir, pkg->filename); -+ -+ err = ipkg_download(conf, url, pkg->local_filename); -+ free(url); -+ -+ return err; -+} -+ -+/* -+ * Downloads file from url, installs in package database, return package name. -+ */ -+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep) -+{ -+ int err = 0; -+ pkg_t *pkg; -+ pkg = pkg_new(); -+ if (pkg == NULL) -+ return ENOMEM; -+ -+ if (str_starts_with(url, "http://") -+ || str_starts_with(url, "ftp://")) { -+ char *tmp_file; -+ char *file_basec = strdup(url); -+ char *file_base = basename(file_basec); -+ -+ sprintf_alloc(&tmp_file, "%s/%s", conf->tmp_dir, file_base); -+ err = ipkg_download(conf, url, tmp_file); -+ if (err) -+ return err; -+ -+ err = pkg_init_from_file(pkg, tmp_file); -+ if (err) -+ return err; -+ pkg->local_filename = strdup(tmp_file); -+ -+ free(tmp_file); -+ free(file_basec); -+ -+ } else if (strcmp(&url[strlen(url) - 4], IPKG_PKG_EXTENSION) == 0 -+ || strcmp(&url[strlen(url) - 4], DPKG_PKG_EXTENSION) == 0) { -+ -+ err = pkg_init_from_file(pkg, url); -+ if (err) -+ return err; -+ pkg->local_filename = strdup(url); -+ ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename); -+ pkg->provided_by_hand = 1; -+ -+ } else { -+ pkg_deinit(pkg); -+ free(pkg); -+ return 0; -+ } -+ -+ if (!pkg->architecture) { -+ ipkg_message(conf, IPKG_ERROR, "Package %s has no Architecture defined.\n", pkg->name); -+ return -EINVAL; -+ } -+ -+ pkg->dest = conf->default_dest; -+ pkg->state_want = SW_INSTALL; -+ pkg->state_flag |= SF_PREFER; -+ pkg = hash_insert_pkg(&conf->pkg_hash, pkg, 1,conf); -+ if ( pkg == NULL ){ -+ fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); -+ return 0; -+ } -+ if (namep) { -+ *namep = strdup(pkg->name); -+ } -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_download.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,30 @@ -+/* ipkg_download.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_DOWNLOAD_H -+#define IPKG_DOWNLOAD_H -+ -+#include "ipkg_conf.h" -+ -+int ipkg_download(ipkg_conf_t *conf, const char *src, const char *dest_file_name); -+int ipkg_download_pkg(ipkg_conf_t *conf, pkg_t *pkg, const char *dir); -+/* -+ * Downloads file from url, installs in package database, return package name. -+ */ -+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_includes.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_includes.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_includes.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,79 @@ -+#ifndef IPKG_INCLUDES_H -+#define IPKG_INCLUDES_H -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <regex.h> header file. */ -+#define HAVE_REGEX_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ -+#define HAVE_SYS_WAIT_H 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+ -+#include <stdio.h> -+ -+#if STDC_HEADERS -+# include <stdlib.h> -+# include <stdarg.h> -+# include <stddef.h> -+# include <ctype.h> -+# include <errno.h> -+#else -+# if HAVE_STDLIB_H -+# include <stdlib.h> -+# endif -+#endif -+ -+#if HAVE_REGEX_H -+# include <regex.h> -+#endif -+ -+#if HAVE_STRING_H -+# if !STDC_HEADERS && HAVE_MEMORY_H -+# include <memory.h> -+# endif -+/* XXX: What's the right way to pick up GNU's strndup declaration? */ -+# if __GNUC__ -+# define __USE_GNU 1 -+# endif -+# include <string.h> -+# undef __USE_GNU -+#endif -+ -+#if HAVE_STRINGS_H -+# include <strings.h> -+#endif -+ -+#if HAVE_SYS_STAT_H -+# include <sys/stat.h> -+#endif -+ -+#if HAVE_SYS_WAIT_H -+# include <sys/wait.h> -+#endif -+ -+#if HAVE_UNISTD_H -+# include <sys/types.h> -+# include <unistd.h> -+#endif -+ -+#endif /* IPKG_INCLUDES_H */ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_install.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.c 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,1942 @@ -+/* ipkg_install.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <dirent.h> -+#include <glob.h> -+#include <time.h> -+#include <signal.h> -+typedef void (*sighandler_t)(int); -+ -+#include "pkg.h" -+#include "pkg_hash.h" -+#include "pkg_extract.h" -+ -+#include "ipkg_install.h" -+#include "ipkg_configure.h" -+#include "ipkg_download.h" -+#include "ipkg_remove.h" -+ -+#include "ipkg_utils.h" -+#include "ipkg_message.h" -+ -+#include "sprintf_alloc.h" -+#include "file_util.h" -+#include "str_util.h" -+#include "xsystem.h" -+#include "user.h" -+ -+int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg); -+static int verify_pkg_installable(ipkg_conf_t *conf, pkg_t *pkg); -+static int unpack_pkg_control_files(ipkg_conf_t *conf, pkg_t *pkg); -+ -+static int prerm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int prerm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int prerm_deconfigure_conflictors(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors); -+static int prerm_deconfigure_conflictors_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors); -+static int preinst_configure(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int preinst_configure_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int check_data_file_clashes(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int check_data_file_clashes_change(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int check_data_file_clashes_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int backup_modified_conffiles(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int backup_modified_conffiles_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int postrm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int postrm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+ -+static int remove_obsolesced_files(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int install_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg); -+static int remove_disappeared(ipkg_conf_t *conf, pkg_t *pkg); -+static int install_data_files(ipkg_conf_t *conf, pkg_t *pkg); -+static int resolve_conffiles(ipkg_conf_t *conf, pkg_t *pkg); -+ -+static int cleanup_temporary_files(ipkg_conf_t *conf, pkg_t *pkg); -+ -+static int user_prefers_old_conffile(const char *file, const char *backup); -+ -+static char *backup_filename_alloc(const char *file_name); -+static int backup_make_backup(ipkg_conf_t *conf, const char *file_name); -+static int backup_exists_for(const char *file_name); -+static int backup_remove(const char *file_name); -+ -+ -+int ipkg_install_from_file(ipkg_conf_t *conf, const char *filename) -+{ -+ int err, cmp; -+ pkg_t *pkg, *old; -+ char *old_version, *new_version; -+ -+ pkg = pkg_new(); -+ if (pkg == NULL) { -+ return ENOMEM; -+ } -+ -+ err = pkg_init_from_file(pkg, filename); -+ if (err) { -+ return err; -+ } -+ -+ if (!pkg->architecture) { -+ ipkg_message(conf, IPKG_ERROR, "Package %s has no Architecture defined.\n", pkg->name); -+ return -EINVAL; -+ } -+ -+ /* XXX: CLEANUP: hash_insert_pkg has a nasty side effect of possibly -+ freeing the pkg that we pass in. It might be nice to clean this up -+ if possible. */ -+ pkg = hash_insert_pkg(&conf->pkg_hash, pkg, 1,conf); -+ old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name); -+ -+ pkg->local_filename = strdup(filename); -+ -+ if (old) { -+ old_version = pkg_version_str_alloc(old); -+ new_version = pkg_version_str_alloc(pkg); -+ -+ cmp = pkg_compare_versions(old, pkg); -+ if ( (conf->force_downgrade==1) && (cmp > 0) ){ /* We've been asked to allow downgrade and version is precedent */ -+ cmp = -1 ; /* then we force ipkg to downgrade */ -+ /* We need to use a value < 0 because in the 0 case we are asking to */ -+ /* reinstall, and some check could fail asking the "force-reinstall" option */ -+ } -+ if (cmp > 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not downgrading package %s on %s from %s to %s.\n", -+ old->name, old->dest->name, old_version, new_version); -+ pkg->state_want = SW_DEINSTALL; -+ pkg->state_flag |= SF_OBSOLETE; -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else { -+ free(old_version); -+ free(new_version); -+ } -+ } -+ -+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__); -+ return ipkg_install_pkg(conf, pkg,0); -+} -+ -+ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name) -+{ -+ int cmp; -+ pkg_t *old, *new; -+ char *old_version, *new_version; -+ -+ ipkg_message(conf, IPKG_DEBUG2, " Getting old from pkg_hash_fetch \n" ); -+ old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg_name); -+ if ( old ) -+ ipkg_message(conf, IPKG_DEBUG2, " Old versions from pkg_hash_fetch %s \n", old->version ); -+ -+ ipkg_message(conf, IPKG_DEBUG2, " Getting new from pkg_hash_fetch \n" ); -+ new = pkg_hash_fetch_best_installation_candidate_by_name(conf, pkg_name); -+ if ( new ) -+ ipkg_message(conf, IPKG_DEBUG2, " New versions from pkg_hash_fetch %s \n", new->version ); -+ -+/* Pigi Basically here is broken the version stuff. -+ What's happening is that nothing provide the version to differents -+ functions, so the returned struct is always the latest. -+ That's why the install by name don't work. -+*/ -+ ipkg_message(conf, IPKG_DEBUG2, " Versions from pkg_hash_fetch in %s ", __FUNCTION__ ); -+ -+ if ( old ) -+ ipkg_message(conf, IPKG_DEBUG2, " old %s ", old->version ); -+ if ( new ) -+ ipkg_message(conf, IPKG_DEBUG2, " new %s ", new->version ); -+ ipkg_message(conf, IPKG_DEBUG2, " \n"); -+ -+ if (new == NULL) { -+ return IPKG_PKG_HAS_NO_CANDIDATE; -+ } -+ -+ new->state_flag |= SF_USER; -+ if (old) { -+ old_version = pkg_version_str_alloc(old); -+ new_version = pkg_version_str_alloc(new); -+ -+ cmp = pkg_compare_versions(old, new); -+ if ( (conf->force_downgrade==1) && (cmp > 0) ){ /* We've been asked to allow downgrade and version is precedent */ -+ ipkg_message(conf, IPKG_DEBUG, " Forcing downgrade \n"); -+ cmp = -1 ; /* then we force ipkg to downgrade */ -+ /* We need to use a value < 0 because in the 0 case we are asking to */ -+ /* reinstall, and some check could fail asking the "force-reinstall" option */ -+ } -+ ipkg_message(conf, IPKG_DEBUG, -+ "Comparing visible versions of pkg %s:" -+ "\n\t%s is installed " -+ "\n\t%s is available " -+ "\n\t%d was comparison result\n", -+ pkg_name, old_version, new_version, cmp); -+ if (cmp == 0 && !conf->force_reinstall) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Package %s (%s) installed in %s is up to date.\n", -+ old->name, old_version, old->dest->name); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp > 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not downgrading package %s on %s from %s to %s.\n", -+ old->name, old->dest->name, old_version, new_version); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp < 0) { -+ new->dest = old->dest; -+ old->state_want = SW_DEINSTALL; /* Here probably the problem for bug 1277 */ -+ } -+ } -+ -+ /* XXX: CLEANUP: The error code of ipkg_install_by_name is really -+ supposed to be an ipkg_error_t, but ipkg_install_pkg could -+ return any kind of integer, (might be errno from a syscall, -+ etc.). This is a real mess and will need to be cleaned up if -+ anyone ever wants to make a nice libipkg. */ -+ -+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__); -+ return ipkg_install_pkg(conf, new,0); -+} -+ -+ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name) -+{ -+ abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name); -+ int i; -+ ipkg_error_t err; -+ abstract_pkg_t *ppkg ; -+ -+ if (providers == NULL) -+ return IPKG_PKG_HAS_NO_CANDIDATE; -+ -+ for (i = 0; i < providers->len; i++) { -+ ppkg = abstract_pkg_vec_get(providers, i); -+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i); -+ err = ipkg_install_by_name(conf, ppkg->name); -+ if (err) -+ return err; -+/* XXX Maybe ppkg should be freed ? */ -+ } -+ return 0; -+} -+ -+/* -+ * Walk dependence graph starting with pkg, collect packages to be -+ * installed into pkgs_needed, in dependence order. -+ */ -+int pkg_mark_dependencies_for_installation(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *pkgs_needed) -+{ -+ int i, err; -+ pkg_vec_t *depends = pkg_vec_alloc(); -+ char **unresolved = NULL; -+ int ndepends; -+ -+ ndepends = pkg_hash_fetch_unsatisfied_dependencies(conf, -+ pkg, depends, -+ &unresolved); -+ -+ if (unresolved) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: Cannot satisfy the following dependencies for %s:\n\t", -+ conf->force_depends ? "Warning" : "ERROR", pkg->name); -+ while (*unresolved) { -+ ipkg_message(conf, IPKG_ERROR, " %s", *unresolved); -+ unresolved++; -+ } -+ ipkg_message(conf, IPKG_ERROR, "\n"); -+ if (! conf->force_depends) { -+ ipkg_message(conf, IPKG_INFO, -+ "This could mean that your package list is out of date or that the packages\n" -+ "mentioned above do not yet exist (try 'ipkg update'). To proceed in spite\n" -+ "of this problem try again with the '-force-depends' option.\n"); -+ pkg_vec_free(depends); -+ return IPKG_PKG_DEPS_UNSATISFIED; -+ } -+ } -+ -+ if (ndepends <= 0) { -+ pkg_vec_free(depends); -+ return 0; -+ } -+ -+ for (i = 0; i < depends->len; i++) { -+ pkg_t *dep = depends->pkgs[i]; -+ /* The package was uninstalled when we started, but another -+ dep earlier in this loop may have depended on it and pulled -+ it in, so check first. */ -+ if ((dep->state_status != SS_INSTALLED) -+ && (dep->state_status != SS_UNPACKED) -+ && (dep->state_want != SW_INSTALL)) { -+ -+ /* Mark packages as to-be-installed */ -+ dep->state_want = SW_INSTALL; -+ -+ /* Dependencies should be installed the same place as pkg */ -+ if (dep->dest == NULL) { -+ dep->dest = pkg->dest; -+ } -+ -+ err = pkg_mark_dependencies_for_installation(conf, dep, pkgs_needed); -+ if (err) { -+ pkg_vec_free(depends); -+ return err; -+ } -+ } -+ } -+ if (pkgs_needed) -+ pkg_vec_insert(pkgs_needed, pkg); -+ -+ pkg_vec_free(depends); -+ -+ return 0; -+} -+ -+int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed) -+{ -+ int cmp; -+ pkg_t *old, *new; -+ char *old_version, *new_version; -+ -+ old = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg_name); -+ -+ new = pkg_hash_fetch_best_installation_candidate_by_name(conf, pkg_name); -+ if (new == NULL) { -+ return IPKG_PKG_HAS_NO_CANDIDATE; -+ } -+ if (old) { -+ old_version = pkg_version_str_alloc(old); -+ new_version = pkg_version_str_alloc(new); -+ -+ cmp = pkg_compare_versions(old, new); -+ if ( (conf->force_downgrade==1) && (cmp > 0) ){ /* We've been asked to allow downgrade and version is precedent */ -+ ipkg_message(conf, IPKG_DEBUG, " Forcing downgrade "); -+ cmp = -1 ; /* then we force ipkg to downgrade */ -+ /* We need to use a value < 0 because in the 0 case we are asking to */ -+ /* reinstall, and some check could fail asking the "force-reinstall" option */ -+ } -+ ipkg_message(conf, IPKG_DEBUG, -+ "comparing visible versions of pkg %s:" -+ "\n\t%s is installed " -+ "\n\t%s is available " -+ "\n\t%d was comparison result\n", -+ pkg_name, old_version, new_version, cmp); -+ if (cmp == 0 && !conf->force_reinstall) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Package %s (%s) installed in %s is up to date.\n", -+ old->name, old_version, old->dest->name); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp > 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not downgrading package %s on %s from %s to %s.\n", -+ old->name, old->dest->name, old_version, new_version); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp < 0) { -+ new->dest = old->dest; -+ old->state_want = SW_DEINSTALL; -+ old->state_flag |= SF_OBSOLETE; -+ } -+ } -+ return pkg_mark_dependencies_for_installation(conf, new, pkgs_needed); -+} -+ -+ -+ -+int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int i, err; -+ pkg_vec_t *depends = pkg_vec_alloc(); -+ pkg_t *dep; -+ char **unresolved = NULL; -+ int ndepends; -+ -+ ndepends = pkg_hash_fetch_unsatisfied_dependencies(conf, -+ pkg, depends, -+ &unresolved); -+ -+ if (unresolved) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: Cannot satisfy the following dependencies for %s:\n\t", -+ conf->force_depends ? "Warning" : "ERROR", pkg->name); -+ while (*unresolved) { -+ ipkg_message(conf, IPKG_ERROR, " %s", *unresolved); -+ unresolved++; -+ } -+ ipkg_message(conf, IPKG_ERROR, "\n"); -+ if (! conf->force_depends) { -+ ipkg_message(conf, IPKG_INFO, -+ "This could mean that your package list is out of date or that the packages\n" -+ "mentioned above do not yet exist (try 'ipkg update'). To proceed in spite\n" -+ "of this problem try again with the '-force-depends' option.\n"); -+ pkg_vec_free(depends); -+ return IPKG_PKG_DEPS_UNSATISFIED; -+ } -+ } -+ -+ if (ndepends <= 0) { -+ return 0; -+ } -+ -+ /* Mark packages as to-be-installed */ -+ for (i=0; i < depends->len; i++) { -+ /* Dependencies should be installed the same place as pkg */ -+ if (depends->pkgs[i]->dest == NULL) { -+ depends->pkgs[i]->dest = pkg->dest; -+ } -+ depends->pkgs[i]->state_want = SW_INSTALL; -+ } -+ -+ for (i = 0; i < depends->len; i++) { -+ dep = depends->pkgs[i]; -+ /* The package was uninstalled when we started, but another -+ dep earlier in this loop may have depended on it and pulled -+ it in, so check first. */ -+ if ((dep->state_status != SS_INSTALLED) -+ && (dep->state_status != SS_UNPACKED)) { -+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__); -+ err = ipkg_install_pkg(conf, dep,0); -+ if (err) { -+ pkg_vec_free(depends); -+ return err; -+ } -+ } -+ } -+ -+ pkg_vec_free(depends); -+ -+ return 0; -+} -+ -+ -+/* check all packages have their dependences satisfied, e.g., in case an upgraded package split */ -+int ipkg_satisfy_all_dependences(ipkg_conf_t *conf) -+{ -+ if (conf->nodeps == 0) { -+ int i; -+ pkg_vec_t *installed = pkg_vec_alloc(); -+ pkg_hash_fetch_all_installed(&conf->pkg_hash, installed); -+ for (i = 0; i < installed->len; i++) { -+ pkg_t *pkg = installed->pkgs[i]; -+ satisfy_dependencies_for(conf, pkg); -+ } -+ pkg_vec_free(installed); -+ } -+ return 0; -+} -+ -+ -+ -+static int check_conflicts_for(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int i; -+ pkg_vec_t *conflicts = NULL; -+ int level; -+ const char *prefix; -+ if (conf->force_depends) { -+ level = IPKG_NOTICE; -+ prefix = "Warning"; -+ } else { -+ level = IPKG_ERROR; -+ prefix = "ERROR"; -+ } -+ -+ if (!conf->force_depends) -+ conflicts = (pkg_vec_t *)pkg_hash_fetch_conflicts(&conf->pkg_hash, pkg); -+ -+ if (conflicts) { -+ ipkg_message(conf, level, -+ "%s: The following packages conflict with %s:\n\t", prefix, pkg->name); -+ i = 0; -+ while (i < conflicts->len) -+ ipkg_message(conf, level, " %s", conflicts->pkgs[i++]->name); -+ ipkg_message(conf, level, "\n"); -+ pkg_vec_free(conflicts); -+ return IPKG_PKG_DEPS_UNSATISFIED; -+ } -+ return 0; -+} -+ -+static int update_file_ownership(ipkg_conf_t *conf, pkg_t *new_pkg, pkg_t *old_pkg) -+{ -+ str_list_t *new_list = pkg_get_installed_files(new_pkg); -+ str_list_elt_t *iter; -+ -+ for (iter = new_list->head; iter; iter = iter->next) { -+ char *new_file = iter->data; -+ pkg_t *owner = file_hash_get_file_owner(conf, new_file); -+ if (!new_file) -+ ipkg_message(conf, IPKG_ERROR, "Null new_file for new_pkg=%s\n", new_pkg->name); -+ if (!owner || (owner == old_pkg)) -+ file_hash_set_file_owner(conf, new_file, new_pkg); -+ } -+ if (old_pkg) { -+ str_list_t *old_list = pkg_get_installed_files(old_pkg); -+ for (iter = old_list->head; iter; iter = iter->next) { -+ char *old_file = iter->data; -+ pkg_t *owner = file_hash_get_file_owner(conf, old_file); -+ if (owner == old_pkg) { -+ /* obsolete */ -+ hash_table_insert(&conf->obs_file_hash, old_file, old_pkg); -+ } -+ } -+ } -+ return 0; -+} -+ -+static int verify_pkg_installable(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ /* XXX: FEATURE: Anything else needed here? Maybe a check on free space? */ -+ -+ /* sma 6.20.02: yup; here's the first bit */ -+ /* -+ * XXX: BUG easy for cworth -+ * 1) please point the call below to the correct current root destination -+ * 2) we need to resolve how to check the required space for a pending pkg, -+ * my diddling with the .ipk file size below isn't going to cut it. -+ * 3) return a proper error code instead of 1 -+ */ -+ int comp_size, blocks_available; -+ -+ if (!conf->force_space && pkg->installed_size != NULL) { -+ blocks_available = get_available_blocks(conf->default_dest->root_dir); -+ -+ comp_size = strtoul(pkg->installed_size, NULL, 0); -+ /* round up a blocks count without doing fancy-but-slow casting jazz */ -+ comp_size = (int)((comp_size + 1023) / 1024); -+ -+ if (comp_size >= blocks_available) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Only have %d available blocks on filesystem %s, pkg %s needs %d\n", -+ blocks_available, conf->default_dest->root_dir, pkg->name, comp_size); -+ return ENOSPC; -+ } -+ } -+ return 0; -+} -+ -+static int unpack_pkg_control_files(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int err; -+ char *conffiles_file_name; -+ char *root_dir; -+ FILE *conffiles_file; -+ -+ sprintf_alloc(&pkg->tmp_unpack_dir, "%s/%s-XXXXXX", conf->tmp_dir, pkg->name); -+ -+ pkg->tmp_unpack_dir = mkdtemp(pkg->tmp_unpack_dir); -+ if (pkg->tmp_unpack_dir == NULL) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: Failed to create temporary directory '%s': %s\n", -+ __FUNCTION__, pkg->tmp_unpack_dir, strerror(errno)); -+ return errno; -+ } -+ -+ err = pkg_extract_control_files_to_dir(pkg, pkg->tmp_unpack_dir); -+ if (err) { -+ return err; -+ } -+ -+ /* XXX: CLEANUP: There might be a cleaner place to read in the -+ conffiles. Seems like I should be able to get everything to go -+ through pkg_init_from_file. If so, maybe it would make sense to -+ move all of unpack_pkg_control_files to that function. */ -+ -+ /* Don't need to re-read conffiles if we already have it */ -+ if (pkg->conffiles.head) { -+ return 0; -+ } -+ -+ sprintf_alloc(&conffiles_file_name, "%s/conffiles", pkg->tmp_unpack_dir); -+ if (! file_exists(conffiles_file_name)) { -+ free(conffiles_file_name); -+ return 0; -+ } -+ -+ conffiles_file = fopen(conffiles_file_name, "r"); -+ if (conffiles_file == NULL) { -+ fprintf(stderr, "%s: failed to open %s: %s\n", -+ __FUNCTION__, conffiles_file_name, strerror(errno)); -+ free(conffiles_file_name); -+ return errno; -+ } -+ free(conffiles_file_name); -+ -+ while (1) { -+ char *cf_name; -+ char *cf_name_in_dest; -+ -+ cf_name = file_read_line_alloc(conffiles_file); -+ if (cf_name == NULL) { -+ break; -+ } -+ str_chomp(cf_name); -+ if (cf_name[0] == '\0') { -+ continue; -+ } -+ -+ /* Prepend dest->root_dir to conffile name. -+ Take pains to avoid multiple slashes. */ -+ root_dir = pkg->dest->root_dir; -+ if (conf->offline_root) -+ /* skip the offline_root prefix */ -+ root_dir = pkg->dest->root_dir + strlen(conf->offline_root); -+ sprintf_alloc(&cf_name_in_dest, "%s%s", root_dir, -+ cf_name[0] == '/' ? (cf_name + 1) : cf_name); -+ -+ /* Can't get an md5sum now, (file isn't extracted yet). -+ We'll wait until resolve_conffiles */ -+ conffile_list_append(&pkg->conffiles, cf_name_in_dest, NULL); -+ -+ free(cf_name); -+ free(cf_name_in_dest); -+ } -+ -+ fclose(conffiles_file); -+ -+ return 0; -+} -+ -+/* returns number of installed replacees */ -+int pkg_get_installed_replacees(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *installed_replacees) -+{ -+ abstract_pkg_t **replaces = pkg->replaces; -+ int replaces_count = pkg->replaces_count; -+ int i, j; -+ for (i = 0; i < replaces_count; i++) { -+ abstract_pkg_t *ab_pkg = replaces[i]; -+ pkg_vec_t *pkg_vec = ab_pkg->pkgs; -+ if (pkg_vec) { -+ for (j = 0; j < pkg_vec->len; j++) { -+ pkg_t *replacee = pkg_vec->pkgs[j]; -+ if (!pkg_conflicts(pkg, replacee)) -+ continue; -+ if (replacee->state_status == SS_INSTALLED) { -+ pkg_vec_insert(installed_replacees, replacee); -+ } -+ } -+ } -+ } -+ return installed_replacees->len; -+} -+ -+int pkg_remove_installed_replacees(ipkg_conf_t *conf, pkg_vec_t *replacees) -+{ -+ int i; -+ int replaces_count = replacees->len; -+ for (i = 0; i < replaces_count; i++) { -+ pkg_t *replacee = replacees->pkgs[i]; -+ int err; -+ replacee->state_flag |= SF_REPLACE; /* flag it so remove won't complain */ -+ err = ipkg_remove_pkg(conf, replacee,0); -+ if (err) -+ return err; -+ } -+ return 0; -+} -+ -+/* to unwind the removal: make sure they are installed */ -+int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees) -+{ -+ int i, err; -+ int replaces_count = replacees->len; -+ for (i = 0; i < replaces_count; i++) { -+ pkg_t *replacee = replacees->pkgs[i]; -+ if (replacee->state_status != SS_INSTALLED) { -+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__); -+ err = ipkg_install_pkg(conf, replacee,0); -+ if (err) -+ return err; -+ } -+ } -+ return 0; -+} -+ -+int caught_sigint = 0; -+static void ipkg_install_pkg_sigint_handler(int sig) -+{ -+ caught_sigint = sig; -+} -+ -+/* compares versions of pkg and old_pkg, returns 0 if OK to proceed with installation of pkg, 1 otherwise */ -+static int ipkg_install_check_downgrade(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg, int message) -+{ -+ if (old_pkg) { -+ char message_out[15]; -+ char *old_version = pkg_version_str_alloc(old_pkg); -+ char *new_version = pkg_version_str_alloc(pkg); -+ int cmp = pkg_compare_versions(old_pkg, pkg); -+ int rc = 0; -+ -+ memset(message_out,'\x0',15); -+ strncpy (message_out,"Upgrading ",strlen("Upgrading ")); -+ if ( (conf->force_downgrade==1) && (cmp > 0) ){ /* We've been asked to allow downgrade and version is precedent */ -+ cmp = -1 ; /* then we force ipkg to downgrade */ -+ strncpy (message_out,"Downgrading ",strlen("Downgrading ")); /* We need to use a value < 0 because in the 0 case we are asking to */ -+ /* reinstall, and some check could fail asking the "force-reinstall" option */ -+ } -+ -+ if (cmp > 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not downgrading package %s on %s from %s to %s.\n", -+ old_pkg->name, old_pkg->dest->name, old_version, new_version); -+ rc = 1; -+ } else if (cmp < 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "%s%s on %s from %s to %s...\n", -+ message_out, pkg->name, old_pkg->dest->name, old_version, new_version); -+ pkg->dest = old_pkg->dest; -+ rc = 0; -+ } else /* cmp == 0 */ { -+ if (conf->force_reinstall) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Reinstalling %s (%s) on %s...\n", -+ pkg->name, new_version, old_pkg->dest->name); -+ pkg->dest = old_pkg->dest; -+ rc = 0; -+ } else { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not installing %s (%s) on %s -- already installed.\n", -+ pkg->name, new_version, old_pkg->dest->name); -+ rc = 1; -+ } -+ } -+ free(old_version); -+ free(new_version); -+ return rc; -+ } else { -+ char message_out[15] ; -+ memset(message_out,'\x0',15); -+ if ( message ) -+ strncpy( message_out,"Upgrading ",strlen("Upgrading ") ); -+ else -+ strncpy( message_out,"Installing ",strlen("Installing ") ); -+ char *version = pkg_version_str_alloc(pkg); -+ -+ ipkg_message(conf, IPKG_NOTICE, -+ "%s%s (%s) to %s...\n", message_out, -+ pkg->name, version, pkg->dest->name); -+ free(version); -+ return 0; -+ } -+} -+ -+/* and now the meat... */ -+int ipkg_install_pkg(ipkg_conf_t *conf, pkg_t *pkg, int from_upgrade) -+{ -+ int err = 0; -+ int message = 0; -+ pkg_t *old_pkg = NULL; -+ pkg_vec_t *replacees; -+ abstract_pkg_t *ab_pkg = NULL; -+ int old_state_flag; -+ char* file_md5; -+ -+ -+ if ( from_upgrade ) -+ message = 1; /* Coming from an upgrade, and should change the output message */ -+ -+ if (!pkg) { -+ ipkg_message(conf, IPKG_ERROR, -+ "INTERNAL ERROR: null pkg passed to ipkg_install_pkg\n"); -+ return -EINVAL; -+ } -+ -+ ipkg_message(conf, IPKG_DEBUG2, "Function: %s calling pkg_arch_supported %s \n", __FUNCTION__, __FUNCTION__); -+ -+ if (!pkg_arch_supported(conf, pkg)) { -+ ipkg_message(conf, IPKG_ERROR, "INTERNAL ERROR: architecture %s for pkg %s is unsupported.\n", -+ pkg->architecture, pkg->name); -+ return -EINVAL; -+ } -+ if (pkg->state_status == SS_INSTALLED && conf->force_reinstall == 0 && conf->nodeps == 0) { -+ err = satisfy_dependencies_for(conf, pkg); -+ if (err) { return err; } -+ -+ ipkg_message(conf, IPKG_NOTICE, -+ "Package %s is already installed in %s.\n", -+ pkg->name, pkg->dest->name); -+ return 0; -+ } -+ -+ if (pkg->dest == NULL) { -+ pkg->dest = conf->default_dest; -+ } -+ -+ old_pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name); -+ -+ err = ipkg_install_check_downgrade(conf, pkg, old_pkg, message); -+ if (err) { return err; } -+ -+ pkg->state_want = SW_INSTALL; -+ if (old_pkg){ -+ old_pkg->state_want = SW_DEINSTALL; /* needed for check_data_file_clashes of dependences */ -+ } -+ -+ -+ /* Abhaya: conflicts check */ -+ err = check_conflicts_for(conf, pkg); -+ if (err) { return err; } -+ -+ /* this setup is to remove the upgrade scenario in the end when -+ installing pkg A, A deps B & B deps on A. So both B and A are -+ installed. Then A's installation is started resulting in an -+ uncecessary upgrade */ -+ if (pkg->state_status == SS_INSTALLED -+ && conf->force_reinstall == 0) return 0; -+ -+ err = verify_pkg_installable(conf, pkg); -+ if (err) { return err; } -+ -+ if (pkg->local_filename == NULL) { -+ err = ipkg_download_pkg(conf, pkg, conf->tmp_dir); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Failed to download %s. Perhaps you need to run 'ipkg update'?\n", -+ pkg->name); -+ return err; -+ } -+ } -+ -+/* Check for md5 values */ -+ if (pkg->md5sum) -+ { -+ file_md5 = file_md5sum_alloc(pkg->local_filename); -+ if (strcmp(file_md5, pkg->md5sum)) -+ { -+ ipkg_message(conf, IPKG_ERROR, -+ "Package %s md5sum mismatch. Either the ipkg or the package index are corrupt. Try 'ipkg update'.\n", -+ pkg->name); -+ free(file_md5); -+ return err; -+ } -+ free(file_md5); -+ } -+ -+ if (pkg->tmp_unpack_dir == NULL) { -+ unpack_pkg_control_files(conf, pkg); -+ } -+ -+ /* We should update the filelist here, so that upgrades of packages that split will not fail. -Jamey 27-MAR-03 */ -+/* Pigi: check if it will pass from here when replacing. It seems to fail */ -+/* That's rather strange that files don't change owner. Investigate !!!!!!*/ -+ err = update_file_ownership(conf, pkg, old_pkg); -+ if (err) { return err; } -+ -+ if (conf->nodeps == 0) { -+ err = satisfy_dependencies_for(conf, pkg); -+ if (err) { return err; } -+ } -+ -+ replacees = pkg_vec_alloc(); -+ pkg_get_installed_replacees(conf, pkg, replacees); -+ -+ /* this next section we do with SIGINT blocked to prevent inconsistency between ipkg database and filesystem */ -+ { -+ sigset_t newset, oldset; -+ sighandler_t old_handler = NULL; -+ int use_signal = 0; -+ caught_sigint = 0; -+ if (use_signal) { -+ old_handler = signal(SIGINT, ipkg_install_pkg_sigint_handler); -+ } else { -+ sigemptyset(&newset); -+ sigaddset(&newset, SIGINT); -+ sigprocmask(SIG_BLOCK, &newset, &oldset); -+ } -+ -+ ipkg_state_changed++; -+ pkg->state_flag |= SF_FILELIST_CHANGED; -+ -+ /* XXX: BUG: we really should treat replacement more like an upgrade -+ * Instead, we're going to remove the replacees -+ */ -+ err = pkg_remove_installed_replacees(conf, replacees); -+ if (err) goto UNWIND_REMOVE_INSTALLED_REPLACEES; -+ -+ err = prerm_upgrade_old_pkg(conf, pkg, old_pkg); -+ if (err) goto UNWIND_PRERM_UPGRADE_OLD_PKG; -+ -+ err = prerm_deconfigure_conflictors(conf, pkg, replacees); -+ if (err) goto UNWIND_PRERM_DECONFIGURE_CONFLICTORS; -+ -+ err = preinst_configure(conf, pkg, old_pkg); -+ if (err) goto UNWIND_PREINST_CONFIGURE; -+ -+ err = backup_modified_conffiles(conf, pkg, old_pkg); -+ if (err) goto UNWIND_BACKUP_MODIFIED_CONFFILES; -+ -+ err = check_data_file_clashes(conf, pkg, old_pkg); -+ if (err) goto UNWIND_CHECK_DATA_FILE_CLASHES; -+ -+ err = postrm_upgrade_old_pkg(conf, pkg, old_pkg); -+ if (err) goto UNWIND_POSTRM_UPGRADE_OLD_PKG; -+ -+ if (conf->noaction) return 0; -+ -+ /* point of no return: no unwinding after this */ -+ if (old_pkg && !conf->force_reinstall) { -+ old_pkg->state_want = SW_DEINSTALL; -+ -+ if (old_pkg->state_flag & SF_NOPRUNE) { -+ ipkg_message(conf, IPKG_INFO, -+ " not removing obsolesced files because package marked noprune\n"); -+ } else { -+ ipkg_message(conf, IPKG_INFO, -+ " removing obsolesced files\n"); -+ remove_obsolesced_files(conf, pkg, old_pkg); -+ } -+ /* removing files from old package, to avoid ghost files */ -+ remove_data_files_and_list(conf, old_pkg); -+/* Pigi : It should be better to remove also maintainer and postrem scripts here, just in case*/ -+ remove_maintainer_scripts_except_postrm(conf, old_pkg); -+ remove_postrm(conf, old_pkg); -+/* Pigi */ -+ -+ } -+ -+ -+ ipkg_message(conf, IPKG_INFO, -+ " installing maintainer scripts\n"); -+ install_maintainer_scripts(conf, pkg, old_pkg); -+ -+ /* the following just returns 0 */ -+ remove_disappeared(conf, pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " installing data files\n"); -+ install_data_files(conf, pkg); -+ -+/* read comments from function for detail but I will execute this here as all other tests are ok.*/ -+ err = check_data_file_clashes_change(conf, pkg, old_pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " resolving conf files\n"); -+ resolve_conffiles(conf, pkg); -+ -+ pkg->state_status = SS_UNPACKED; -+ old_state_flag = pkg->state_flag; -+ pkg->state_flag &= ~SF_PREFER; -+ ipkg_message(conf, IPKG_DEBUG, " pkg=%s old_state_flag=%x state_flag=%x\n", pkg->name, old_state_flag, pkg->state_flag); -+ -+ if (old_pkg && !conf->force_reinstall) { -+ old_pkg->state_status = SS_NOT_INSTALLED; -+ } -+ -+ time(&pkg->installed_time); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " cleanup temp files\n"); -+ cleanup_temporary_files(conf, pkg); -+ -+ ab_pkg = pkg->parent; -+ if (ab_pkg) -+ ab_pkg->state_status = pkg->state_status; -+ -+ ipkg_message(conf, IPKG_INFO, "Done.\n"); -+ -+ if (use_signal) -+ signal(SIGINT, old_handler); -+ else -+ sigprocmask(SIG_UNBLOCK, &newset, &oldset); -+ -+ return 0; -+ -+ -+ UNWIND_POSTRM_UPGRADE_OLD_PKG: -+ postrm_upgrade_old_pkg_unwind(conf, pkg, old_pkg); -+ UNWIND_CHECK_DATA_FILE_CLASHES: -+ check_data_file_clashes_unwind(conf, pkg, old_pkg); -+ UNWIND_BACKUP_MODIFIED_CONFFILES: -+ backup_modified_conffiles_unwind(conf, pkg, old_pkg); -+ UNWIND_PREINST_CONFIGURE: -+ preinst_configure_unwind(conf, pkg, old_pkg); -+ UNWIND_PRERM_DECONFIGURE_CONFLICTORS: -+ prerm_deconfigure_conflictors_unwind(conf, pkg, replacees); -+ UNWIND_PRERM_UPGRADE_OLD_PKG: -+ prerm_upgrade_old_pkg_unwind(conf, pkg, old_pkg); -+ UNWIND_REMOVE_INSTALLED_REPLACEES: -+ pkg_remove_installed_replacees_unwind(conf, replacees); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " cleanup temp files\n"); -+ cleanup_temporary_files(conf, pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ "Failed.\n"); -+ if (use_signal) -+ signal(SIGINT, old_handler); -+ else -+ sigprocmask(SIG_UNBLOCK, &newset, &oldset); -+ -+ return err; -+ } -+} -+ -+static int prerm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg does some things here that we don't do yet. Do we care? -+ -+ 1. If a version of the package is already installed, call -+ old-prerm upgrade new-version -+ 2. If the script runs but exits with a non-zero exit status -+ new-prerm failed-upgrade old-version -+ Error unwind, for both the above cases: -+ old-postinst abort-upgrade new-version -+ */ -+ return 0; -+} -+ -+static int prerm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg does some things here that we don't do yet. Do we care? -+ (See prerm_upgrade_old_package for details) -+ */ -+ return 0; -+} -+ -+static int prerm_deconfigure_conflictors(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg does some things here that we don't do yet. Do we care? -+ 2. If a 'conflicting' package is being removed at the same time: -+ 1. If any packages depended on that conflicting package and -+ --auto-deconfigure is specified, call, for each such package: -+ deconfigured's-prerm deconfigure \ -+ in-favour package-being-installed version \ -+ removing conflicting-package version -+ Error unwind: -+ deconfigured's-postinst abort-deconfigure \ -+ in-favour package-being-installed-but-failed version \ -+ removing conflicting-package version -+ -+ The deconfigured packages are marked as requiring -+ configuration, so that if --install is used they will be -+ configured again if possible. -+ 2. To prepare for removal of the conflicting package, call: -+ conflictor's-prerm remove in-favour package new-version -+ Error unwind: -+ conflictor's-postinst abort-remove in-favour package new-version -+ */ -+ return 0; -+} -+ -+static int prerm_deconfigure_conflictors_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *conflictors) -+{ -+ /* DPKG_INCOMPATIBILITY: dpkg does some things here that we don't -+ do yet. Do we care? (See prerm_deconfigure_conflictors for -+ details) */ -+ return 0; -+} -+ -+static int preinst_configure(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ int err; -+ char *preinst_args; -+ -+ if (old_pkg) { -+ char *old_version = pkg_version_str_alloc(old_pkg); -+ sprintf_alloc(&preinst_args, "upgrade %s", old_version); -+ free(old_version); -+ } else if (pkg->state_status == SS_CONFIG_FILES) { -+ char *pkg_version = pkg_version_str_alloc(pkg); -+ sprintf_alloc(&preinst_args, "install %s", pkg_version); -+ free(pkg_version); -+ } else { -+ preinst_args = strdup("install"); -+ } -+ -+ err = pkg_run_script(conf, pkg, "preinst", preinst_args); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Aborting installation of %s\n", pkg->name); -+ return 1; -+ } -+ -+ free(preinst_args); -+ -+ return 0; -+} -+ -+static int preinst_configure_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg does the following error unwind, should we? -+ pkg->postrm abort-upgrade old-version -+ OR pkg->postrm abort-install old-version -+ OR pkg->postrm abort-install -+ */ -+ return 0; -+} -+ -+static int backup_modified_conffiles(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ int err; -+ conffile_list_elt_t *iter; -+ conffile_t *cf; -+ -+ if (conf->noaction) return 0; -+ -+ /* Backup all modified conffiles */ -+ if (old_pkg) { -+ for (iter = old_pkg->conffiles.head; iter; iter = iter->next) { -+ char *cf_name; -+ -+ cf = iter->data; -+ cf_name = root_filename_alloc(conf, cf->name); -+ -+ /* Don't worry if the conffile is just plain gone */ -+ if (file_exists(cf_name) && conffile_has_been_modified(conf, cf)) { -+ err = backup_make_backup(conf, cf_name); -+ if (err) { -+ return err; -+ } -+ } -+ free(cf_name); -+ } -+ } -+ -+ /* Backup all conffiles that were not conffiles in old_pkg */ -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ char *cf_name; -+ cf = iter->data; -+ cf_name = root_filename_alloc(conf, cf->name); -+ /* Ignore if this was a conffile in old_pkg as well */ -+ if (pkg_get_conffile(old_pkg, cf->name)) { -+ continue; -+ } -+ -+ if (file_exists(cf_name) && (! backup_exists_for(cf_name))) { -+ err = backup_make_backup(conf, cf_name); -+ if (err) { -+ return err; -+ } -+ } -+ free(cf_name); -+ } -+ -+ return 0; -+} -+ -+static int backup_modified_conffiles_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ conffile_list_elt_t *iter; -+ -+ if (old_pkg) { -+ for (iter = old_pkg->conffiles.head; iter; iter = iter->next) { -+ backup_remove(iter->data->name); -+ } -+ } -+ -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ backup_remove(iter->data->name); -+ } -+ -+ return 0; -+} -+ -+ -+static int check_data_file_clashes(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ ipkg takes a slightly different approach than dpkg at this -+ point. dpkg installs each file in the new package while -+ creating a backup for any file that is replaced, (so that it -+ can unwind if necessary). To avoid complexity and redundant -+ storage, ipkg doesn't do any installation until later, (at the -+ point at which dpkg removes the backups. -+ -+ But, we do have to check for data file clashes, since after -+ installing a package with a file clash, removing either of the -+ packages involved in the clash has the potential to break the -+ other package. -+ */ -+ str_list_t *files_list; -+ str_list_elt_t *iter; -+ -+ int clashes = 0; -+ -+ files_list = pkg_get_installed_files(pkg); -+ for (iter = files_list->head; iter; iter = iter->next) { -+ char *root_filename; -+ char *filename = iter->data; -+ root_filename = root_filename_alloc(conf, filename); -+ if (file_exists(root_filename) && (! file_is_dir(root_filename))) { -+ pkg_t *owner; -+ pkg_t *obs; -+ /* Pre-existing conffiles are OK */ -+ /* @@@@ should have way to check that it is a conffile -Jamey */ -+ if (backup_exists_for(root_filename)) { -+ continue; -+ } -+ -+ /* Pre-existing files are OK if force-overwrite was asserted. */ -+ if (conf->force_overwrite) { -+ /* but we need to change who owns this file */ -+ file_hash_set_file_owner(conf, filename, pkg); -+ continue; -+ } -+ -+ owner = file_hash_get_file_owner(conf, filename); -+ -+ /* Pre-existing files are OK if owned by the pkg being upgraded. */ -+ if (owner && old_pkg) { -+ if (strcmp(owner->name, old_pkg->name) == 0) { -+ continue; -+ } -+ } -+ -+ /* Pre-existing files are OK if owned by a package replaced by new pkg. */ -+ if (owner) { -+ ipkg_message(conf, IPKG_DEBUG2, "Checking for replaces for %s in package %s\n", filename, owner->name); -+ if (pkg_replaces(pkg, owner)) { -+ continue; -+ } -+/* If the file that would be installed is owned by the same package, ( as per a reinstall or similar ) -+ then it's ok to overwrite. */ -+ if (strcmp(owner->name,pkg->name)==0){ -+ ipkg_message(conf, IPKG_INFO, "Replacing pre-existing file %s owned by package %s\n", filename, owner->name); -+ continue; -+ } -+ } -+ -+ /* Pre-existing files are OK if they are obsolete */ -+ obs = hash_table_get(&conf->obs_file_hash, filename); -+ if (obs) { -+ ipkg_message(conf, IPKG_INFO, "Pre-exiting file %s is obsolete. obs_pkg=%s\n", filename, obs->name); -+ continue; -+ } -+ -+ /* We have found a clash. */ -+ ipkg_message(conf, IPKG_ERROR, -+ "Package %s wants to install file %s\n" -+ "\tBut that file is already provided by package ", -+ pkg->name, filename); -+ if (owner) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s\n", owner->name); -+ } else { -+ ipkg_message(conf, IPKG_ERROR, -+ "<no package>\nPlease move this file out of the way and try again.\n"); -+ } -+ clashes++; -+ } -+ free(root_filename); -+ } -+ pkg_free_installed_files(pkg); -+ -+ return clashes; -+} -+ -+static int check_data_file_clashes_change(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* Basically that's the worst hack I could do to be able to change ownership of -+ file list, but, being that we have no way to unwind the mods, due to structure -+ of hash table, probably is the quickest hack too, whishing it would not slow-up thing too much. -+ What we do here is change the ownership of file in hash if a replace ( or similar events -+ happens ) -+ Only the action that are needed to change name should be considered. -+ @@@ To change after 1.0 release. -+ */ -+ str_list_t *files_list; -+ str_list_elt_t *iter; -+ -+ int clashes = 0; -+ -+ files_list = pkg_get_installed_files(pkg); -+ for (iter = files_list->head; iter; iter = iter->next) { -+ char *root_filename; -+ char *filename = iter->data; -+ root_filename = root_filename_alloc(conf, filename); -+ if (file_exists(root_filename) && (! file_is_dir(root_filename))) { -+ pkg_t *owner; -+ -+ if (conf->force_overwrite) { -+ /* but we need to change who owns this file */ -+ file_hash_set_file_owner(conf, filename, pkg); -+ continue; -+ } -+ -+ owner = file_hash_get_file_owner(conf, filename); -+ -+ /* Pre-existing files are OK if owned by a package replaced by new pkg. */ -+ if (owner) { -+ if (pkg_replaces(pkg, owner)) { -+/* It's now time to change the owner of that file. -+ It has been "replaced" from the new "Replaces", then I need to inform lists file about that. */ -+ ipkg_message(conf, IPKG_INFO, "Replacing pre-existing file %s owned by package %s\n", filename, owner->name); -+ file_hash_set_file_owner(conf, filename, pkg); -+ continue; -+ } -+ } -+ -+ } -+ free(root_filename); -+ } -+ pkg_free_installed_files(pkg); -+ -+ return clashes; -+} -+ -+static int check_data_file_clashes_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* Nothing to do since check_data_file_clashes doesn't change state */ -+ return 0; -+} -+ -+static int postrm_upgrade_old_pkg(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: dpkg does the following here, should we? -+ 1. If the package is being upgraded, call -+ old-postrm upgrade new-version -+ 2. If this fails, attempt: -+ new-postrm failed-upgrade old-version -+ Error unwind, for both cases: -+ old-preinst abort-upgrade new-version */ -+ return 0; -+} -+ -+static int postrm_upgrade_old_pkg_unwind(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ dpkg does some things here that we don't do yet. Do we care? -+ (See postrm_upgrade_old_pkg for details) -+ */ -+ return 0; -+} -+ -+static int remove_obsolesced_files(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ int err; -+ str_list_t *old_files; -+ str_list_elt_t *of; -+ str_list_t *new_files; -+ str_list_elt_t *nf; -+ -+ if (old_pkg == NULL) { -+ return 0; -+ } -+ -+ old_files = pkg_get_installed_files(old_pkg); -+ new_files = pkg_get_installed_files(pkg); -+ -+ for (of = old_files->head; of; of = of->next) { -+ pkg_t *owner; -+ char *old, *new; -+ old = of->data; -+ for (nf = new_files->head; nf; nf = nf->next) { -+ new = nf->data; -+ if (strcmp(old, new) == 0) { -+ goto NOT_OBSOLETE; -+ } -+ } -+ if (file_is_dir(old)) { -+ continue; -+ } -+ owner = file_hash_get_file_owner(conf, old); -+ if (owner != old_pkg) { -+ /* in case obsolete file no longer belongs to old_pkg */ -+ continue; -+ } -+ -+ /* old file is obsolete */ -+ ipkg_message(conf, IPKG_INFO, -+ " removing obsolete file %s\n", old); -+ if (!conf->noaction) { -+ err = unlink(old); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, " Warning: remove %s failed: %s\n", old, -+ strerror(errno)); -+ } -+ } -+ -+ NOT_OBSOLETE: -+ ; -+ } -+ -+ pkg_free_installed_files(old_pkg); -+ pkg_free_installed_files(pkg); -+ -+ return 0; -+} -+ -+static int remove_obsolete_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ int i; -+ int err = 0; -+ char *globpattern; -+ glob_t globbuf; -+ if (0) { -+ if (!pkg->dest) { -+ ipkg_message(conf, IPKG_ERROR, "%s: no dest for package %s\n", __FUNCTION__, pkg->name); -+ return -1; -+ } -+ sprintf_alloc(&globpattern, "%s/%s.*", pkg->dest->info_dir, pkg->name); -+ err = glob(globpattern, 0, NULL, &globbuf); -+ free(globpattern); -+ if (err) { -+ return err; -+ } -+ /* XXXX this should perhaps only remove the ones that are not overwritten in new package. Jamey 11/11/2003 */ -+ for (i = 0; i < globbuf.gl_pathc; i++) { -+ ipkg_message(conf, IPKG_DEBUG, "Removing control file %s from old_pkg %s\n", -+ globbuf.gl_pathv[i], old_pkg->name); -+ if (!conf->noaction) -+ unlink(globbuf.gl_pathv[i]); -+ } -+ globfree(&globbuf); -+ } -+ return err; -+} -+ -+static int install_maintainer_scripts(ipkg_conf_t *conf, pkg_t *pkg, pkg_t *old_pkg) -+{ -+ int ret; -+ char *prefix; -+ -+ if (old_pkg) -+ remove_obsolete_maintainer_scripts(conf, pkg, old_pkg); -+ sprintf_alloc(&prefix, "%s.", pkg->name); -+ ret = pkg_extract_control_files_to_dir_with_prefix(pkg, -+ pkg->dest->info_dir, -+ prefix); -+ free(prefix); -+ return ret; -+} -+ -+static int remove_disappeared(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ /* DPKG_INCOMPATIBILITY: -+ This is a fairly sophisticated dpkg operation. Shall we -+ skip it? */ -+ -+ /* Any packages all of whose files have been overwritten during the -+ installation, and which aren't required for dependencies, are -+ considered to have been removed. For each such package -+ 1. disappearer's-postrm disappear overwriter overwriter-version -+ 2. The package's maintainer scripts are removed -+ 3. It is noted in the status database as being in a sane state, -+ namely not installed (any conffiles it may have are ignored, -+ rather than being removed by dpkg). Note that disappearing -+ packages do not have their prerm called, because dpkg doesn't -+ know in advance that the package is going to vanish. -+ */ -+ return 0; -+} -+ -+static int install_data_files(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int err; -+ -+ /* ipkg takes a slightly different approach to data file backups -+ than dpkg. Rather than removing backups at this point, we -+ actually do the data file installation now. See comments in -+ check_data_file_clashes() for more details. */ -+ -+ ipkg_message(conf, IPKG_INFO, -+ " extracting data files to %s\n", pkg->dest->root_dir); -+ err = pkg_extract_data_files_to_dir(pkg, pkg->dest->root_dir); -+ if (err) { -+ return err; -+ } -+ -+ /* XXX: BUG or FEATURE : We are actually loosing the Essential flag, -+ so we can't save ourself from removing important packages -+ At this point we (should) have extracted the .control file, so it -+ would be a good idea to reload the data in it, and set the Essential -+ state in *pkg. From now on the Essential is back in status file and -+ we can protect again. -+ We should operate this way: -+ fopen the file ( pkg->dest->root_dir/pkg->name.control ) -+ check for "Essential" in it -+ set the value in pkg->essential. -+ This new routine could be useful also for every other flag -+ Pigi: 16/03/2004 */ -+ set_flags_from_control(conf, pkg) ; -+ -+ ipkg_message(conf, IPKG_DEBUG, " Calling pkg_write_filelist from %s\n", __FUNCTION__); -+ err = pkg_write_filelist(conf, pkg); -+ if (err) -+ return err; -+ -+ /* XXX: FEATURE: ipkg should identify any files which existed -+ before installation and which were overwritten, (see -+ check_data_file_clashes()). What it must do is remove any such -+ files from the filelist of the old package which provided the -+ file. Otherwise, if the old package were removed at some point -+ it would break the new package. Removing the new package will -+ also break the old one, but this cannot be helped since the old -+ package's file has already been deleted. This is the importance -+ of check_data_file_clashes(), and only allowing ipkg to install -+ a clashing package with a user force. */ -+ -+ return 0; -+} -+ -+static int resolve_conffiles(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ conffile_list_elt_t *iter; -+ conffile_t *cf; -+ char *cf_backup; -+ -+ char *md5sum; -+ -+ -+ if (conf->noaction) return 0; -+ -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ char *root_filename; -+ cf = iter->data; -+ root_filename = root_filename_alloc(conf, cf->name); -+ -+ /* Might need to initialize the md5sum for each conffile */ -+ if (cf->value == NULL) { -+ cf->value = file_md5sum_alloc(root_filename); -+ } -+ -+ if (!file_exists(root_filename)) { -+ free(root_filename); -+ continue; -+ } -+ -+ cf_backup = backup_filename_alloc(root_filename); -+ -+ -+ if (file_exists(cf_backup)) { -+ /* Let's compute md5 to test if files are changed */ -+ md5sum = file_md5sum_alloc(cf_backup); -+ if (strcmp( cf->value,md5sum) != 0 ) { -+ if (conf->force_defaults -+ || user_prefers_old_conffile(cf->name, cf_backup) ) { -+ rename(cf_backup, root_filename); -+ } -+ } -+ unlink(cf_backup); -+ free(md5sum); -+ } -+ -+ free(cf_backup); -+ free(root_filename); -+ } -+ -+ return 0; -+} -+ -+static int user_prefers_old_conffile(const char *file_name, const char *backup) -+{ -+ char *response; -+ const char *short_file_name; -+ -+ short_file_name = strrchr(file_name, '/'); -+ if (short_file_name) { -+ short_file_name++; -+ } else { -+ short_file_name = file_name; -+ } -+ -+ while (1) { -+ response = get_user_response(" Configuration file '%s'\n" -+ " ==> File on system created by you or by a script.\n" -+ " ==> File also in package provided by package maintainer.\n" -+ " What would you like to do about it ? Your options are:\n" -+ " Y or I : install the package maintainer's version\n" -+ " N or O : keep your currently-installed version\n" -+ " D : show the differences between the versions (if diff is installed)\n" -+ " The default action is to keep your current version.\n" -+ " *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name); -+ if (strcmp(response, "y") == 0 -+ || strcmp(response, "i") == 0 -+ || strcmp(response, "yes") == 0) { -+ free(response); -+ return 0; -+ } -+ -+ if (strcmp(response, "d") == 0) { -+ char *cmd; -+ -+ free(response); -+ /* XXX: BUG rewrite to use exec or busybox's internal diff */ -+ sprintf_alloc(&cmd, "diff -u %s %s", backup, file_name); -+ xsystem(cmd); -+ free(cmd); -+ printf(" [Press ENTER to continue]\n"); -+ response = file_read_line_alloc(stdin); -+ free(response); -+ continue; -+ } -+ -+ free(response); -+ return 1; -+ } -+} -+ -+/* XXX: CLEANUP: I'd like to move all of the code for -+ creating/cleaning pkg->tmp_unpack_dir directly into pkg.c. (Then, -+ it would make sense to cleanup pkg->tmp_unpack_dir directly from -+ pkg_deinit for example). */ -+static int cleanup_temporary_files(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ DIR *tmp_dir; -+ struct dirent *dirent; -+ char *tmp_file; -+ -+#ifdef IPKG_DEBUG_NO_TMP_CLEANUP -+#error -+ ipkg_message(conf, IPKG_DEBUG, -+ "%s: Not cleaning up %s since ipkg compiled with IPKG_DEBUG_NO_TMP_CLEANUP\n", -+ __FUNCTION__, pkg->tmp_unpack_dir); -+ return 0; -+#endif -+ -+ if (pkg->tmp_unpack_dir && file_is_dir(pkg->tmp_unpack_dir)) { -+ tmp_dir = opendir(pkg->tmp_unpack_dir); -+ if (tmp_dir) { -+ while (1) { -+ dirent = readdir(tmp_dir); -+ if (dirent == NULL) { -+ break; -+ } -+ sprintf_alloc(&tmp_file, "%s/%s", -+ pkg->tmp_unpack_dir, dirent->d_name); -+ if (! file_is_dir(tmp_file)) { -+ unlink(tmp_file); -+ } -+ free(tmp_file); -+ } -+ closedir(tmp_dir); -+ rmdir(pkg->tmp_unpack_dir); -+ free(pkg->tmp_unpack_dir); -+ pkg->tmp_unpack_dir = NULL; -+ } -+ } -+ -+ ipkg_message(conf, IPKG_INFO, "cleanup_temporary_files: pkg=%s local_filename=%s tmp_dir=%s\n", -+ pkg->name, pkg->local_filename, conf->tmp_dir); -+ if (pkg->local_filename && strncmp(pkg->local_filename, conf->tmp_dir, strlen(conf->tmp_dir)) == 0) { -+ unlink(pkg->local_filename); -+ free(pkg->local_filename); -+ pkg->local_filename = NULL; -+ } -+ -+ return 0; -+} -+ -+static char *backup_filename_alloc(const char *file_name) -+{ -+ char *backup; -+ -+ sprintf_alloc(&backup, "%s%s", file_name, IPKG_BACKUP_SUFFIX); -+ -+ return backup; -+} -+ -+int backup_make_backup(ipkg_conf_t *conf, const char *file_name) -+{ -+ int err; -+ char *backup; -+ -+ backup = backup_filename_alloc(file_name); -+ err = file_copy(file_name, backup); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "%s: Failed to copy %s to %s\n", -+ __FUNCTION__, file_name, backup); -+ } -+ -+ free(backup); -+ -+ return err; -+} -+ -+static int backup_exists_for(const char *file_name) -+{ -+ int ret; -+ char *backup; -+ -+ backup = backup_filename_alloc(file_name); -+ -+ ret = file_exists(backup); -+ -+ free(backup); -+ -+ return ret; -+} -+ -+static int backup_remove(const char *file_name) -+{ -+ char *backup; -+ -+ backup = backup_filename_alloc(file_name); -+ unlink(backup); -+ free(backup); -+ -+ return 0; -+} -+ -+ -+ -+#ifdef CONFIG_IPKG_PROCESS_ACTIONS -+ -+int ipkg_remove_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove) -+{ -+ /* first, remove the packages that need removing */ -+ for (i = 0 ; i < pkgs_to_remove->len; i++ ) { -+ pkg_t *pkg = pkgs_to_remove->pkgs[i]; -+ err = ipkg_remove_pkg(conf, pkg,0); -+ if (err) return err; -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_sanity_check(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ if (pkg->dest == NULL) -+ pkg->dest = conf->default_dest; -+ -+ pkg->state_want = SW_INSTALL; -+ -+ /* Abhaya: conflicts check */ -+ err = check_conflicts_for(conf, pkg); -+ if (err) { return err; } -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_unpack_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ -+ /* XXX: FEATURE: Need to really support Provides/Replaces: here at some point */ -+ pkg_vec_t *replacees = pkg_vec_alloc(); -+ pkg_get_installed_replacees(conf, pkg, replacees); -+ -+ /* XXX: BUG: we really should treat replacement more like an upgrade -+ * Instead, we're going to remove the replacees -+ */ -+ err = pkg_remove_installed_replacees(conf, replacees); -+ if (err) return err; -+ pkg->state_flag |= SF_REMOVED_REPLACEES; -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_unpack_packages(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ if (pkg->local_filename == NULL) { -+ err = ipkg_download_pkg(conf, pkg, conf->tmp_dir); -+ if (err) { -+ ipkg_message(conf, IPKG_ERROR, -+ "Failed to download %s. Perhaps you need to run 'ipkg update'?\n", -+ pkg->name); -+ return err; -+ } -+ } -+ if (pkg->tmp_unpack_dir == NULL) { -+ err = unpack_pkg_control_files(conf, pkg); -+ if (err) return err; -+ } -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_prerm(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ pkg_t *old_pkg = pkg->old_pkg; -+ -+ err = prerm_upgrade_old_pkg(conf, pkg, old_pkg); -+ if (err) return err; -+ -+ err = prerm_deconfigure_conflictors(conf, pkg, replacees); -+ if (err) return err; -+ -+ err = preinst_configure(conf, pkg, old_pkg); -+ if (err) return err; -+ -+ err = backup_modified_conffiles(conf, pkg, old_pkg); -+ if (err) return err; -+ -+ err = postrm_upgrade_old_pkg(conf, pkg, old_pkg); -+ if (err) return err; -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_install(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ pkg_t *old_pkg = pkg->old_pkg; -+ -+ if (old_pkg) { -+ old_pkg->state_want = SW_DEINSTALL; -+ -+ if (old_pkg->state_flag & SF_NOPRUNE) { -+ ipkg_message(conf, IPKG_INFO, -+ " not removing obsolesced files because package marked noprune\n"); -+ } else { -+ ipkg_message(conf, IPKG_INFO, -+ " removing obsolesced files\n"); -+ remove_obsolesced_files(conf, pkg, old_pkg); -+ } -+ } -+ -+ ipkg_message(conf, IPKG_INFO, -+ " installing maintainer scripts\n"); -+ install_maintainer_scripts(conf, pkg, old_pkg); -+ -+ /* the following just returns 0 */ -+ remove_disappeared(conf, pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " installing data files\n"); -+ install_data_files(conf, pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " resolving conf files\n"); -+ resolve_conffiles(conf, pkg); -+ -+ pkg->state_status = SS_UNPACKED; -+ -+ if (old_pkg) { -+ old_pkg->state_status = SS_NOT_INSTALLED; -+ } -+ -+ time(&pkg->installed_time); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " cleanup temp files\n"); -+ cleanup_temporary_files(conf, pkg); -+ -+ if (pkg->parent) -+ pkg->parent->state_status = pkg->state_status; -+ } -+ return 0; -+} -+ -+int ipkg_process_actions_unwind_prerm(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_install) -+{ -+ int i; -+ /* now one more pass checking on the ones that need to be installed */ -+ for (i = 0 ; i < pkgs_to_install->len; i++ ) { -+ pkg_t *pkg = pkgs_to_install->pkgs[i]; -+ pkg_t *old_pkg = pkg->old_pkg; -+ -+ if (old_pkg) { -+ if (old_pkg->state_flags & SF_POSTRM_UPGRADE) -+ postrm_upgrade_old_pkg_unwind(conf, pkg, old_pkg); -+ if (old_pkg->state_flags & SF_CHECK_DATA_FILE_CLASHES) -+ check_data_file_clashes_unwind(conf, pkg, old_pkg); -+ if (old_pkg->state_flags & SF_BACKUP_MODIFIED_CONFFILES) -+ backup_modified_conffiles_unwind(conf, pkg, old_pkg); -+ if (old_pkg->state_flags & SF_PREINST_CONFIGURE) -+ preinst_configure_unwind(conf, pkg, old_pkg); -+ if (old_pkg->state_flags & SF_DECONFIGURE_CONFLICTORS) -+ prerm_deconfigure_conflictors_unwind(conf, pkg, replacees); -+ if (old_pkg->state_flags & SF_PRERM_UPGRADE) -+ prerm_upgrade_old_pkg_unwind(conf, pkg, old_pkg); -+ -+ if (old_pkg->state_flags & SF_REMOVED_REPLACEES) -+ remove_installed_replacees_unwind(conf, pkg, old_pkg); -+ -+ } -+ } -+ return 0; -+} -+ -+/* -+ * Perform all the actions. -+ * -+ * pkgs_to_remove are packages marked for removal. -+ * pkgs_superseded are the old packages being replaced by upgrades. -+ * -+ * Assumes pkgs_to_install includes all dependences, recursively, sorted in installable order. -+ */ -+int ipkg_process_actions(ipkg_conf_t *conf, pkg_vec_t *pkgs_to_remove, pkg_vec_t *pkgs_superseded, pkg_vec_t *pkgs_to_install) -+{ -+ int err; -+ int i; -+ -+ err = ipkg_remove_packages(conf, pkgs_to_remove); -+ if (err) return err; -+ -+ err = ipkg_process_actions_sanity_check(conf, pkgs_superseded, pkgs_to_install); -+ if (err) return err; -+ -+ err = ipkg_process_actions_remove_replacees(conf, pkgs_to_install); -+ if (err) goto UNWIND; -+ -+ /* @@@@ look at ipkg_install_pkg for handling replacements */ -+ err = ipkg_process_actions_unpack_packages(conf, pkgs_to_install); -+ if (err) goto UNWIND; -+ -+ /* -+ * Now that we have the packages unpacked, we can look for data -+ * file clashes. First, we mark the files from the superseded -+ * packages as obsolete. Then we scan the files in -+ * pkgs_to_install, and only complain about clashes with -+ * non-obsolete files. -+ */ -+ -+ err = ipkg_process_actions_check_data_file_clashes(conf, pkgs_superseded, pkgs_to_install); -+ if (err) goto UNWIND; -+ -+ /* this was before checking data file clashes */ -+ err = ipkg_process_actions_prerm(conf, pkgs_superseded, pkgs_to_install); -+ if (err) goto UNWIND; -+ -+ /* point of no return: no unwinding after this */ -+ err = ipkg_process_actions_install(conf, pkgs_to_install); -+ if (err) return err; -+ -+ ipkg_message(conf, IPKG_INFO, "Done.\n"); -+ return 0; -+ -+ UNWIND: -+ ipkg_process_actions_unwind(conf, pkgs_to_install); -+ -+ ipkg_message(conf, IPKG_INFO, -+ " cleanup temp files\n"); -+ cleanup_temporary_files(conf, pkg); -+ -+ ipkg_message(conf, IPKG_INFO, -+ "Failed.\n"); -+ return err; -+} -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_install.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.h 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,35 @@ -+/* ipkg_install.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_INSTALL_H -+#define IPKG_INSTALL_H -+ -+#include "pkg.h" -+#include "ipkg_conf.h" -+ -+ipkg_error_t ipkg_install_by_name(ipkg_conf_t *conf, const char *pkg_name); -+ipkg_error_t ipkg_install_multi_by_name(ipkg_conf_t *conf, const char *pkg_name); -+int ipkg_install_from_file(ipkg_conf_t *conf, const char *filename); -+int ipkg_install_pkg(ipkg_conf_t *conf, pkg_t *pkg,int from_upgrading); -+int satisfy_dependencies_for(ipkg_conf_t *conf, pkg_t *pkg); -+ -+int ipkg_satisfy_all_dependences(ipkg_conf_t *conf); -+ -+int pkg_mark_dependencies_for_installation(ipkg_conf_t *conf, pkg_t *pkg_name, pkg_vec_t *pkgs_needed); -+int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_message.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,61 @@ -+/* ipkg_message.c - the itsy package management system -+ -+ Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net> -+ -+ 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. -+*/ -+ -+ -+#include "ipkg.h" -+#include "ipkg_conf.h" -+#include "ipkg_message.h" -+ -+#ifndef IPKG_LIB -+ -+void -+ipkg_message (ipkg_conf_t * conf, message_level_t level, char *fmt, ...) -+{ -+ va_list ap; -+ -+ if (conf && (conf->verbosity < level)) -+ { -+ return; -+ } -+ else -+ { -+ -+ va_start (ap, fmt); -+ vprintf (fmt, ap); -+ va_end (ap); -+ } -+} -+ -+#else -+ -+#include "libipkg.h" -+ -+//#define ipkg_message(conf, level, fmt, arg...) ipkg_cb_message(conf, level, fmt, ## arg) -+ -+void -+ipkg_message (ipkg_conf_t * conf, message_level_t level, char *fmt, ...) -+{ -+ va_list ap; -+ char ts[256]; -+ -+ if (ipkg_cb_message) -+ { -+ va_start (ap, fmt); -+ vsnprintf (ts,256,fmt, ap); -+ va_end (ap); -+ ipkg_cb_message(conf,level,ts); -+ } -+} -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_message.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,32 @@ -+/* ipkg_message.h - the itsy package management system -+ -+ Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net> -+ -+ 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_MESSAGE_H_ -+#define _IPKG_MESSAGE_H_ -+ -+#include "ipkg.h" -+#include "ipkg_conf.h" -+ -+typedef enum { -+ IPKG_ERROR, /* error conditions */ -+ IPKG_NOTICE, /* normal but significant condition */ -+ IPKG_INFO, /* informational message */ -+ IPKG_DEBUG, /* debug level message */ -+ IPKG_DEBUG2, /* more debug level message */ -+} message_level_t; -+ -+extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...); -+ -+#endif /* _IPKG_MESSAGE_H_ */ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_remove.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.c 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,383 @@ -+/* ipkg_remove.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include "ipkg_message.h" -+ -+#include <glob.h> -+ -+#include "ipkg_remove.h" -+ -+#include "file_util.h" -+#include "sprintf_alloc.h" -+#include "str_util.h" -+ -+#include "ipkg_cmd.h" -+ -+/* -+ * Returns number of the number of packages depending on the packages provided by this package. -+ * Every package implicitly provides itself. -+ */ -+int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents) -+{ -+ int nprovides = pkg->provides_count; -+ abstract_pkg_t **provides = pkg->provides; -+ int n_installed_dependents = 0; -+ int i; -+ for (i = 0; i <= nprovides; i++) { -+ abstract_pkg_t *providee = provides[i]; -+ abstract_pkg_t **dependers = providee->depended_upon_by; -+ abstract_pkg_t *dep_ab_pkg; -+ if (dependers == NULL) -+ continue; -+ while ((dep_ab_pkg = *dependers++) != NULL) { -+ if (dep_ab_pkg->state_status == SS_INSTALLED){ -+ n_installed_dependents++; -+ } -+ } -+ -+ } -+ /* if caller requested the set of installed dependents */ -+ if (pdependents) { -+ int p = 0; -+ abstract_pkg_t **dependents = (abstract_pkg_t **)malloc((n_installed_dependents+1)*sizeof(abstract_pkg_t *)); -+ -+ if ( dependents == NULL ){ -+ fprintf(stderr,"%s Unable to allocate memory. REPORT THIS BUG IN BUGZILLA PLEASE\n", __FUNCTION__); -+ return -1; -+ } -+ -+ *pdependents = dependents; -+ for (i = 0; i <= nprovides; i++) { -+ abstract_pkg_t *providee = provides[i]; -+ abstract_pkg_t **dependers = providee->depended_upon_by; -+ abstract_pkg_t *dep_ab_pkg; -+ if (dependers == NULL) -+ continue; -+ while ((dep_ab_pkg = *dependers++) != NULL) { -+ if (dep_ab_pkg->state_status == SS_INSTALLED && !(dep_ab_pkg->state_flag & SF_MARKED)) { -+ dependents[p++] = dep_ab_pkg; -+ dep_ab_pkg->state_flag |= SF_MARKED; -+ } -+ } -+ } -+ dependents[p] = NULL; -+ /* now clear the marks */ -+ for (i = 0; i < p; i++) { -+ abstract_pkg_t *dep_ab_pkg = dependents[i]; -+ dep_ab_pkg->state_flag &= ~SF_MARKED; -+ } -+ } -+ return n_installed_dependents; -+} -+ -+int ipkg_remove_dependent_pkgs (ipkg_conf_t *conf, pkg_t *pkg, abstract_pkg_t **dependents) -+{ -+ int i; -+ int a; -+ int count; -+ pkg_vec_t *dependent_pkgs = pkg_vec_alloc(); -+ abstract_pkg_t * ab_pkg; -+ -+ if((ab_pkg = pkg->parent) == NULL){ -+ fprintf(stderr, "%s: unable to get dependent pkgs. pkg %s isn't in hash table\n", -+ __FUNCTION__, pkg->name); -+ return 0; -+ } -+ -+ if (dependents == NULL) -+ return 0; -+ -+ // here i am using the dependencies_checked -+ if (ab_pkg->dependencies_checked == 2) // variable to make out whether this package -+ return 0; // has already been encountered in the process -+ // of marking packages for removal - Karthik -+ ab_pkg->dependencies_checked = 2; -+ -+ i = 0; -+ count = 1; -+ while (dependents [i] != NULL) { -+ abstract_pkg_t *dep_ab_pkg = dependents[i]; -+ -+ if (dep_ab_pkg->dependencies_checked == 2){ -+ i++; -+ continue; -+ } -+ if (dep_ab_pkg->state_status == SS_INSTALLED) { -+ for (a = 0; a < dep_ab_pkg->pkgs->len; a++) { -+ pkg_t *dep_pkg = dep_ab_pkg->pkgs->pkgs[a]; -+ if (dep_pkg->state_status == SS_INSTALLED) { -+ pkg_vec_insert(dependent_pkgs, dep_pkg); -+ count++; -+ } -+ } -+ } -+ i++; -+ /* 1 - to keep track of visited ab_pkgs when checking for possiblility of a broken removal of pkgs. -+ * 2 - to keep track of pkgs whose deps have been checked alrdy - Karthik */ -+ } -+ -+ if (count == 1) -+ return 0; -+ -+ -+ for (i = 0; i < dependent_pkgs->len; i++) { -+ int err = ipkg_remove_pkg(conf, dependent_pkgs->pkgs[i],0); -+ if (err) -+ return err; -+ } -+ return 0; -+} -+ -+static int user_prefers_removing_dependents(ipkg_conf_t *conf, abstract_pkg_t *abpkg, pkg_t *pkg, abstract_pkg_t **dependents) -+{ -+ abstract_pkg_t *dep_ab_pkg; -+ ipkg_message(conf, IPKG_ERROR, "Package %s is depended upon by packages:\n", pkg->name); -+ while ((dep_ab_pkg = *dependents++) != NULL) { -+ if (dep_ab_pkg->state_status == SS_INSTALLED) -+ ipkg_message(conf, IPKG_ERROR, "\t%s\n", dep_ab_pkg->name); -+ } -+ ipkg_message(conf, IPKG_ERROR, "These might cease to work if package %s is removed.\n\n", pkg->name); -+ ipkg_message(conf, IPKG_ERROR, ""); -+ ipkg_message(conf, IPKG_ERROR, "You can force removal of this package with -force-depends.\n"); -+ ipkg_message(conf, IPKG_ERROR, "You can force removal of this package and its dependents\n"); -+ ipkg_message(conf, IPKG_ERROR, "with -force-removal-of-dependent-packages or -recursive\n"); -+ ipkg_message(conf, IPKG_ERROR, "or by setting option force_removal_of_dependent_packages\n"); -+ ipkg_message(conf, IPKG_ERROR, "in ipkg.conf.\n"); -+ return 0; -+} -+ -+int ipkg_remove_pkg(ipkg_conf_t *conf, pkg_t *pkg,int message) -+{ -+/* Actually, when "message == 1" I have been called from an upgrade, and not from a normal remove -+ thus I wan't check for essential, as I'm upgrading. -+ I hope it won't break anything :) -+*/ -+ int err; -+ abstract_pkg_t *parent_pkg = NULL; -+ -+ if (pkg->essential && !message) { -+ if (conf->force_removal_of_essential_packages) { -+ fprintf(stderr, "WARNING: Removing essential package %s under your coercion.\n" -+ "\tIf your system breaks, you get to keep both pieces\n", -+ pkg->name); -+ } else { -+ fprintf(stderr, "ERROR: Refusing to remove essential package %s.\n" -+ "\tRemoving an essential package may lead to an unusable system, but if\n" -+ "\tyou enjoy that kind of pain, you can force ipkg to proceed against\n" -+ "\tits will with the option: -force-removal-of-essential-packages\n", -+ pkg->name); -+ return IPKG_PKG_IS_ESSENTIAL; -+ } -+ } -+ -+ if ((parent_pkg = pkg->parent) == NULL) -+ return 0; -+ -+ /* only attempt to remove dependent installed packages if -+ * force_depends is not specified or the package is being -+ * replaced. -+ */ -+ if (!conf->force_depends -+ && !(pkg->state_flag & SF_REPLACE)) { -+ abstract_pkg_t **dependents; -+ int has_installed_dependents = -+ pkg_has_installed_dependents(conf, parent_pkg, pkg, &dependents); -+ -+ if (has_installed_dependents) { -+ /* -+ * if this package is depended up by others, then either we should -+ * not remove it or we should remove it and all of its dependents -+ */ -+ -+ if (!conf->force_removal_of_dependent_packages -+ && !user_prefers_removing_dependents(conf, parent_pkg, pkg, dependents)) { -+ return IPKG_PKG_HAS_DEPENDENTS; -+ } -+ -+ /* remove packages depending on this package - Karthik */ -+ err = ipkg_remove_dependent_pkgs (conf, pkg, dependents); -+ free(dependents); -+ if (err) return err; -+ } -+ } -+ -+ if ( message==0 ){ -+ printf("Removing package %s from %s...\n", pkg->name, pkg->dest->name); -+ fflush(stdout); -+ } -+ pkg->state_flag |= SF_FILELIST_CHANGED; -+ -+ pkg->state_want = SW_DEINSTALL; -+ ipkg_state_changed++; -+ -+ pkg_run_script(conf, pkg, "prerm", "remove"); -+ -+ /* DPKG_INCOMPATIBILITY: dpkg is slightly different here. It -+ maintains an empty filelist rather than deleting it. That seems -+ like a big pain, and I don't see that that should make a big -+ difference, but for anyone who wants tighter compatibility, -+ feel free to fix this. */ -+ remove_data_files_and_list(conf, pkg); -+ -+ pkg_run_script(conf, pkg, "postrm", "remove"); -+ -+ remove_maintainer_scripts_except_postrm(conf, pkg); -+ -+ /* Aman Gupta - Since ipkg is made for handheld devices with limited -+ * space, it doesn't make sense to leave extra configurations, files, -+ * and maintainer scripts left around. So, we make remove like purge, -+ * and take out all the crap :) */ -+ -+ remove_postrm(conf, pkg); -+ pkg->state_status = SS_NOT_INSTALLED; -+ -+ if (parent_pkg) -+ parent_pkg->state_status = SS_NOT_INSTALLED; -+ -+ return 0; -+} -+ -+int ipkg_purge_pkg(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ ipkg_remove_pkg(conf, pkg,0); -+ return 0; -+} -+ -+int remove_data_files_and_list(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ str_list_t installed_dirs; -+ str_list_t *installed_files; -+ str_list_elt_t *iter; -+ char *file_name; -+ conffile_t *conffile; -+ int removed_a_dir; -+ pkg_t *owner; -+ -+ str_list_init(&installed_dirs); -+ installed_files = pkg_get_installed_files(pkg); -+ -+ for (iter = installed_files->head; iter; iter = iter->next) { -+ file_name = iter->data; -+ -+ if (file_is_dir(file_name)) { -+ str_list_append(&installed_dirs, strdup(file_name)); -+ continue; -+ } -+ -+ conffile = pkg_get_conffile(pkg, file_name); -+ if (conffile) { -+ /* XXX: QUESTION: Is this right? I figure we only need to -+ save the conffile if it has been modified. Is that what -+ dpkg does? Or does dpkg preserve all conffiles? If so, -+ this seems like a better thing to do to conserve -+ space. */ -+ if (conffile_has_been_modified(conf, conffile)) { -+ printf(" not deleting modified conffile %s\n", file_name); -+ fflush(stdout); -+ continue; -+ } -+ } -+ -+ ipkg_message(conf, IPKG_INFO, " deleting %s (noaction=%d)\n", file_name, conf->noaction); -+ if (!conf->noaction) -+ unlink(file_name); -+ } -+ -+ if (!conf->noaction) { -+ do { -+ removed_a_dir = 0; -+ for (iter = installed_dirs.head; iter; iter = iter->next) { -+ file_name = iter->data; -+ -+ if (rmdir(file_name) == 0) { -+ ipkg_message(conf, IPKG_INFO, " deleting %s\n", file_name); -+ removed_a_dir = 1; -+ str_list_remove(&installed_dirs, &iter); -+ } -+ } -+ } while (removed_a_dir); -+ } -+ -+ pkg_free_installed_files(pkg); -+ /* We have to remove the file list now, so that -+ find_pkg_owning_file does not always just report this package */ -+ pkg_remove_installed_files_list(conf, pkg); -+ -+ /* Don't print warning for dirs that are provided by other packages */ -+ for (iter = installed_dirs.head; iter; iter = iter->next) { -+ file_name = iter->data; -+ -+ owner = file_hash_get_file_owner(conf, file_name); -+ if (owner) { -+ free(iter->data); -+ iter->data = NULL; -+ str_list_remove(&installed_dirs, &iter); -+ } -+ } -+ -+ /* cleanup */ -+ for (iter = installed_dirs.head; iter; iter = iter->next) { -+ free(iter->data); -+ iter->data = NULL; -+ } -+ str_list_deinit(&installed_dirs); -+ -+ return 0; -+} -+ -+int remove_maintainer_scripts_except_postrm(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int i, err; -+ char *globpattern; -+ glob_t globbuf; -+ -+ if (conf->noaction) return 0; -+ -+ sprintf_alloc(&globpattern, "%s/%s.*", -+ pkg->dest->info_dir, pkg->name); -+ err = glob(globpattern, 0, NULL, &globbuf); -+ free(globpattern); -+ if (err) { -+ return 0; -+ } -+ -+ for (i = 0; i < globbuf.gl_pathc; i++) { -+ if (str_ends_with(globbuf.gl_pathv[i], ".postrm")) { -+ continue; -+ } -+ ipkg_message(conf, IPKG_INFO, " deleting %s\n", globbuf.gl_pathv[i]); -+ unlink(globbuf.gl_pathv[i]); -+ } -+ globfree(&globbuf); -+ -+ return 0; -+} -+ -+int remove_postrm(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ char *postrm_file_name; -+ -+ if (conf->noaction) return 0; -+ -+ sprintf_alloc(&postrm_file_name, "%s/%s.postrm", -+ pkg->dest->info_dir, pkg->name); -+ unlink(postrm_file_name); -+ free(postrm_file_name); -+ -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_remove.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.h 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,33 @@ -+/* ipkg_remove.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_REMOVE_H -+#define IPKG_REMOVE_H -+ -+#include "pkg.h" -+#include "ipkg_conf.h" -+ -+int ipkg_remove_pkg(ipkg_conf_t *conf, pkg_t *pkg,int message); -+int ipkg_purge_pkg(ipkg_conf_t *conf, pkg_t *pkg); -+int possible_broken_removal_of_packages (ipkg_conf_t *conf, pkg_t *pkg); -+int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents); -+int remove_data_files_and_list(ipkg_conf_t *conf, pkg_t *pkg); -+int remove_maintainer_scripts_except_postrm (ipkg_conf_t *conf, pkg_t *pkg); -+int remove_postrm (ipkg_conf_t *conf, pkg_t *pkg); -+ -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_upgrade.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.c 2006-05-09 02:12:04.000000000 +0200 -@@ -0,0 +1,77 @@ -+/* ipkg_upgrade.c - the itsy package management system -+ -+ Carl D. Worth -+ Copyright (C) 2001 University of Southern California -+ -+ Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net> -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include "ipkg_install.h" -+#include "ipkg_message.h" -+ -+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old) -+{ -+ pkg_t *new; -+ int cmp; -+ char *old_version, *new_version; -+ -+ if (old->state_flag & SF_HOLD) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not upgrading package %s which is marked " -+ "hold (flags=%#x)\n", old->name, old->state_flag); -+ return 0; -+ } -+ -+ new = pkg_hash_fetch_best_installation_candidate_by_name(conf, old->name); -+ if (new == NULL) { -+ old_version = pkg_version_str_alloc(old); -+ ipkg_message(conf, IPKG_NOTICE, -+ "Assuming locally installed package %s (%s) " -+ "is up to date.\n", old->name, old_version); -+ free(old_version); -+ return 0; -+ } -+ -+ old_version = pkg_version_str_alloc(old); -+ new_version = pkg_version_str_alloc(new); -+ -+ cmp = pkg_compare_versions(old, new); -+ ipkg_message(conf, IPKG_DEBUG, -+ "comparing visible versions of pkg %s:" -+ "\n\t%s is installed " -+ "\n\t%s is available " -+ "\n\t%d was comparison result\n", -+ old->name, old_version, new_version, cmp); -+ if (cmp == 0) { -+ ipkg_message(conf, IPKG_INFO, -+ "Package %s (%s) installed in %s is up to date.\n", -+ old->name, old_version, old->dest->name); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp > 0) { -+ ipkg_message(conf, IPKG_NOTICE, -+ "Not downgrading package %s on %s from %s to %s.\n", -+ old->name, old->dest->name, old_version, new_version); -+ free(old_version); -+ free(new_version); -+ return 0; -+ } else if (cmp < 0) { -+ new->dest = old->dest; -+ old->state_want = SW_DEINSTALL; -+ } -+ -+ new->state_flag |= SF_USER; -+ return ipkg_install_pkg(conf, new,1); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_upgrade.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,18 @@ -+/* ipkg_upgrade.c - the itsy package management system -+ -+ Copyright (C) 2003 Daniele Nicolodi <daniele@grinta.net> -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+ -+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_utils.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.c ---- busybox-1.1.2-orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,181 @@ -+/* ipkg_utils.c - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <ctype.h> -+#include <sys/vfs.h> -+ -+#include "ipkg_utils.h" -+#include "pkg.h" -+#include "pkg_hash.h" -+ -+struct errlist* error_list; -+ -+int get_available_blocks(char * filesystem) -+{ -+ struct statfs sfs; -+ -+ if(statfs(filesystem, &sfs)){ -+ fprintf(stderr, "bad statfs\n"); -+ return 0; -+ } -+ /* fprintf(stderr, "reported fs type %x\n", sfs.f_type); */ -+ return ((sfs.f_bavail * sfs.f_bsize) / 1024); -+} -+ -+char **read_raw_pkgs_from_file(const char *file_name) -+{ -+ FILE *fp; -+ char **ret; -+ -+ if(!(fp = fopen(file_name, "r"))){ -+ fprintf(stderr, "can't get %s open for read\n", file_name); -+ return NULL; -+ } -+ -+ ret = read_raw_pkgs_from_stream(fp); -+ -+ fclose(fp); -+ -+ return ret; -+} -+ -+char **read_raw_pkgs_from_stream(FILE *fp) -+{ -+ char **raw = NULL, *buf, *scout; -+ int count = 0; -+ size_t size = 512; -+ -+ buf = malloc (size); -+ -+ while (fgets(buf, size, fp)) { -+ while (strlen (buf) == (size - 1) -+ && buf[size-2] != '\n') { -+ size_t o = size - 1; -+ size *= 2; -+ buf = realloc (buf, size); -+ if (fgets (buf + o, size - o, fp) == NULL) -+ break; -+ } -+ -+ if(!(count % 50)) -+ raw = realloc(raw, (count + 50) * sizeof(char *)); -+ -+ if((scout = strchr(buf, '\n'))) -+ *scout = '\0'; -+ -+ raw[count++] = strdup(buf); -+ } -+ -+ raw = realloc(raw, (count + 1) * sizeof(char *)); -+ raw[count] = NULL; -+ -+ free (buf); -+ -+ return raw; -+} -+ -+/* something to remove whitespace, a hash pooper */ -+char *trim_alloc(char *line) -+{ -+ char *new; -+ char *dest, *src, *end; -+ -+ new = malloc(strlen(line) + 1); -+ if ( new == NULL ){ -+ fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__); -+ return NULL; -+ } -+ dest = new, src = line, end = line + (strlen(line) - 1); -+ -+ /* remove it from the front */ -+ while(src && -+ isspace(*src) && -+ *src) -+ src++; -+ /* and now from the back */ -+ while((end > src) && -+ isspace(*end)) -+ end--; -+ end++; -+ *end = '\0'; -+ strcpy(new, src); -+ /* this does from the first space -+ * blasting away any versions stuff in depends -+ while(src && -+ !isspace(*src) && -+ *src) -+ *dest++ = *src++; -+ *dest = '\0'; -+ */ -+ -+ return new; -+} -+ -+int line_is_blank(const char *line) -+{ -+ const char *s; -+ -+ for (s = line; *s; s++) { -+ if (!isspace(*s)) -+ return 0; -+ } -+ return 1; -+} -+ -+void push_error_list(struct errlist ** errors, char * msg){ -+ struct errlist *err_lst_tmp; -+ -+ -+ err_lst_tmp = malloc ( sizeof (err_lst_tmp) ); -+ err_lst_tmp->errmsg=strdup(msg) ; -+ err_lst_tmp->next = *errors; -+ *errors = err_lst_tmp; -+} -+ -+ -+void reverse_error_list(struct errlist **errors){ -+ struct errlist *result=NULL; -+ struct errlist *current= *errors; -+ struct errlist *next; -+ -+ while ( current != NULL ) { -+ next = current->next; -+ current->next=result; -+ result=current; -+ current=next; -+ } -+ *errors=result; -+ -+} -+ -+ -+void free_error_list(struct errlist **errors){ -+ struct errlist *current = *errors; -+ -+ while (current != NULL) { -+ free(current->errmsg); -+ current = (*errors)->next; -+ free(*errors); -+ *errors = current; -+ } -+ -+ -+} -+ -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/ipkg_utils.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.h ---- busybox-1.1.2-orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,29 @@ -+/* ipkg_utils.h - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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_UTILS_H -+#define IPKG_UTILS_H -+ -+#include "pkg.h" -+ -+int get_available_blocks(char * filesystem); -+char **read_raw_pkgs_from_file(const char *file_name); -+char **read_raw_pkgs_from_stream(FILE *fp); -+char *trim_alloc(char * line); -+int line_is_blank(const char *line); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/libipkg.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c ---- busybox-1.1.2-orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,527 @@ -+/* ipkglib.c - the itsy package management system -+ -+ Florina Boor -+ -+ Copyright (C) 2003 kernel concepts -+ -+ 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. -+*/ -+ -+#ifdef IPKG_LIB -+ -+#include "ipkg.h" -+#include "ipkg_includes.h" -+#include "libipkg.h" -+ -+#include "args.h" -+#include "ipkg_conf.h" -+#include "ipkg_cmd.h" -+#include "file_util.h" -+ -+ -+ -+ipkg_message_callback ipkg_cb_message = NULL; -+ipkg_response_callback ipkg_cb_response = NULL; -+ipkg_status_callback ipkg_cb_status = NULL; -+ipkg_list_callback ipkg_cb_list = NULL; -+ -+ -+int -+ipkg_init (ipkg_message_callback mcall, -+ ipkg_response_callback rcall, -+ args_t * args) -+{ -+ ipkg_cb_message = mcall; -+ ipkg_cb_response = rcall; -+ -+ args_init (args); -+ -+ return 0; -+} -+ -+ -+int -+ipkg_deinit (args_t * args) -+{ -+ args_deinit (args); -+ ipkg_cb_message = NULL; -+ ipkg_cb_response = NULL; -+ -+ /* place other cleanup stuff here */ -+ -+ return 0; -+} -+ -+ -+int -+ipkg_packages_list(args_t *args, -+ const char *packages, -+ ipkg_list_callback cblist, -+ void *userdata) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ ipkg_cb_list = cblist; -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("list"); -+ if (packages) -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata); -+ else -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata); -+ ipkg_cb_list = NULL; -+ ipkg_conf_deinit (&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_status(args_t *args, -+ const char *packages, -+ ipkg_status_callback cbstatus, -+ void *userdata) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ ipkg_cb_status = cbstatus; -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("status"); -+ if (packages) -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata); -+ else -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata); -+ -+ ipkg_cb_status = NULL; -+ ipkg_conf_deinit (&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_info(args_t *args, -+ const char *packages, -+ ipkg_status_callback cbstatus, -+ void *userdata) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ ipkg_cb_status = cbstatus; -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("info"); -+ if (packages) -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &packages, userdata); -+ else -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, userdata); -+ -+ ipkg_cb_status = NULL; -+ ipkg_conf_deinit (&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_install (args_t * args, const char *name) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!name || !strlen (name)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("install"); -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_remove(args_t *args, const char *name, int purge) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!name || !strlen (name)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ if (purge) -+ cmd = ipkg_cmd_find ("purge"); -+ else -+ cmd = ipkg_cmd_find ("remove"); -+ -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_lists_update(args_t *args) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("update"); -+ -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_upgrade(args_t *args) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("upgrade"); -+ -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 0, NULL, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_packages_download (args_t * args, const char *name) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!name || !strlen (name)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("download"); -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_package_files(args_t *args, -+ const char *name, -+ ipkg_list_callback cblist, -+ void *userdata) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!name || !strlen (name)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ ipkg_cb_list = cblist; -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("files"); -+ -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &name, userdata); -+ -+ ipkg_cb_list = NULL; -+ ipkg_conf_deinit(&ipkg_conf); -+ return (err); -+} -+ -+ -+int -+ipkg_file_search(args_t *args, -+ const char *file, -+ ipkg_list_callback cblist, -+ void *userdata) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!file || !strlen (file)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ ipkg_cb_list = cblist; -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find ("search"); -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, userdata); -+ -+ ipkg_cb_list = NULL; -+ ipkg_conf_deinit(&ipkg_conf); -+ return(err); -+} -+ -+ -+int -+ipkg_file_what(args_t *args, const char *file, const char* command) -+{ -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ int err; -+ -+ /* this error should be handled in application */ -+ if (!file || !strlen (file)) -+ return (-1); -+ -+ err = ipkg_conf_init (&ipkg_conf, args); -+ if (err) -+ { -+ return err; -+ } -+ -+ /* we need to do this because of static declarations, -+ * maybe a good idea to change */ -+ cmd = ipkg_cmd_find (command); -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, 1, &file, NULL); -+ -+ ipkg_conf_deinit(&ipkg_conf); -+ return(err); -+} -+ -+#define ipkg_package_whatdepends(args,file) ipkg_file_what(args,file,"whatdepends") -+#define ipkg_package_whatrecommends(args, file) ipkg_file_what(args,file,"whatrecommends") -+#define ipkg_package_whatprovides(args, file) ipkg_file_what(args,file,"whatprovides") -+#define ipkg_package_whatconflicts(args, file) ipkg_file_what(args,file,"whatconflicts") -+#define ipkg_package_whatreplaces(args, file) ipkg_file_what(args,file,"whatreplaces") -+ -+ -+int default_ipkg_message_callback(ipkg_conf_t *conf, message_level_t level, -+ char *msg) -+{ -+ if (conf && (conf->verbosity < level)) { -+ return 0; -+ } else { -+#ifdef IPKG_LIB -+ if ( level == IPKG_ERROR ){ -+ push_error_list(&error_list, msg); -+// printf(msg); -+ } else -+#endif -+ printf(msg); -+ } -+ return 0; -+} -+ -+int default_ipkg_list_callback(char *name, char *desc, char *version, -+ pkg_state_status_t status, void *userdata) -+{ -+ if (desc) -+ printf("%s - %s - %s\n", name, version, desc); -+ else -+ printf("%s - %s\n", name, version); -+ return 0; -+} -+ -+int default_ipkg_files_callback(char *name, char *desc, char *version, -+ pkg_state_status_t status, void *userdata) -+{ -+ if (desc) -+ printf("%s\n", desc); -+ return 0; -+} -+ -+int default_ipkg_status_callback(char *name, int istatus, char *desc, -+ void *userdata) -+{ -+ printf("%s\n", desc); -+ return 0; -+} -+ -+char* default_ipkg_response_callback(char *question) -+{ -+ char *response = NULL; -+ printf(question); -+ fflush(stdout); -+ do { -+ response = (char *)file_read_line_alloc(stdin); -+ } while (response == NULL); -+ return response; -+} -+ -+/* This is used for backward compatibility */ -+int -+ipkg_op (int argc, char *argv[]) -+{ -+ int err, optind; -+ args_t args; -+ char *cmd_name; -+ ipkg_cmd_t *cmd; -+ ipkg_conf_t ipkg_conf; -+ -+ args_init (&args); -+ -+ optind = args_parse (&args, argc, argv); -+ if (optind == argc || optind < 0) -+ { -+ args_usage ("ipkg must have one sub-command argument"); -+ } -+ -+ cmd_name = argv[optind++]; -+/* Pigi: added a flag to disable the checking of structures if the command does not need to -+ read anything from there. -+*/ -+ if ( !strcmp(cmd_name,"print-architecture") || -+ !strcmp(cmd_name,"print_architecture") || -+ !strcmp(cmd_name,"print-installation-architecture") || -+ !strcmp(cmd_name,"print_installation_architecture") ) -+ args.nocheckfordirorfile = 1; -+ -+/* Pigi: added a flag to disable the reading of feed files if the command does not need to -+ read anything from there. -+*/ -+ if ( !strcmp(cmd_name,"flag") || -+ !strcmp(cmd_name,"configure") || -+ !strcmp(cmd_name,"remove") || -+ !strcmp(cmd_name,"files") || -+ !strcmp(cmd_name,"search") || -+ !strcmp(cmd_name,"compare_versions") || -+ !strcmp(cmd_name,"compare-versions") || -+ !strcmp(cmd_name,"list_installed") || -+ !strcmp(cmd_name,"list-installed") || -+ !strcmp(cmd_name,"status") ) -+ args.noreadfeedsfile = 1; -+ -+ -+ err = ipkg_conf_init (&ipkg_conf, &args); -+ if (err) -+ { -+ return err; -+ } -+ -+ args_deinit (&args); -+ -+ ipkg_cb_message = default_ipkg_message_callback; -+ ipkg_cb_response = default_ipkg_response_callback; -+ ipkg_cb_status = default_ipkg_status_callback; -+ if ( strcmp(cmd_name, "files")==0) -+ ipkg_cb_list = default_ipkg_files_callback; -+ else -+ ipkg_cb_list = default_ipkg_list_callback; -+ -+ cmd = ipkg_cmd_find (cmd_name); -+ if (cmd == NULL) -+ { -+ fprintf (stderr, "%s: unknown sub-command %s\n", argv[0], -+ cmd_name); -+ args_usage (NULL); -+ } -+ -+ if (cmd->requires_args && optind == argc) -+ { -+ fprintf (stderr, -+ "%s: the ``%s'' command requires at least one argument\n", -+ __FUNCTION__, cmd_name); -+ args_usage (NULL); -+ } -+ -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL); -+ -+ ipkg_conf_deinit (&ipkg_conf); -+ -+ return err; -+} -+ -+#endif /* IPKG_LIB */ -diff -ruN busybox-1.1.2-orig/archival/libipkg/libipkg.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.h ---- busybox-1.1.2-orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,87 @@ -+/* ipkglib.h - the itsy package management system -+ -+ Florian Boor <florian.boor@kernelconcepts.de> -+ -+ 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 IPKGLIB_H -+#define IPKGLIB_H -+ -+#ifdef IPKG_LIB -+ -+#include "ipkg_conf.h" -+#include "ipkg_message.h" -+ -+#include "args.h" -+#include "pkg.h" -+ -+typedef int (*ipkg_message_callback)(ipkg_conf_t *conf, message_level_t level, -+ char *msg); -+typedef int (*ipkg_list_callback)(char *name, char *desc, char *version, -+ pkg_state_status_t status, void *userdata); -+typedef int (*ipkg_status_callback)(char *name, int istatus, char *desc, -+ void *userdata); -+typedef char* (*ipkg_response_callback)(char *question); -+ -+extern int ipkg_op(int argc, char *argv[]); /* ipkglib.c */ -+extern int ipkg_init (ipkg_message_callback mcall, -+ ipkg_response_callback rcall, -+ args_t * args); -+ -+extern int ipkg_deinit (args_t *args); -+extern int ipkg_packages_list(args_t *args, -+ const char *packages, -+ ipkg_list_callback cblist, -+ void *userdata); -+extern int ipkg_packages_status(args_t *args, -+ const char *packages, -+ ipkg_status_callback cbstatus, -+ void *userdata); -+extern int ipkg_packages_info(args_t *args, -+ const char *packages, -+ ipkg_status_callback cbstatus, -+ void *userdata); -+extern int ipkg_packages_install(args_t *args, const char *name); -+extern int ipkg_packages_remove(args_t *args, const char *name, int purge); -+extern int ipkg_lists_update(args_t *args); -+extern int ipkg_packages_upgrade(args_t *args); -+extern int ipkg_packages_download(args_t *args, const char *name); -+extern int ipkg_package_files(args_t *args, -+ const char *name, -+ ipkg_list_callback cblist, -+ void *userdata); -+extern int ipkg_file_search(args_t *args, -+ const char *file, -+ ipkg_list_callback cblist, -+ void *userdata); -+extern int ipkg_package_whatdepends(args_t *args, const char *file); -+extern int ipkg_package_whatrecommends(args_t *args, const char *file); -+extern int ipkg_package_whatprovides(args_t *args, const char *file); -+extern int ipkg_package_whatconflicts(args_t *args, const char *file); -+extern int ipkg_package_whatreplaces(args_t *args, const char *file); -+ -+extern ipkg_message_callback ipkg_cb_message; /* ipkglib.c */ -+extern ipkg_response_callback ipkg_cb_response; -+extern ipkg_status_callback ipkg_cb_status; -+extern ipkg_list_callback ipkg_cb_list; -+extern void push_error_list(struct errlist **errors,char * msg); -+extern void reverse_error_list(struct errlist **errors); -+extern void free_error_list(struct errlist **errors); -+ -+#else -+ -+extern int ipkg_op(int argc, char *argv[]); -+ -+#endif -+ -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/md5.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c ---- busybox-1.1.2-orig/archival/libipkg/md5.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,48 @@ -+/* md5.c - wrappers to busybox md5 functions -+ * -+ * Copyright (C) 1995-1999 Free Software Foundation, Inc. -+ * -+ * 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. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software Foundation, -+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ */ -+ -+#include <stdio.h> -+#include "libbb.h" -+ -+#include "md5.h" -+ -+int md5_stream(FILE *stream, void *resblock) -+{ -+ int fd; -+ int sum; -+ -+ if( (fd = fileno(stream)) == -1 ) { -+ bb_error_msg("bad file descriptor"); -+ return 1; -+ } -+ -+ hash_fd(fd, HASH_MD5, (uint8_t *)resblock); -+ -+ return 0; -+} -+ -+void *md5_buffer(const char *buffer, size_t len, void *resblock) -+{ -+ md5_ctx_t md5_cx; -+ -+ md5_begin(&md5_cx); -+ md5_hash(buffer, len, &md5_cx); -+ return md5_end(resblock, &md5_cx); -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/md5.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.h ---- busybox-1.1.2-orig/archival/libipkg/md5.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,35 @@ -+/* md5.h - Compute MD5 checksum of files or strings according to the -+ * definition of MD5 in RFC 1321 from April 1992. -+ * Copyright (C) 1995-1999 Free Software Foundation, Inc. -+ * -+ * 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. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software Foundation, -+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef MD5_H -+#define MD5_H -+ -+/* Compute MD5 message digest for bytes read from STREAM. The -+ resulting message digest number will be written into the 16 bytes -+ beginning at RESBLOCK. */ -+int md5_stream(FILE *stream, void *resblock); -+ -+/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The -+ result is always in little endian byte order, so that a byte-wise -+ output yields to the wanted ASCII representation of the message -+ digest. */ -+void *md5_buffer(const char *buffer, size_t len, void *resblock); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/nv_pair.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair.c ---- busybox-1.1.2-orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,40 @@ -+/* nv_pair.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "nv_pair.h" -+#include "str_util.h" -+ -+int nv_pair_init(nv_pair_t *nv_pair, const char *name, const char *value) -+{ -+ nv_pair->name = str_dup_safe(name); -+ nv_pair->value = str_dup_safe(value); -+ -+ return 0; -+} -+ -+void nv_pair_deinit(nv_pair_t *nv_pair) -+{ -+ free(nv_pair->name); -+ nv_pair->name = NULL; -+ -+ free(nv_pair->value); -+ nv_pair->value = NULL; -+} -+ -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/nv_pair.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair.h ---- busybox-1.1.2-orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,32 @@ -+/* nv_pair.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 NV_PAIR_H -+#define NV_PAIR_H -+ -+typedef struct nv_pair nv_pair_t; -+struct nv_pair -+{ -+ char *name; -+ char *value; -+}; -+ -+int nv_pair_init(nv_pair_t *nv_pair, const char *name, const char *value); -+void nv_pair_deinit(nv_pair_t *nv_pair); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/nv_pair_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.c ---- busybox-1.1.2-orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,98 @@ -+/* nv_pair_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "nv_pair.h" -+#include "void_list.h" -+#include "nv_pair_list.h" -+ -+int nv_pair_list_elt_init(nv_pair_list_elt_t *elt, nv_pair_t *data) -+{ -+ return void_list_elt_init((void_list_elt_t *) elt, data); -+} -+ -+void nv_pair_list_elt_deinit(nv_pair_list_elt_t *elt) -+{ -+ void_list_elt_deinit((void_list_elt_t *) elt); -+} -+ -+int nv_pair_list_init(nv_pair_list_t *list) -+{ -+ return void_list_init((void_list_t *) list); -+} -+ -+void nv_pair_list_deinit(nv_pair_list_t *list) -+{ -+ nv_pair_list_elt_t *iter; -+ nv_pair_t *nv_pair; -+ -+ for (iter = list->head; iter; iter = iter->next) { -+ nv_pair = iter->data; -+ nv_pair_deinit(nv_pair); -+ -+ /* malloced in nv_pair_list_append */ -+ free(nv_pair); -+ iter->data = NULL; -+ } -+ void_list_deinit((void_list_t *) list); -+} -+ -+nv_pair_t *nv_pair_list_append(nv_pair_list_t *list, const char *name, const char *value) -+{ -+ int err; -+ -+ /* freed in nv_pair_list_deinit */ -+ nv_pair_t *nv_pair = malloc(sizeof(nv_pair_t)); -+ -+ if (nv_pair == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ nv_pair_init(nv_pair, name, value); -+ -+ err = void_list_append((void_list_t *) list, nv_pair); -+ if (err) { -+ return NULL; -+ } -+ -+ return nv_pair; -+} -+ -+int nv_pair_list_push(nv_pair_list_t *list, nv_pair_t *data) -+{ -+ return void_list_push((void_list_t *) list, data); -+} -+ -+nv_pair_list_elt_t *nv_pair_list_pop(nv_pair_list_t *list) -+{ -+ return (nv_pair_list_elt_t *) void_list_pop((void_list_t *) list); -+} -+ -+char *nv_pair_list_find(nv_pair_list_t *list, char *name) -+{ -+ nv_pair_list_elt_t *iter; -+ nv_pair_t *nv_pair; -+ -+ for (iter = list->head; iter; iter = iter->next) { -+ nv_pair = iter->data; -+ if (strcmp(nv_pair->name, name) == 0) { -+ return nv_pair->value; -+ } -+ } -+ return NULL; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/nv_pair_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.h ---- busybox-1.1.2-orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,60 @@ -+/* nv_pair_list.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 NV_PAIR_LIST_H -+#define NV_PAIR_LIST_H -+ -+#include "nv_pair.h" -+#include "void_list.h" -+ -+typedef struct nv_pair_list_elt nv_pair_list_elt_t; -+struct nv_pair_list_elt -+{ -+ nv_pair_list_elt_t *next; -+ nv_pair_t *data; -+}; -+ -+typedef struct nv_pair_list nv_pair_list_t; -+struct nv_pair_list -+{ -+ nv_pair_list_elt_t pre_head; -+ nv_pair_list_elt_t *head; -+ nv_pair_list_elt_t *tail; -+}; -+ -+static inline int nv_pair_list_empty(nv_pair_list_t *list) -+{ -+ if (list->head == NULL) -+ return 1; -+ else -+ return 0; -+} -+ -+int nv_pair_list_elt_init(nv_pair_list_elt_t *elt, nv_pair_t *data); -+void nv_pair_list_elt_deinit(nv_pair_list_elt_t *elt); -+ -+int nv_pair_list_init(nv_pair_list_t *list); -+void nv_pair_list_deinit(nv_pair_list_t *list); -+ -+nv_pair_t *nv_pair_list_append(nv_pair_list_t *list, -+ const char *name, const char *value); -+int nv_pair_list_push(nv_pair_list_t *list, nv_pair_t *data); -+nv_pair_list_elt_t *nv_pair_list_pop(nv_pair_list_t *list); -+char *nv_pair_list_find(nv_pair_list_t *list, char *name); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c ---- busybox-1.1.2-orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,1754 @@ -+/* pkg.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include <ctype.h> -+#include <string.h> -+#include <errno.h> -+ -+#include "pkg.h" -+ -+#include "pkg_parse.h" -+#include "pkg_extract.h" -+#include "ipkg_message.h" -+#include "ipkg_utils.h" -+ -+#include "sprintf_alloc.h" -+#include "file_util.h" -+#include "str_util.h" -+#include "xsystem.h" -+#include "ipkg_conf.h" -+ -+typedef struct enum_map enum_map_t; -+struct enum_map -+{ -+ int value; -+ char *str; -+}; -+ -+static const enum_map_t pkg_state_want_map[] = { -+ { SW_UNKNOWN, "unknown"}, -+ { SW_INSTALL, "install"}, -+ { SW_DEINSTALL, "deinstall"}, -+ { SW_PURGE, "purge"} -+}; -+ -+static const enum_map_t pkg_state_flag_map[] = { -+ { SF_OK, "ok"}, -+ { SF_REINSTREQ, "reinstreq"}, -+ { SF_HOLD, "hold"}, -+ { SF_REPLACE, "replace"}, -+ { SF_NOPRUNE, "noprune"}, -+ { SF_PREFER, "prefer"}, -+ { SF_OBSOLETE, "obsolete"}, -+ { SF_USER, "user"}, -+}; -+ -+static const enum_map_t pkg_state_status_map[] = { -+ { SS_NOT_INSTALLED, "not-installed" }, -+ { SS_UNPACKED, "unpacked" }, -+ { SS_HALF_CONFIGURED, "half-configured" }, -+ { SS_INSTALLED, "installed" }, -+ { SS_HALF_INSTALLED, "half-installed" }, -+ { SS_CONFIG_FILES, "config-files" }, -+ { SS_POST_INST_FAILED, "post-inst-failed" }, -+ { SS_REMOVAL_FAILED, "removal-failed" } -+}; -+ -+static int verrevcmp(const char *val, const char *ref); -+ -+ -+pkg_t *pkg_new(void) -+{ -+ pkg_t *pkg; -+ -+ pkg = malloc(sizeof(pkg_t)); -+ if (pkg == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ pkg_init(pkg); -+ -+ return pkg; -+} -+ -+int pkg_init(pkg_t *pkg) -+{ -+ memset(pkg, 0, sizeof(pkg_t)); -+ pkg->name = NULL; -+ pkg->epoch = 0; -+ pkg->version = NULL; -+ pkg->revision = NULL; -+ pkg->familiar_revision = NULL; -+ pkg->dest = NULL; -+ pkg->src = NULL; -+ pkg->architecture = NULL; -+ pkg->maintainer = NULL; -+ pkg->section = NULL; -+ pkg->description = NULL; -+ pkg->state_want = SW_UNKNOWN; -+ pkg->state_flag = SF_OK; -+ pkg->state_status = SS_NOT_INSTALLED; -+ pkg->depends_str = NULL; -+ pkg->provides_str = NULL; -+ pkg->depends_count = 0; -+ pkg->depends = NULL; -+ pkg->suggests_str = NULL; -+ pkg->recommends_str = NULL; -+ pkg->suggests_count = 0; -+ pkg->recommends_count = 0; -+ -+ /* Abhaya: added init for conflicts fields */ -+ pkg->conflicts = NULL; -+ pkg->conflicts_count = 0; -+ -+ /* added for replaces. Jamey 7/23/2002 */ -+ pkg->replaces = NULL; -+ pkg->replaces_count = 0; -+ -+ pkg->pre_depends_count = 0; -+ pkg->pre_depends_str = NULL; -+ pkg->provides_count = 0; -+ pkg->provides = NULL; -+ pkg->filename = NULL; -+ pkg->local_filename = NULL; -+ pkg->tmp_unpack_dir = NULL; -+ pkg->md5sum = NULL; -+ pkg->size = NULL; -+ pkg->installed_size = NULL; -+ pkg->priority = NULL; -+ pkg->source = NULL; -+ conffile_list_init(&pkg->conffiles); -+ pkg->installed_files = NULL; -+ pkg->installed_files_ref_cnt = 0; -+ pkg->essential = 0; -+ pkg->provided_by_hand = 0; -+ -+ return 0; -+} -+ -+void pkg_deinit(pkg_t *pkg) -+{ -+ free(pkg->name); -+ pkg->name = NULL; -+ pkg->epoch = 0; -+ free(pkg->version); -+ pkg->version = NULL; -+ /* revision and familiar_revision share storage with version, so -+ don't free */ -+ pkg->revision = NULL; -+ pkg->familiar_revision = NULL; -+ /* owned by ipkg_conf_t */ -+ pkg->dest = NULL; -+ /* owned by ipkg_conf_t */ -+ pkg->src = NULL; -+ free(pkg->architecture); -+ pkg->architecture = NULL; -+ free(pkg->maintainer); -+ pkg->maintainer = NULL; -+ free(pkg->section); -+ pkg->section = NULL; -+ free(pkg->description); -+ pkg->description = NULL; -+ pkg->state_want = SW_UNKNOWN; -+ pkg->state_flag = SF_OK; -+ pkg->state_status = SS_NOT_INSTALLED; -+ free(pkg->depends_str); -+ pkg->depends_str = NULL; -+ free(pkg->provides_str); -+ pkg->provides_str = NULL; -+ pkg->depends_count = 0; -+ /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->depends ? */ -+ pkg->pre_depends_count = 0; -+ free(pkg->pre_depends_str); -+ pkg->pre_depends_str = NULL; -+ pkg->provides_count = 0; -+ /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->provides ? */ -+ /* XXX: CLEANUP: MEMORY_LEAK: how to free up pkg->suggests ? */ -+ free(pkg->filename); -+ pkg->filename = NULL; -+ free(pkg->local_filename); -+ pkg->local_filename = NULL; -+ /* CLEANUP: It'd be nice to pullin the cleanup function from -+ ipkg_install.c here. See comment in -+ ipkg_install.c:cleanup_temporary_files */ -+ free(pkg->tmp_unpack_dir); -+ pkg->tmp_unpack_dir = NULL; -+ free(pkg->md5sum); -+ pkg->md5sum = NULL; -+ free(pkg->size); -+ pkg->size = NULL; -+ free(pkg->installed_size); -+ pkg->installed_size = NULL; -+ free(pkg->priority); -+ pkg->priority = NULL; -+ free(pkg->source); -+ pkg->source = NULL; -+ conffile_list_deinit(&pkg->conffiles); -+ /* XXX: QUESTION: Is forcing this to 1 correct? I suppose so, -+ since if they are calling deinit, they should know. Maybe do an -+ assertion here instead? */ -+ pkg->installed_files_ref_cnt = 1; -+ pkg_free_installed_files(pkg); -+ pkg->essential = 0; -+} -+ -+int pkg_init_from_file(pkg_t *pkg, const char *filename) -+{ -+ int err; -+ char **raw; -+ FILE *control_file; -+ -+ err = pkg_init(pkg); -+ if (err) { return err; } -+ -+ pkg->local_filename = strdup(filename); -+ -+ control_file = tmpfile(); -+ err = pkg_extract_control_file_to_stream(pkg, control_file); -+ if (err) { return err; } -+ -+ rewind(control_file); -+ raw = read_raw_pkgs_from_stream(control_file); -+ pkg_parse_raw(pkg, &raw, NULL, NULL); -+ -+ fclose(control_file); -+ -+ return 0; -+} -+ -+/* Merge any new information in newpkg into oldpkg */ -+/* XXX: CLEANUP: This function shouldn't actually modify anything in -+ newpkg, but should leave it usable. This rework is so that -+ pkg_hash_insert doesn't clobber the pkg that you pass into it. */ -+/* -+ * uh, i thought that i had originally written this so that it took -+ * two pkgs and returned a new one? we can do that again... -sma -+ */ -+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status) -+{ -+ if (oldpkg == newpkg) { -+ return 0; -+ } -+ -+ if (!oldpkg->src) -+ oldpkg->src = newpkg->src; -+ if (!oldpkg->dest) -+ oldpkg->dest = newpkg->dest; -+ if (!oldpkg->architecture) -+ oldpkg->architecture = str_dup_safe(newpkg->architecture); -+ if (!oldpkg->arch_priority) -+ oldpkg->arch_priority = newpkg->arch_priority; -+ if (!oldpkg->section) -+ oldpkg->section = str_dup_safe(newpkg->section); -+ if(!oldpkg->maintainer) -+ oldpkg->maintainer = str_dup_safe(newpkg->maintainer); -+ if(!oldpkg->description) -+ oldpkg->description = str_dup_safe(newpkg->description); -+ if (set_status) { -+ /* merge the state_flags from the new package */ -+ oldpkg->state_want = newpkg->state_want; -+ oldpkg->state_status = newpkg->state_status; -+ oldpkg->state_flag = newpkg->state_flag; -+ } else { -+ if (oldpkg->state_want == SW_UNKNOWN) -+ oldpkg->state_want = newpkg->state_want; -+ if (oldpkg->state_status == SS_NOT_INSTALLED) -+ oldpkg->state_status = newpkg->state_status; -+ oldpkg->state_flag |= newpkg->state_flag; -+ } -+ -+ if (!oldpkg->depends_str && !oldpkg->pre_depends_str && !oldpkg->recommends_str && !oldpkg->suggests_str) { -+ oldpkg->depends_str = newpkg->depends_str; -+ newpkg->depends_str = NULL; -+ oldpkg->depends_count = newpkg->depends_count; -+ newpkg->depends_count = 0; -+ -+ oldpkg->depends = newpkg->depends; -+ newpkg->depends = NULL; -+ -+ oldpkg->pre_depends_str = newpkg->pre_depends_str; -+ newpkg->pre_depends_str = NULL; -+ oldpkg->pre_depends_count = newpkg->pre_depends_count; -+ newpkg->pre_depends_count = 0; -+ -+ oldpkg->recommends_str = newpkg->recommends_str; -+ newpkg->recommends_str = NULL; -+ oldpkg->recommends_count = newpkg->recommends_count; -+ newpkg->recommends_count = 0; -+ -+ oldpkg->suggests_str = newpkg->suggests_str; -+ newpkg->suggests_str = NULL; -+ oldpkg->suggests_count = newpkg->suggests_count; -+ newpkg->suggests_count = 0; -+ } -+ -+ if (!oldpkg->provides_str) { -+ oldpkg->provides_str = newpkg->provides_str; -+ newpkg->provides_str = NULL; -+ oldpkg->provides_count = newpkg->provides_count; -+ newpkg->provides_count = 0; -+ -+ oldpkg->provides = newpkg->provides; -+ newpkg->provides = NULL; -+ } -+ -+ if (!oldpkg->conflicts_str) { -+ oldpkg->conflicts_str = newpkg->conflicts_str; -+ newpkg->conflicts_str = NULL; -+ oldpkg->conflicts_count = newpkg->conflicts_count; -+ newpkg->conflicts_count = 0; -+ -+ oldpkg->conflicts = newpkg->conflicts; -+ newpkg->conflicts = NULL; -+ } -+ -+ if (!oldpkg->replaces_str) { -+ oldpkg->replaces_str = newpkg->replaces_str; -+ newpkg->replaces_str = NULL; -+ oldpkg->replaces_count = newpkg->replaces_count; -+ newpkg->replaces_count = 0; -+ -+ oldpkg->replaces = newpkg->replaces; -+ newpkg->replaces = NULL; -+ } -+ -+ if (!oldpkg->filename) -+ oldpkg->filename = str_dup_safe(newpkg->filename); -+ if (0) -+ fprintf(stdout, "pkg=%s old local_filename=%s new local_filename=%s\n", -+ oldpkg->name, oldpkg->local_filename, newpkg->local_filename); -+ if (!oldpkg->local_filename) -+ oldpkg->local_filename = str_dup_safe(newpkg->local_filename); -+ if (!oldpkg->tmp_unpack_dir) -+ oldpkg->tmp_unpack_dir = str_dup_safe(newpkg->tmp_unpack_dir); -+ if (!oldpkg->md5sum) -+ oldpkg->md5sum = str_dup_safe(newpkg->md5sum); -+ if (!oldpkg->size) -+ oldpkg->size = str_dup_safe(newpkg->size); -+ if (!oldpkg->installed_size) -+ oldpkg->installed_size = str_dup_safe(newpkg->installed_size); -+ if (!oldpkg->priority) -+ oldpkg->priority = str_dup_safe(newpkg->priority); -+ if (!oldpkg->source) -+ oldpkg->source = str_dup_safe(newpkg->source); -+ if (oldpkg->conffiles.head == NULL){ -+ oldpkg->conffiles = newpkg->conffiles; -+ conffile_list_init(&newpkg->conffiles); -+ } -+ if (!oldpkg->installed_files){ -+ oldpkg->installed_files = newpkg->installed_files; -+ oldpkg->installed_files_ref_cnt = newpkg->installed_files_ref_cnt; -+ newpkg->installed_files = NULL; -+ } -+ if (!oldpkg->essential) -+ oldpkg->essential = newpkg->essential; -+ -+ return 0; -+} -+ -+abstract_pkg_t *abstract_pkg_new(void) -+{ -+ abstract_pkg_t * ab_pkg; -+ -+ ab_pkg = malloc(sizeof(abstract_pkg_t)); -+ -+ if (ab_pkg == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ if ( abstract_pkg_init(ab_pkg) < 0 ) -+ return NULL; -+ -+ return ab_pkg; -+} -+ -+int abstract_pkg_init(abstract_pkg_t *ab_pkg) -+{ -+ memset(ab_pkg, 0, sizeof(abstract_pkg_t)); -+ -+ ab_pkg->provided_by = abstract_pkg_vec_alloc(); -+ if (ab_pkg->provided_by==NULL){ -+ return -1; -+ } -+ ab_pkg->dependencies_checked = 0; -+ ab_pkg->state_status = SS_NOT_INSTALLED; -+ -+ return 0; -+} -+ -+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg){ -+ char * temp_str; -+ char **raw =NULL; -+ char **raw_start=NULL; -+ -+ temp_str = (char *) malloc (strlen(pkg->dest->info_dir)+strlen(pkg->name)+12); -+ if (temp_str == NULL ){ -+ ipkg_message(conf, IPKG_INFO, "Out of memory in %s\n", __FUNCTION__); -+ return; -+ } -+ sprintf( temp_str,"%s/%s.control",pkg->dest->info_dir,pkg->name); -+ -+ raw = raw_start = read_raw_pkgs_from_file(temp_str); -+ if (raw == NULL ){ -+ ipkg_message(conf, IPKG_ERROR, "Unable to open the control file in %s\n", __FUNCTION__); -+ return; -+ } -+ -+ while(*raw){ -+ if (!pkg_valorize_other_field(pkg, &raw ) == 0) { -+ ipkg_message(conf, IPKG_DEBUG, "unable to read control file for %s. May be empty\n", pkg->name); -+ } -+ } -+ raw = raw_start; -+ while (*raw) { -+ if (raw!=NULL) -+ free(*raw++); -+ } -+ -+ free(raw_start); -+ free(temp_str); -+ -+ return ; -+ -+} -+ -+char * pkg_formatted_info(pkg_t *pkg ) -+{ -+ char *line; -+ char * buff; -+ -+ buff = malloc(8192); -+ if (buff == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ buff[0] = '\0'; -+ -+ line = pkg_formatted_field(pkg, "Package"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Version"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Depends"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Recommends"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Suggests"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Provides"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Replaces"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Conflicts"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Status"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Section"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Essential"); /* @@@@ should be removed in future release. *//* I do not agree with this Pigi*/ -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Architecture"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Maintainer"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "MD5sum"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Size"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Filename"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Conffiles"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Source"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Description"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ line = pkg_formatted_field(pkg, "Installed-Time"); -+ strncat(buff ,line, strlen(line)); -+ free(line); -+ -+ return buff; -+} -+ -+char * pkg_formatted_field(pkg_t *pkg, const char *field ) -+{ -+ static size_t LINE_LEN = 128; -+ char * temp = (char *)malloc(1); -+ int len = 0; -+ int flag_provide_false = 0; -+ -+/* -+ Pigi: After some discussion with Florian we decided to modify the full procedure in -+ dynamic memory allocation. This should avoid any other segv in this area ( except for bugs ) -+*/ -+ -+ if (strlen(field) < PKG_MINIMUM_FIELD_NAME_LEN) { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ -+ temp[0]='\0'; -+ -+ switch (field[0]) -+ { -+ case 'a': -+ case 'A': -+ if (strcasecmp(field, "Architecture") == 0) { -+ /* Architecture */ -+ if (pkg->architecture) { -+ temp = (char *)realloc(temp,strlen(pkg->architecture)+17); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->architecture)+17), "Architecture: %s\n", pkg->architecture); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ break; -+ case 'c': -+ case 'C': -+ if (strcasecmp(field, "Conffiles") == 0) { -+ /* Conffiles */ -+ conffile_list_elt_t *iter; -+ char confstr[LINE_LEN]; -+ -+ if (pkg->conffiles.head == NULL) { -+ return temp; -+ } -+ -+ len = 14 ; -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ if (iter->data->name && iter->data->value) { -+ len = len + (strlen(iter->data->name)+strlen(iter->data->value)+5); -+ } -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Conffiles:\n", 12); -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ if (iter->data->name && iter->data->value) { -+ snprintf(confstr, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value); -+ strncat(temp, confstr, strlen(confstr)); -+ } -+ } -+ } else if (strcasecmp(field, "Conflicts") == 0) { -+ int i; -+ -+ if (pkg->conflicts_count) { -+ char conflictstr[LINE_LEN]; -+ len = 14 ; -+ for(i = 0; i < pkg->conflicts_count; i++) { -+ len = len + (strlen(pkg->conflicts_str[i])+5); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Conflicts:", 11); -+ for(i = 0; i < pkg->conflicts_count; i++) { -+ snprintf(conflictstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]); -+ strncat(temp, conflictstr, strlen(conflictstr)); -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ break; -+ case 'd': -+ case 'D': -+ if (strcasecmp(field, "Depends") == 0) { -+ /* Depends */ -+ int i; -+ -+ if (pkg->depends_count) { -+ char depstr[LINE_LEN]; -+ len = 14 ; -+ for(i = 0; i < pkg->depends_count; i++) { -+ len = len + (strlen(pkg->depends_str[i])+4); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Depends:", 10); -+ for(i = 0; i < pkg->depends_count; i++) { -+ snprintf(depstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]); -+ strncat(temp, depstr, strlen(depstr)); -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } else if (strcasecmp(field, "Description") == 0) { -+ /* Description */ -+ if (pkg->description) { -+ temp = (char *)realloc(temp,strlen(pkg->description)+16); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->description)+16), "Description: %s\n", pkg->description); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ break; -+ case 'e': -+ case 'E': { -+ /* Essential */ -+ if (pkg->essential) { -+ temp = (char *)realloc(temp,16); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (16), "Essential: yes\n"); -+ } -+ } -+ break; -+ case 'f': -+ case 'F': { -+ /* Filename */ -+ if (pkg->filename) { -+ temp = (char *)realloc(temp,strlen(pkg->filename)+12); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->filename)+12), "Filename: %s\n", pkg->filename); -+ } -+ } -+ break; -+ case 'i': -+ case 'I': { -+ if (strcasecmp(field, "Installed-Size") == 0) { -+ /* Installed-Size */ -+ temp = (char *)realloc(temp,strlen(pkg->installed_size)+17); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->installed_size)+17), "Installed-Size: %s\n", pkg->installed_size); -+ } else if (strcasecmp(field, "Installed-Time") == 0 && pkg->installed_time) { -+ temp = (char *)realloc(temp,29); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, 29, "Installed-Time: %lu\n", pkg->installed_time); -+ } -+ } -+ break; -+ case 'm': -+ case 'M': { -+ /* Maintainer | MD5sum */ -+ if (strcasecmp(field, "Maintainer") == 0) { -+ /* Maintainer */ -+ if (pkg->maintainer) { -+ temp = (char *)realloc(temp,strlen(pkg->maintainer)+14); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->maintainer)+14), "maintainer: %s\n", pkg->maintainer); -+ } -+ } else if (strcasecmp(field, "MD5sum") == 0) { -+ /* MD5sum */ -+ if (pkg->md5sum) { -+ temp = (char *)realloc(temp,strlen(pkg->md5sum)+11); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->md5sum)+11), "MD5Sum: %s\n", pkg->md5sum); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ } -+ break; -+ case 'p': -+ case 'P': { -+ if (strcasecmp(field, "Package") == 0) { -+ /* Package */ -+ temp = (char *)realloc(temp,strlen(pkg->name)+11); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->name)+11), "Package: %s\n", pkg->name); -+ } else if (strcasecmp(field, "Priority") == 0) { -+ /* Priority */ -+ temp = (char *)realloc(temp,strlen(pkg->priority)+12); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->priority)+12), "Priority: %s\n", pkg->priority); -+ } else if (strcasecmp(field, "Provides") == 0) { -+ /* Provides */ -+ int i; -+ -+ if (pkg->provides_count) { -+ /* Here we check if the ipkg_internal_use_only is used, and we discard it.*/ -+ for ( i=0; i < pkg->provides_count; i++ ){ -+ if (strstr(pkg->provides_str[i],"ipkg_internal_use_only")!=NULL) { -+ memset (pkg->provides_str[i],'\x0',strlen(pkg->provides_str[i])); /* Pigi clear my trick flag, just in case */ -+ flag_provide_false = 1; -+ } -+ } -+ if ( !flag_provide_false || /* Pigi there is not my trick flag */ -+ ((flag_provide_false) && (pkg->provides_count > 1))){ /* Pigi There is, but we also have others Provides */ -+ char provstr[LINE_LEN]; -+ len = 15; -+ for(i = 0; i < pkg->provides_count; i++) { -+ len = len + (strlen(pkg->provides_str[i])+5); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Provides:", 12); -+ for(i = 0; i < pkg->provides_count; i++) { -+ if (strlen(pkg->provides_str[i])>0){; -+ snprintf(provstr, LINE_LEN, "%s %s", i == 1 ? "" : ",", pkg->provides_str[i]); -+ strncat(temp, provstr, strlen(provstr)); -+ } -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ } -+ break; -+ case 'r': -+ case 'R': { -+ int i; -+ /* Replaces | Recommends*/ -+ if (strcasecmp (field, "Replaces") == 0) { -+ if (pkg->replaces_count) { -+ char replstr[LINE_LEN]; -+ len = 14; -+ for (i = 0; i < pkg->replaces_count; i++) { -+ len = len + (strlen(pkg->replaces_str[i])+5); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Replaces:", 12); -+ for (i = 0; i < pkg->replaces_count; i++) { -+ snprintf(replstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]); -+ strncat(temp, replstr, strlen(replstr)); -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } else if (strcasecmp (field, "Recommends") == 0) { -+ if (pkg->recommends_count) { -+ char recstr[LINE_LEN]; -+ len = 15; -+ for(i = 0; i < pkg->recommends_count; i++) { -+ len = len + (strlen( pkg->recommends_str[i])+5); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Recommends:", 13); -+ for(i = 0; i < pkg->recommends_count; i++) { -+ snprintf(recstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]); -+ strncat(temp, recstr, strlen(recstr)); -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ } -+ break; -+ case 's': -+ case 'S': { -+ /* Section | Size | Source | Status | Suggests */ -+ if (strcasecmp(field, "Section") == 0) { -+ /* Section */ -+ if (pkg->section) { -+ temp = (char *)realloc(temp,strlen(pkg->section)+11); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->section)+11), "Section: %s\n", pkg->section); -+ } -+ } else if (strcasecmp(field, "Size") == 0) { -+ /* Size */ -+ if (pkg->size) { -+ temp = (char *)realloc(temp,strlen(pkg->size)+8); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n", pkg->size); -+ } -+ } else if (strcasecmp(field, "Source") == 0) { -+ /* Source */ -+ if (pkg->source) { -+ temp = (char *)realloc(temp,strlen(pkg->source)+10); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(pkg->source)+10), "Source: %s\n", pkg->source); -+ } -+ } else if (strcasecmp(field, "Status") == 0) { -+ /* Status */ -+ /* Benjamin Pineau note: we should avoid direct usage of -+ * strlen(arg) without keeping "arg" for later free() -+ */ -+ char *pflag=pkg_state_flag_to_str(pkg->state_flag); -+ char *pstat=pkg_state_status_to_str(pkg->state_status); -+ char *pwant=pkg_state_want_to_str(pkg->state_want); -+ -+ size_t sum_of_sizes = (size_t) ( strlen(pwant)+ strlen(pflag)+ strlen(pstat) + 12 ); -+ temp = (char *)realloc(temp,sum_of_sizes); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, sum_of_sizes , "Status: %s %s %s\n", pwant, pflag, pstat); -+ free(pflag); -+ free(pwant); -+ if(pstat) /* pfstat can be NULL if ENOMEM */ -+ free(pstat); -+ } else if (strcasecmp(field, "Suggests") == 0) { -+ if (pkg->suggests_count) { -+ int i; -+ char sugstr[LINE_LEN]; -+ len = 13; -+ for(i = 0; i < pkg->suggests_count; i++) { -+ len = len + (strlen(pkg->suggests_str[i])+5); -+ } -+ temp = (char *)realloc(temp,len); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ strncpy(temp, "Suggests:", 10); -+ for(i = 0; i < pkg->suggests_count; i++) { -+ snprintf(sugstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]); -+ strncat(temp, sugstr, strlen(sugstr)); -+ } -+ strncat(temp, "\n", strlen("\n")); -+ } -+ } else { -+ goto UNKNOWN_FMT_FIELD; -+ } -+ } -+ break; -+ case 'v': -+ case 'V': { -+ /* Version */ -+ char *version = pkg_version_str_alloc(pkg); -+ temp = (char *)realloc(temp,strlen(version)+14); -+ if ( temp == NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ temp[0]='\0'; -+ snprintf(temp, (strlen(version)+12), "Version: %s\n", version); -+ free(version); -+ } -+ break; -+ default: -+ goto UNKNOWN_FMT_FIELD; -+ } -+ -+ if ( strlen(temp)<2 ) { -+ temp[0]='\0'; -+ } -+ return temp; -+ -+ UNKNOWN_FMT_FIELD: -+ fprintf(stderr, "%s: ERROR: Unknown field name: %s\n", __FUNCTION__, field); -+ if ( strlen(temp)<2 ) { -+ temp[0]='\0'; -+ } -+ -+ return temp; -+} -+ -+void pkg_print_info(pkg_t *pkg, FILE *file) -+{ -+ char * buff; -+ if (pkg == NULL) { -+ return; -+ } -+ -+ buff = pkg_formatted_info(pkg); -+ if ( buff == NULL ) -+ return; -+ if (strlen(buff)>2){ -+ fwrite(buff, 1, strlen(buff), file); -+ } -+ free(buff); -+} -+ -+void pkg_print_status(pkg_t * pkg, FILE * file) -+{ -+ if (pkg == NULL) { -+ return; -+ } -+ -+ /* XXX: QUESTION: Do we actually want more fields here? The -+ original idea was to save space by installing only what was -+ needed for actual computation, (package, version, status, -+ essential, conffiles). The assumption is that all other fields -+ can be found in th available file. -+ -+ But, someone proposed the idea to make it possible to -+ reconstruct a .ipk from an installed package, (ie. for beaming -+ from one handheld to another). So, maybe we actually want a few -+ more fields here, (depends, suggests, etc.), so that that would -+ be guaranteed to work even in the absence of more information -+ from the available file. -+ -+ 28-MAR-03: kergoth and I discussed this yesterday. We think -+ the essential info needs to be here for all installed packages -+ because they may not appear in the Packages files on various -+ feeds. Furthermore, one should be able to install from URL or -+ local storage without requiring a Packages file from any feed. -+ -Jamey -+ */ -+ pkg_print_field(pkg, file, "Package"); -+ pkg_print_field(pkg, file, "Version"); -+ pkg_print_field(pkg, file, "Depends"); -+ pkg_print_field(pkg, file, "Recommends"); -+ pkg_print_field(pkg, file, "Suggests"); -+ pkg_print_field(pkg, file, "Provides"); -+ pkg_print_field(pkg, file, "Replaces"); -+ pkg_print_field(pkg, file, "Conflicts"); -+ pkg_print_field(pkg, file, "Status"); -+ pkg_print_field(pkg, file, "Essential"); /* @@@@ should be removed in future release. */ -+ pkg_print_field(pkg, file, "Architecture"); -+ pkg_print_field(pkg, file, "Conffiles"); -+ pkg_print_field(pkg, file, "Installed-Time"); -+ fputs("\n", file); -+} -+ -+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field) -+{ -+ char *buff; -+ if (strlen(field) < PKG_MINIMUM_FIELD_NAME_LEN) { -+ fprintf(stderr, "%s: ERROR: Unknown field name: %s\n", -+ __FUNCTION__, field); -+ } -+ buff = pkg_formatted_field(pkg, field); -+ if (strlen(buff)>2) { -+ fprintf(file, "%s", buff); -+ fflush(file); -+ } -+ free(buff); -+ return; -+} -+ -+/* -+ * libdpkg - Debian packaging suite library routines -+ * vercmp.c - comparison of version numbers -+ * -+ * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk> -+ */ -+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg) -+{ -+ int r; -+ -+ if (pkg->epoch > ref_pkg->epoch) { -+ return 1; -+ } -+ -+ if (pkg->epoch < ref_pkg->epoch) { -+ return -1; -+ } -+ -+ r = verrevcmp(pkg->version, ref_pkg->version); -+ if (r) { -+ return r; -+ } -+ -+#ifdef USE_DEBVERSION -+ r = verrevcmp(pkg->revision, ref_pkg->revision); -+ if (r) { -+ return r; -+ } -+ -+ r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision); -+#endif -+ -+ return r; -+} -+ -+int verrevcmp(const char *val, const char *ref) -+{ -+ int vc, rc; -+ long vl, rl; -+ const char *vp, *rp; -+ const char *vsep, *rsep; -+ -+ if (!val) val= ""; -+ if (!ref) ref= ""; -+ for (;;) { -+ vp= val; while (*vp && !isdigit(*vp)) vp++; -+ rp= ref; while (*rp && !isdigit(*rp)) rp++; -+ for (;;) { -+ vc= (val == vp) ? 0 : *val++; -+ rc= (ref == rp) ? 0 : *ref++; -+ if (!rc && !vc) break; -+ if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */ -+ if (rc && !isalpha(rc)) rc += 256; -+ if (vc != rc) return vc - rc; -+ } -+ val= vp; -+ ref= rp; -+ vl=0; if (isdigit(*vp)) vl= strtol(val,(char**)&val,10); -+ rl=0; if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10); -+ if (vl != rl) return vl - rl; -+ -+ vc = *val; -+ rc = *ref; -+ vsep = strchr(".-", vc); -+ rsep = strchr(".-", rc); -+ if (vsep && !rsep) return -1; -+ if (!vsep && rsep) return +1; -+ -+ if (!*val && !*ref) return 0; -+ if (!*val) return -1; -+ if (!*ref) return +1; -+ } -+} -+ -+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op) -+{ -+ int r; -+ -+ r = pkg_compare_versions(it, ref); -+ -+ if (strcmp(op, "<=") == 0 || strcmp(op, "<") == 0) { -+ return r <= 0; -+ } -+ -+ if (strcmp(op, ">=") == 0 || strcmp(op, ">") == 0) { -+ return r >= 0; -+ } -+ -+ if (strcmp(op, "<<") == 0) { -+ return r < 0; -+ } -+ -+ if (strcmp(op, ">>") == 0) { -+ return r > 0; -+ } -+ -+ if (strcmp(op, "=") == 0) { -+ return r == 0; -+ } -+ -+ fprintf(stderr, "unknown operator: %s", op); -+ return 0; -+} -+ -+int pkg_name_version_and_architecture_compare(void *p1, void *p2) -+{ -+ const pkg_t *a = *(const pkg_t **)p1; -+ const pkg_t *b = *(const pkg_t **)p2; -+ int namecmp; -+ int vercmp; -+ if (!a->name || !b->name) { -+ fprintf(stderr, "pkg_name_version_and_architecture_compare: a=%p a->name=%p b=%p b->name=%p\n", -+ a, a->name, b, b->name); -+ return 0; -+ } -+ -+ namecmp = strcmp(a->name, b->name); -+ if (namecmp) -+ return namecmp; -+ vercmp = pkg_compare_versions(a, b); -+ if (vercmp) -+ return vercmp; -+ if (!a->arch_priority || !b->arch_priority) { -+ fprintf(stderr, "pkg_name_version_and_architecture_compare: a=%p a->arch_priority=%i b=%p b->arch_priority=%i\n", -+ a, a->arch_priority, b, b->arch_priority); -+ return 0; -+ } -+ if (a->arch_priority > b->arch_priority) -+ return 1; -+ if (a->arch_priority < b->arch_priority) -+ return -1; -+ return 0; -+} -+ -+int abstract_pkg_name_compare(void *p1, void *p2) -+{ -+ const abstract_pkg_t *a = *(const abstract_pkg_t **)p1; -+ const abstract_pkg_t *b = *(const abstract_pkg_t **)p2; -+ if (!a->name || !b->name) { -+ fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n", -+ a, a->name, b, b->name); -+ return 0; -+ } -+ return strcmp(a->name, b->name); -+} -+ -+ -+char *pkg_version_str_alloc(pkg_t *pkg) -+{ -+ char *complete_version; -+ char *epoch_str; -+#ifdef USE_DEBVERSION -+ char *revision_str; -+ char *familiar_revision_str; -+#endif -+ -+ if (pkg->epoch) { -+ sprintf_alloc(&epoch_str, "%d:", pkg->epoch); -+ } else { -+ epoch_str = strdup(""); -+ } -+ -+#ifdef USE_DEBVERSION -+ if (pkg->revision && strlen(pkg->revision)) { -+ sprintf_alloc(&revision_str, "-%s", pkg->revision); -+ } else { -+ revision_str = strdup(""); -+ } -+ -+ if (pkg->familiar_revision && strlen(pkg->familiar_revision)) { -+ sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision); -+ } else { -+ familiar_revision_str = strdup(""); -+ } -+#endif -+ -+#ifdef USE_DEBVERSION -+ sprintf_alloc(&complete_version, "%s%s%s%s", -+ epoch_str, pkg->version, revision_str, familiar_revision_str); -+#else -+ sprintf_alloc(&complete_version, "%s%s", -+ epoch_str, pkg->version); -+#endif -+ -+ free(epoch_str); -+#ifdef USE_DEBVERSION -+ free(revision_str); -+ free(familiar_revision_str); -+#endif -+ -+ return complete_version; -+} -+ -+str_list_t *pkg_get_installed_files(pkg_t *pkg) -+{ -+ int err; -+ char *list_file_name = NULL; -+ FILE *list_file = NULL; -+ char *line; -+ char *installed_file_name; -+ int rootdirlen; -+ -+ pkg->installed_files_ref_cnt++; -+ -+ if (pkg->installed_files) { -+ return pkg->installed_files; -+ } -+ -+ pkg->installed_files = str_list_alloc(); -+ if (pkg->installed_files == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ /* For uninstalled packages, get the file list firectly from the package. -+ For installed packages, look at the package.list file in the database. -+ */ -+ if (pkg->state_status == SS_NOT_INSTALLED || pkg->dest == NULL) { -+ if (pkg->local_filename == NULL) { -+ return pkg->installed_files; -+ } -+ /* XXX: CLEANUP: Maybe rewrite this to avoid using a temporary -+ file. In other words, change deb_extract so that it can -+ simply return the file list as a char *[] rather than -+ insisting on writing in to a FILE * as it does now. */ -+ list_file = tmpfile(); -+ err = pkg_extract_data_file_names_to_stream(pkg, list_file); -+ if (err) { -+ fclose(list_file); -+ fprintf(stderr, "%s: Error extracting file list from %s: %s\n", -+ __FUNCTION__, pkg->local_filename, strerror(err)); -+ return pkg->installed_files; -+ } -+ rewind(list_file); -+ } else { -+ sprintf_alloc(&list_file_name, "%s/%s.list", -+ pkg->dest->info_dir, pkg->name); -+ if (! file_exists(list_file_name)) { -+ free(list_file_name); -+ return pkg->installed_files; -+ } -+ -+ list_file = fopen(list_file_name, "r"); -+ if (list_file == NULL) { -+ fprintf(stderr, "WARNING: Cannot open %s: %s\n", -+ list_file_name, strerror(errno)); -+ free(list_file_name); -+ return pkg->installed_files; -+ } -+ free(list_file_name); -+ } -+ -+ rootdirlen = strlen( pkg->dest->root_dir ); -+ while (1) { -+ char *file_name; -+ -+ line = file_read_line_alloc(list_file); -+ if (line == NULL) { -+ break; -+ } -+ str_chomp(line); -+ file_name = line; -+ -+ /* Take pains to avoid uglies like "/./" in the middle of file_name. */ -+ if( strncmp( pkg->dest->root_dir, -+ file_name, -+ rootdirlen ) ) { -+ if (*file_name == '.') { -+ file_name++; -+ } -+ if (*file_name == '/') { -+ file_name++; -+ } -+ -+ /* Freed in pkg_free_installed_files */ -+ sprintf_alloc(&installed_file_name, "%s%s", pkg->dest->root_dir, file_name); -+ } else { -+ // already contains root_dir as header -> ABSOLUTE -+ sprintf_alloc(&installed_file_name, "%s", file_name); -+ } -+ str_list_append(pkg->installed_files, installed_file_name); -+ free(line); -+ } -+ -+ fclose(list_file); -+ -+ return pkg->installed_files; -+} -+ -+/* XXX: CLEANUP: This function and it's counterpart, -+ (pkg_get_installed_files), do not match our init/deinit naming -+ convention. Nor the alloc/free convention. But, then again, neither -+ of these conventions currrently fit the way these two functions -+ work. */ -+int pkg_free_installed_files(pkg_t *pkg) -+{ -+ str_list_elt_t *iter; -+ -+ pkg->installed_files_ref_cnt--; -+ if (pkg->installed_files_ref_cnt > 0) { -+ return 0; -+ } -+ -+ if (pkg->installed_files) { -+ -+ for (iter = pkg->installed_files->head; iter; iter = iter->next) { -+ /* malloced in pkg_get_installed_files */ -+ free (iter->data); -+ iter->data = NULL; -+ } -+ -+ str_list_deinit(pkg->installed_files); -+ } -+ -+ pkg->installed_files = NULL; -+ -+ return 0; -+} -+ -+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ int err; -+ char *list_file_name; -+ -+ //I don't think pkg_free_installed_files should be called here. Jamey -+ //pkg_free_installed_files(pkg); -+ -+ sprintf_alloc(&list_file_name, "%s/%s.list", -+ pkg->dest->info_dir, pkg->name); -+ if (!conf->noaction) { -+ err = unlink(list_file_name); -+ free(list_file_name); -+ -+ if (err) { -+ return errno; -+ } -+ } -+ return 0; -+} -+ -+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name) -+{ -+ conffile_list_elt_t *iter; -+ conffile_t *conffile; -+ -+ if (pkg == NULL) { -+ return NULL; -+ } -+ -+ for (iter = pkg->conffiles.head; iter; iter = iter->next) { -+ conffile = iter->data; -+ -+ if (strcmp(conffile->name, file_name) == 0) { -+ return conffile; -+ } -+ } -+ -+ return NULL; -+} -+ -+int pkg_run_script(ipkg_conf_t *conf, pkg_t *pkg, -+ const char *script, const char *args) -+{ -+ int err; -+ char *path; -+ char *cmd; -+ -+ /* XXX: FEATURE: When conf->offline_root is set, we should run the -+ maintainer script within a chroot environment. */ -+ -+ /* Installed packages have scripts in pkg->dest->info_dir, uninstalled packages -+ have scripts in pkg->tmp_unpack_dir. */ -+ if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) { -+ if (pkg->dest == NULL) { -+ fprintf(stderr, "%s: ERROR: installed package %s has a NULL dest\n", -+ __FUNCTION__, pkg->name); -+ return EINVAL; -+ } -+ sprintf_alloc(&path, "%s/%s.%s", pkg->dest->info_dir, pkg->name, script); -+ } else { -+ if (pkg->tmp_unpack_dir == NULL) { -+ fprintf(stderr, "%s: ERROR: uninstalled package %s has a NULL tmp_unpack_dir\n", -+ __FUNCTION__, pkg->name); -+ return EINVAL; -+ } -+ sprintf_alloc(&path, "%s/%s", pkg->tmp_unpack_dir, script); -+ } -+ -+ ipkg_message(conf, IPKG_INFO, "Running script %s\n", path); -+ if (conf->noaction) return 0; -+ -+ /* XXX: CLEANUP: There must be a better way to handle maintainer -+ scripts when running with offline_root mode and/or a dest other -+ than '/'. I've been playing around with some clever chroot -+ tricks and I might come up with something workable. */ -+ if (conf->offline_root) { -+ setenv("IPKG_OFFLINE_ROOT", conf->offline_root, 1); -+ } -+ -+ setenv("PKG_ROOT", -+ pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1); -+ -+ if (! file_exists(path)) { -+ free(path); -+ return 0; -+ } -+ -+ if (conf->offline_root) { -+ fprintf(stderr, "(offline root mode: not running %s.%s)\n", pkg->name, script); -+ free(path); -+ return 0; -+ } -+ -+ sprintf_alloc(&cmd, "%s %s", path, args); -+ free(path); -+ -+ err = xsystem(cmd); -+ free(cmd); -+ -+ if (err) { -+ fprintf(stderr, "%s script returned status %d\n", script, err); -+ return err; -+ } -+ -+ return 0; -+} -+ -+char *pkg_state_want_to_str(pkg_state_want_t sw) -+{ -+ int i; -+ -+ for (i=0; i < ARRAY_SIZE(pkg_state_want_map); i++) { -+ if (pkg_state_want_map[i].value == sw) { -+ return strdup(pkg_state_want_map[i].str); -+ } -+ } -+ -+ fprintf(stderr, "%s: ERROR: Illegal value for state_want: %d\n", -+ __FUNCTION__, sw); -+ return strdup("<STATE_WANT_UNKNOWN>"); -+} -+ -+pkg_state_want_t pkg_state_want_from_str(char *str) -+{ -+ int i; -+ -+ for (i=0; i < ARRAY_SIZE(pkg_state_want_map); i++) { -+ if (strcmp(str, pkg_state_want_map[i].str) == 0) { -+ return pkg_state_want_map[i].value; -+ } -+ } -+ -+ fprintf(stderr, "%s: ERROR: Illegal value for state_want string: %s\n", -+ __FUNCTION__, str); -+ return SW_UNKNOWN; -+} -+ -+char *pkg_state_flag_to_str(pkg_state_flag_t sf) -+{ -+ int i; -+ int len = 3; /* ok\000 is minimum */ -+ char *str = NULL; -+ -+ /* clear the temporary flags before converting to string */ -+ sf &= SF_NONVOLATILE_FLAGS; -+ -+ if (sf == 0) { -+ return strdup("ok"); -+ } else { -+ -+ for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) { -+ if (sf & pkg_state_flag_map[i].value) { -+ len += strlen(pkg_state_flag_map[i].str) + 1; -+ } -+ } -+ str = malloc(len); -+ if ( str == NULL ) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ str[0] = 0; -+ for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) { -+ if (sf & pkg_state_flag_map[i].value) { -+ strcat(str, pkg_state_flag_map[i].str); -+ strcat(str, ","); -+ } -+ } -+ len = strlen(str); -+ str[len-1] = 0; /* squash last comma */ -+ return str; -+ } -+} -+ -+pkg_state_flag_t pkg_state_flag_from_str(char *str) -+{ -+ int i; -+ int sf = SF_OK; -+ -+ if (strcmp(str, "ok") == 0) { -+ return SF_OK; -+ } -+ for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) { -+ const char *sfname = pkg_state_flag_map[i].str; -+ int sfname_len = strlen(sfname); -+ if (strncmp(str, sfname, sfname_len) == 0) { -+ sf |= pkg_state_flag_map[i].value; -+ str += sfname_len; -+ if (str[0] == ',') { -+ str++; -+ } else { -+ break; -+ } -+ } -+ } -+ -+ return sf; -+} -+ -+char *pkg_state_status_to_str(pkg_state_status_t ss) -+{ -+ int i; -+ -+ for (i=0; i < ARRAY_SIZE(pkg_state_status_map); i++) { -+ if (pkg_state_status_map[i].value == ss) { -+ return strdup(pkg_state_status_map[i].str); -+ } -+ } -+ -+ fprintf(stderr, "%s: ERROR: Illegal value for state_status: %d\n", -+ __FUNCTION__, ss); -+ return strdup("<STATE_STATUS_UNKNOWN>"); -+} -+ -+pkg_state_status_t pkg_state_status_from_str(char *str) -+{ -+ int i; -+ -+ for (i=0; i < ARRAY_SIZE(pkg_state_status_map); i++) { -+ if (strcmp(str, pkg_state_status_map[i].str) == 0) { -+ return pkg_state_status_map[i].value; -+ } -+ } -+ -+ fprintf(stderr, "%s: ERROR: Illegal value for state_status string: %s\n", -+ __FUNCTION__, str); -+ return SS_NOT_INSTALLED; -+} -+ -+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ nv_pair_list_elt_t *l; -+ -+ if (!pkg->architecture) -+ return 1; -+ -+ l = conf->arch_list.head; -+ -+ while (l) { -+ nv_pair_t *nv = l->data; -+ if (strcmp(nv->name, pkg->architecture) == 0) { -+ ipkg_message(conf, IPKG_DEBUG, "arch %s (priority %s) supported for pkg %s\n", nv->name, nv->value, pkg->name); -+ return 1; -+ } -+ l = l->next; -+ } -+ -+ ipkg_message(conf, IPKG_DEBUG, "arch %s unsupported for pkg %s\n", pkg->architecture, pkg->name); -+ return 0; -+} -+ -+int pkg_get_arch_priority(ipkg_conf_t *conf, const char *archname) -+{ -+ nv_pair_list_elt_t *l; -+ -+ l = conf->arch_list.head; -+ -+ while (l) { -+ nv_pair_t *nv = l->data; -+ if (strcmp(nv->name, archname) == 0) { -+ int priority = strtol(nv->value, NULL, 0); -+ return priority; -+ } -+ l = l->next; -+ } -+ return 0; -+} -+ -+int pkg_info_preinstall_check(ipkg_conf_t *conf) -+{ -+ int i; -+ hash_table_t *pkg_hash = &conf->pkg_hash; -+ pkg_vec_t *available_pkgs = pkg_vec_alloc(); -+ pkg_vec_t *installed_pkgs = pkg_vec_alloc(); -+ -+ ipkg_message(conf, IPKG_INFO, "pkg_info_preinstall_check: updating arch priority for each package\n"); -+ pkg_hash_fetch_available(pkg_hash, available_pkgs); -+ /* update arch_priority for each package */ -+ for (i = 0; i < available_pkgs->len; i++) { -+ pkg_t *pkg = available_pkgs->pkgs[i]; -+ int arch_priority = 1; -+ if (!pkg) -+ continue; -+ // ipkg_message(conf, IPKG_DEBUG2, " package %s version=%s arch=%p:", pkg->name, pkg->version, pkg->architecture); -+ if (pkg->architecture) -+ arch_priority = pkg_get_arch_priority(conf, pkg->architecture); -+ else -+ ipkg_message(conf, IPKG_ERROR, "pkg_info_preinstall_check: no architecture for package %s\n", pkg->name); -+ // ipkg_message(conf, IPKG_DEBUG2, "%s arch_priority=%d\n", pkg->architecture, arch_priority); -+ pkg->arch_priority = arch_priority; -+ } -+ -+ for (i = 0; i < available_pkgs->len; i++) { -+ pkg_t *pkg = available_pkgs->pkgs[i]; -+ if (!pkg->arch_priority && (pkg->state_flag || (pkg->state_want != SW_UNKNOWN))) { -+ /* clear flags and want for any uninstallable package */ -+ ipkg_message(conf, IPKG_NOTICE, "Clearing state_want and state_flag for pkg=%s (arch_priority=%d flag=%d want=%d)\n", -+ pkg->name, pkg->arch_priority, pkg->state_flag, pkg->state_want); -+ pkg->state_want = SW_UNKNOWN; -+ pkg->state_flag = 0; -+ } -+ } -+ pkg_vec_free(available_pkgs); -+ -+ /* update the file owner data structure */ -+ ipkg_message(conf, IPKG_INFO, "pkg_info_preinstall_check: update file owner list\n"); -+ pkg_hash_fetch_all_installed(pkg_hash, installed_pkgs); -+ for (i = 0; i < installed_pkgs->len; i++) { -+ pkg_t *pkg = installed_pkgs->pkgs[i]; -+ str_list_t *installed_files = pkg_get_installed_files(pkg); /* this causes installed_files to be cached */ -+ str_list_elt_t *iter; -+ if (installed_files == NULL) { -+ ipkg_message(conf, IPKG_ERROR, "No installed files for pkg %s\n", pkg->name); -+ break; -+ } -+ for (iter = installed_files->head; iter; iter = iter->next) { -+ char *installed_file = iter->data; -+ // ipkg_message(conf, IPKG_DEBUG2, "pkg %s: file=%s\n", pkg->name, installed_file); -+ file_hash_set_file_owner(conf, installed_file, pkg); -+ } -+ } -+ pkg_vec_free(installed_pkgs); -+ -+ return 0; -+} -+ -+struct pkg_write_filelist_data { -+ ipkg_conf_t *conf; -+ pkg_t *pkg; -+ FILE *stream; -+}; -+ -+void pkg_write_filelist_helper(const char *key, void *entry_, void *data_) -+{ -+ struct pkg_write_filelist_data *data = data_; -+ pkg_t *entry = entry_; -+ if (entry == data->pkg) { -+ fprintf(data->stream, "%s\n", key); -+ } -+} -+ -+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg) -+{ -+ struct pkg_write_filelist_data data; -+ char *list_file_name = NULL; -+ int err = 0; -+ -+ if (!pkg) { -+ ipkg_message(conf, IPKG_ERROR, "Null pkg\n"); -+ return -EINVAL; -+ } -+ ipkg_message(conf, IPKG_INFO, -+ " creating %s.list file\n", pkg->name); -+ sprintf_alloc(&list_file_name, "%s/%s.list", pkg->dest->info_dir, pkg->name); -+ if (!list_file_name) { -+ ipkg_message(conf, IPKG_ERROR, "Failed to alloc list_file_name\n"); -+ return -ENOMEM; -+ } -+ ipkg_message(conf, IPKG_INFO, -+ " creating %s file for pkg %s\n", list_file_name, pkg->name); -+ data.stream = fopen(list_file_name, "w"); -+ if (!data.stream) { -+ ipkg_message(conf, IPKG_ERROR, "Could not open %s for writing: %s\n", -+ list_file_name, strerror(errno)); -+ return errno; -+ } -+ data.pkg = pkg; -+ data.conf = conf; -+ hash_table_foreach(&conf->file_hash, pkg_write_filelist_helper, &data); -+ fclose(data.stream); -+ free(list_file_name); -+ -+ return err; -+} -+ -+int pkg_write_changed_filelists(ipkg_conf_t *conf) -+{ -+ pkg_vec_t *installed_pkgs = pkg_vec_alloc(); -+ hash_table_t *pkg_hash = &conf->pkg_hash; -+ int i; -+ int err; -+ if (conf->noaction) -+ return 0; -+ -+ ipkg_message(conf, IPKG_INFO, "%s: saving changed filelists\n", __FUNCTION__); -+ pkg_hash_fetch_all_installed(pkg_hash, installed_pkgs); -+ for (i = 0; i < installed_pkgs->len; i++) { -+ pkg_t *pkg = installed_pkgs->pkgs[i]; -+ if (pkg->state_flag & SF_FILELIST_CHANGED) { -+ ipkg_message(conf, IPKG_DEBUG, "Calling pkg_write_filelist for pkg=%s from %s\n", pkg->name, __FUNCTION__); -+ err = pkg_write_filelist(conf, pkg); -+ if (err) -+ ipkg_message(conf, IPKG_NOTICE, "pkg_write_filelist pkg=%s returned %d\n", pkg->name, err); -+ } -+ } -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h ---- busybox-1.1.2-orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,232 @@ -+/* 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; -+ -+ -+#define ARRAY_SIZE(array) sizeof(array) / sizeof((array)[0]) -+ -+/* 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(void *a, void *b); -+int abstract_pkg_name_compare(void *a, void *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 -ruN busybox-1.1.2-orig/archival/libipkg/pkg_depends.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,1033 @@ -+/* pkg_depends.c - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <ctype.h> -+ -+#include "pkg.h" -+#include "ipkg_utils.h" -+#include "pkg_hash.h" -+#include "ipkg_message.h" -+#include "pkg_parse.h" -+#include "hash_table.h" -+ -+static int parseDepends(compound_depend_t *compound_depend, hash_table_t * hash, char * depend_str); -+static depend_t * depend_init(void); -+static void depend_deinit(depend_t *d); -+static char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx); -+static char ** merge_unresolved(char ** oldstuff, char ** newstuff); -+static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg); -+ -+static int pkg_installed_and_constraint_satisfied(pkg_t *pkg, void *cdata) -+{ -+ depend_t *depend = (depend_t *)cdata; -+ if ((pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) && version_constraints_satisfied(depend, pkg)) -+ return 1; -+ else -+ return 0; -+} -+ -+static int pkg_constraint_satisfied(pkg_t *pkg, void *cdata) -+{ -+ depend_t *depend = (depend_t *)cdata; -+#if 0 -+ pkg_t * temp = pkg_new(); -+ int comparison; -+ parseVersion(temp, depend->version); -+ comparison = pkg_compare_versions(pkg, temp); -+ free(temp); -+ -+ fprintf(stderr, "%s: pkg=%s pkg->version=%s constraint=%p type=%d version=%s comparison=%d satisfied=%d\n", -+ __FUNCTION__, pkg->name, pkg->version, -+ depend, depend->constraint, depend->version, -+ comparison, version_constraints_satisfied(depend, pkg)); -+#endif -+ if (version_constraints_satisfied(depend, pkg)) -+ return 1; -+ else -+ return 0; -+} -+ -+/* returns ndependences or negative error value */ -+int pkg_hash_fetch_unsatisfied_dependencies(ipkg_conf_t *conf, pkg_t * pkg, -+ pkg_vec_t *unsatisfied, char *** unresolved) -+{ -+ pkg_t * satisfier_entry_pkg; -+ register int i, j, k; -+ int count, found; -+ char ** the_lost; -+ abstract_pkg_t * ab_pkg; -+ -+ /* -+ * this is a setup to check for redundant/cyclic dependency checks, -+ * which are marked at the abstract_pkg level -+ */ -+ if (!(ab_pkg = pkg->parent)) { -+ fprintf(stderr, "%s:%d: something terribly wrong with pkg %s\n", __FUNCTION__, __LINE__, pkg->name); -+ *unresolved = NULL; -+ return 0; -+ } -+ if (ab_pkg->dependencies_checked) { /* avoid duplicate or cyclic checks */ -+ *unresolved = NULL; -+ return 0; -+ } else { -+ ab_pkg->dependencies_checked = 1; /* mark it for subsequent visits */ -+ } -+ /**/ -+ -+ count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count; -+ if (!count){ -+ *unresolved = NULL; -+ return 0; -+ } -+ -+ the_lost = NULL; -+ -+ /* foreach dependency */ -+ for (i = 0; i < count; i++) { -+ compound_depend_t * compound_depend = &pkg->depends[i]; -+ depend_t ** possible_satisfiers = compound_depend->possibilities;; -+ found = 0; -+ satisfier_entry_pkg = NULL; -+ -+ if (compound_depend->type == GREEDY_DEPEND) { -+ /* foreach possible satisfier */ -+ for (j = 0; j < compound_depend->possibility_count; j++) { -+ /* foreach provided_by, which includes the abstract_pkg itself */ -+ abstract_pkg_t *abpkg = possible_satisfiers[j]->pkg; -+ abstract_pkg_vec_t *ab_provider_vec = abpkg->provided_by; -+ int nposs = ab_provider_vec->len; -+ abstract_pkg_t **ab_providers = ab_provider_vec->pkgs; -+ int l; -+ for (l = 0; l < nposs; l++) { -+ pkg_vec_t *test_vec = ab_providers[l]->pkgs; -+ /* if no depends on this one, try the first package that Provides this one */ -+ if (!test_vec){ /* no pkg_vec hooked up to the abstract_pkg! (need another feed?) */ -+ continue; -+ } -+ -+ /* cruise this possiblity's pkg_vec looking for an installed version */ -+ for (k = 0; k < test_vec->len; k++) { -+ pkg_t *pkg_scout = test_vec->pkgs[k]; -+ /* not installed, and not already known about? */ -+ if ((pkg_scout->state_want != SW_INSTALL) -+ && !pkg_scout->parent->dependencies_checked -+ && !is_pkg_in_pkg_vec(unsatisfied, pkg_scout)) { -+ char ** newstuff = NULL; -+ int rc; -+ pkg_vec_t *tmp_vec = pkg_vec_alloc (); -+ /* check for not-already-installed dependencies */ -+ rc = pkg_hash_fetch_unsatisfied_dependencies(conf, -+ pkg_scout, -+ tmp_vec, -+ &newstuff); -+ if (newstuff == NULL) { -+ int i; -+ int ok = 1; -+ for (i = 0; i < rc; i++) { -+ pkg_t *p = tmp_vec->pkgs[i]; -+ if (p->state_want == SW_INSTALL) -+ continue; -+ ipkg_message(conf, IPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name); -+ ok = 0; -+ break; -+ } -+ pkg_vec_free (tmp_vec); -+ if (ok) { -+ /* mark this one for installation */ -+ ipkg_message(conf, IPKG_NOTICE, "Adding satisfier for greedy dependence: %s\n", pkg_scout->name); -+ pkg_vec_insert(unsatisfied, pkg_scout); -+ } -+ } else { -+ ipkg_message(conf, IPKG_DEBUG, "not installing %s due to broken depends \n", pkg_scout->name); -+ free (newstuff); -+ } -+ } -+ } -+ } -+ } -+ -+ continue; -+ } -+ -+ /* foreach possible satisfier, look for installed package */ -+ for (j = 0; j < compound_depend->possibility_count; j++) { -+ /* foreach provided_by, which includes the abstract_pkg itself */ -+ depend_t *dependence_to_satisfy = possible_satisfiers[j]; -+ abstract_pkg_t *satisfying_apkg = possible_satisfiers[j]->pkg; -+ pkg_t *satisfying_pkg = -+ pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg, -+ pkg_installed_and_constraint_satisfied, -+ dependence_to_satisfy, 1); -+ /* Being that I can't test constraing in pkg_hash, I will test it here */ -+ if (satisfying_pkg != NULL) { -+ if (!pkg_installed_and_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) { -+ satisfying_pkg = NULL; -+ } -+ } -+ ipkg_message(conf, IPKG_DEBUG, "%s:%d: satisfying_pkg=%p \n", __FILE__, __LINE__, satisfying_pkg); -+ if (satisfying_pkg != NULL) { -+ found = 1; -+ break; -+ } -+ -+ } -+ /* if nothing installed matches, then look for uninstalled satisfier */ -+ if (!found) { -+ /* foreach possible satisfier, look for installed package */ -+ for (j = 0; j < compound_depend->possibility_count; j++) { -+ /* foreach provided_by, which includes the abstract_pkg itself */ -+ depend_t *dependence_to_satisfy = possible_satisfiers[j]; -+ abstract_pkg_t *satisfying_apkg = possible_satisfiers[j]->pkg; -+ pkg_t *satisfying_pkg = -+ pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg, -+ pkg_constraint_satisfied, -+ dependence_to_satisfy, 1); -+ /* Being that I can't test constraing in pkg_hash, I will test it here too */ -+ if (satisfying_pkg != NULL) { -+ if (!pkg_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) { -+ satisfying_pkg = NULL; -+ } -+ } -+ -+ /* user request overrides package recommendation */ -+ if (satisfying_pkg != NULL -+ && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) -+ && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE)) { -+ ipkg_message (conf, IPKG_NOTICE, "%s: ignoring recommendation for %s at user request\n", -+ pkg->name, satisfying_pkg->name); -+ continue; -+ } -+ -+ ipkg_message(conf, IPKG_DEBUG, "%s:%d: satisfying_pkg=%p\n", __FILE__, __LINE__, satisfying_pkg); -+ if (satisfying_pkg != NULL) { -+ satisfier_entry_pkg = satisfying_pkg; -+ break; -+ } -+ } -+ } -+ -+ /* we didn't find one, add something to the unsatisfied vector */ -+ if (!found) { -+ if (!satisfier_entry_pkg) { -+ /* failure to meet recommendations is not an error */ -+ if (compound_depend->type != RECOMMEND && compound_depend->type != SUGGEST) -+ the_lost = add_unresolved_dep(pkg, the_lost, i); -+ else -+ ipkg_message (conf, IPKG_NOTICE, "%s: unsatisfied recommendation for %s\n", -+ pkg->name, compound_depend->possibilities[0]->pkg->name); -+ } -+ else { -+ if (compound_depend->type == SUGGEST) { -+ /* just mention it politely */ -+ ipkg_message (conf, IPKG_NOTICE, "package %s suggests installing %s\n", -+ pkg->name, satisfier_entry_pkg->name); -+ } else { -+ char ** newstuff = NULL; -+ -+ if (satisfier_entry_pkg != pkg && -+ !is_pkg_in_pkg_vec(unsatisfied, satisfier_entry_pkg)) { -+ pkg_vec_insert(unsatisfied, satisfier_entry_pkg); -+ pkg_hash_fetch_unsatisfied_dependencies(conf, -+ satisfier_entry_pkg, -+ unsatisfied, -+ &newstuff); -+ the_lost = merge_unresolved(the_lost, newstuff); -+ } -+ } -+ } -+ } -+ } -+ *unresolved = the_lost; -+ -+ return unsatisfied->len; -+} -+ -+/*checking for conflicts !in replaces -+ If a packages conflicts with another but is also replacing it, I should not consider it a -+ really conflicts -+ returns 0 if conflicts <> replaces or 1 if conflicts == replaces -+*/ -+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg) -+{ -+ int i ; -+ int replaces_count = pkg->replaces_count; -+ abstract_pkg_t **replaces; -+ -+ if (pkg->replaces_count==0) // No replaces, it's surely a conflict -+ return 0; -+ -+ replaces = pkg->replaces; -+ -+ for (i = 0; i < replaces_count; i++) { -+ if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) { // Found -+ ipkg_message(NULL, IPKG_DEBUG2, "Seems I've found a replace %s %s \n",pkg_scout->name,pkg->replaces[i]->name); -+ return 1; -+ } -+ } -+ return 0; -+ -+} -+ -+ -+/* Abhaya: added support for conflicts */ -+pkg_vec_t * pkg_hash_fetch_conflicts(hash_table_t * hash, pkg_t * pkg) -+{ -+ pkg_vec_t * installed_conflicts, * test_vec; -+ compound_depend_t * conflicts; -+ depend_t ** possible_satisfiers; -+ depend_t * possible_satisfier; -+ register int i, j, k; -+ int count; -+ abstract_pkg_t * ab_pkg; -+ pkg_t **pkg_scouts; -+ pkg_t *pkg_scout; -+ -+ /* -+ * this is a setup to check for redundant/cyclic dependency checks, -+ * which are marked at the abstract_pkg level -+ */ -+ if(!(ab_pkg = pkg->parent)){ -+ fprintf(stderr, "dependency check error. pkg %s isn't in hash table\n", pkg->name); -+ return (pkg_vec_t *)NULL; -+ } -+ -+ conflicts = pkg->conflicts; -+ if(!conflicts){ -+ return (pkg_vec_t *)NULL; -+ } -+ installed_conflicts = pkg_vec_alloc(); -+ -+ count = pkg->conflicts_count; -+ -+ -+ -+ /* foreach conflict */ -+ for(i = 0; i < pkg->conflicts_count; i++){ -+ -+ possible_satisfiers = conflicts->possibilities; -+ -+ /* foreach possible satisfier */ -+ for(j = 0; j < conflicts->possibility_count; j++){ -+ possible_satisfier = possible_satisfiers[j]; -+ if (!possible_satisfier) -+ fprintf(stderr, "%s:%d: possible_satisfier is null\n", __FUNCTION__, __LINE__); -+ if (!possible_satisfier->pkg) -+ fprintf(stderr, "%s:%d: possible_satisfier->pkg is null\n", __FUNCTION__, __LINE__); -+ test_vec = possible_satisfier->pkg->pkgs; -+ if (test_vec) { -+ /* pkg_vec found, it is an actual package conflict -+ * cruise this possiblity's pkg_vec looking for an installed version */ -+ pkg_scouts = test_vec->pkgs; -+ for(k = 0; k < test_vec->len; k++){ -+ pkg_scout = pkg_scouts[k]; -+ if (!pkg_scout) { -+ fprintf(stderr, "%s: null pkg scout\n", __FUNCTION__); -+ continue; -+ } -+ if ((pkg_scout->state_status == SS_INSTALLED || pkg_scout->state_want == SW_INSTALL) && -+ version_constraints_satisfied(possible_satisfier, pkg_scout) && !is_pkg_a_replaces(pkg_scout,pkg)){ -+ if (!is_pkg_in_pkg_vec(installed_conflicts, pkg_scout)){ -+ pkg_vec_insert(installed_conflicts, pkg_scout); -+ } -+ } -+ } -+ } -+ } -+ conflicts++; -+ } -+ -+ if (installed_conflicts->len) -+ return installed_conflicts; -+ pkg_vec_free(installed_conflicts); -+ return (pkg_vec_t *)NULL; -+} -+ -+int version_constraints_satisfied(depend_t * depends, pkg_t * pkg) -+{ -+ pkg_t * temp; -+ int comparison; -+ -+ if(depends->constraint == NONE) -+ return 1; -+ -+ temp = pkg_new(); -+ -+ parseVersion(temp, depends->version); -+ -+ comparison = pkg_compare_versions(pkg, temp); -+ -+ free(temp); -+ -+ if((depends->constraint == EARLIER) && -+ (comparison < 0)) -+ return 1; -+ else if((depends->constraint == LATER) && -+ (comparison > 0)) -+ return 1; -+ else if(comparison == 0) -+ return 1; -+ else if((depends->constraint == LATER_EQUAL) && -+ (comparison >= 0)) -+ return 1; -+ else if((depends->constraint == EARLIER_EQUAL) && -+ (comparison <= 0)) -+ return 1; -+ -+ return 0; -+} -+ -+int pkg_dependence_satisfiable(ipkg_conf_t *conf, depend_t *depend) -+{ -+ abstract_pkg_t *apkg = depend->pkg; -+ abstract_pkg_vec_t *provider_apkgs = apkg->provided_by; -+ int n_providers = provider_apkgs->len; -+ abstract_pkg_t **apkgs = provider_apkgs->pkgs; -+ pkg_vec_t *pkg_vec; -+ int n_pkgs ; -+ int i; -+ int j; -+ -+ for (i = 0; i < n_providers; i++) { -+ abstract_pkg_t *papkg = apkgs[i]; -+ pkg_vec = papkg->pkgs; -+ if (pkg_vec) { -+ n_pkgs = pkg_vec->len; -+ for (j = 0; j < n_pkgs; j++) { -+ pkg_t *pkg = pkg_vec->pkgs[j]; -+ if (version_constraints_satisfied(depend, pkg)) { -+ return 1; -+ } -+ } -+ } -+ } -+ return 0; -+} -+ -+int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend) -+{ -+ abstract_pkg_t *apkg = depend->pkg; -+ abstract_pkg_vec_t *provider_apkgs = apkg->provided_by; -+ int n_providers = provider_apkgs->len; -+ abstract_pkg_t **apkgs = provider_apkgs->pkgs; -+ int i; -+ int n_pkgs; -+ int j; -+ -+ for (i = 0; i < n_providers; i++) { -+ abstract_pkg_t *papkg = apkgs[i]; -+ pkg_vec_t *pkg_vec = papkg->pkgs; -+ if (pkg_vec) { -+ n_pkgs = pkg_vec->len; -+ for (j = 0; j < n_pkgs; j++) { -+ pkg_t *pkg = pkg_vec->pkgs[j]; -+ if (version_constraints_satisfied(depend, pkg)) { -+ if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) -+ return 1; -+ } -+ } -+ } -+ } -+ return 0; -+} -+ -+static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg) -+{ -+ register int i; -+ pkg_t ** pkgs = vec->pkgs; -+ -+ for(i = 0; i < vec->len; i++) -+ if((strcmp(pkg->name, (*(pkgs + i))->name) == 0) -+ && (pkg_compare_versions(pkg, *(pkgs + i)) == 0) -+ && (strcmp(pkg->architecture, (*(pkgs + i))->architecture) == 0)) -+ return 1; -+ return 0; -+} -+ -+ -+#ifdef DeadCode -+/** -+ * pkg_has_common_provides returns 1 if pkg and replacee both provide -+ * the same abstract package and 0 otherwise. -+ */ -+int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee) -+{ -+ abstract_pkg_t **provides = pkg->provides; -+ int provides_count = pkg->provides_count; -+ abstract_pkg_t **replacee_provides = replacee->provides; -+ int replacee_provides_count = replacee->provides_count; -+ int i, j; -+ for (i = 0; i < provides_count; i++) { -+ abstract_pkg_t *apkg = provides[i]; -+ for (j = 0; j < replacee_provides_count; j++) { -+ abstract_pkg_t *replacee_apkg = replacee_provides[i]; -+ if (apkg == replacee_apkg) -+ return 1; -+ } -+ } -+ return 0; -+} -+#endif -+ -+/** -+ * pkg_provides_abstract returns 1 if pkg->provides contains providee -+ * and 0 otherwise. -+ */ -+int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee) -+{ -+ abstract_pkg_t **provides = pkg->provides; -+ int provides_count = pkg->provides_count; -+ int i; -+ for (i = 0; i < provides_count; i++) { -+ if (provides[i] == providee) -+ return 1; -+ } -+ return 0; -+} -+ -+/** -+ * pkg_replaces returns 1 if pkg->replaces contains one of replacee's provides and 0 -+ * otherwise. -+ */ -+int pkg_replaces(pkg_t *pkg, pkg_t *replacee) -+{ -+ abstract_pkg_t **replaces = pkg->replaces; -+ int replaces_count = pkg->replaces_count; -+ /* abstract_pkg_t **replacee_provides = pkg->provides; -+ int replacee_provides_count = pkg->provides_count; */ -+ int i, j; -+ for (i = 0; i < replaces_count; i++) { -+ abstract_pkg_t *abstract_replacee = replaces[i]; -+ for (j = 0; j < replaces_count; j++) { -+ /* ipkg_message(NULL, IPKG_DEBUG2, "Searching pkg-name %s repprovname %s absrepname %s \n", -+ pkg->name,replacee->provides[j]->name, abstract_replacee->name); */ -+ if (replacee->provides[j] == abstract_replacee) -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+ -+/** -+ * pkg_conflicts_abstract returns 1 if pkg->conflicts contains conflictee and 0 -+ * otherwise. -+ */ -+int pkg_conflicts_abstract(pkg_t *pkg, abstract_pkg_t *conflictee) -+{ -+ compound_depend_t *conflicts = pkg->conflicts; -+ int conflicts_count = pkg->conflicts_count; -+ int i, j; -+ for (i = 0; i < conflicts_count; i++) { -+ int possibility_count = conflicts[i].possibility_count; -+ struct depend **possibilities = conflicts[i].possibilities; -+ for (j = 0; j < possibility_count; j++) { -+ if (possibilities[j]->pkg == conflictee) { -+ return 1; -+ } -+ } -+ } -+ return 0; -+} -+ -+/** -+ * pkg_conflicts returns 1 if pkg->conflicts contains one of -+ * conflictee's provides and 0 otherwise. -+ */ -+int pkg_conflicts(pkg_t *pkg, pkg_t *conflictee) -+{ -+ compound_depend_t *conflicts = pkg->conflicts; -+ int conflicts_count = pkg->conflicts_count; -+ abstract_pkg_t **conflictee_provides = conflictee->provides; -+ int conflictee_provides_count = conflictee->provides_count; -+ int i, j, k; -+ int possibility_count; -+ struct depend **possibilities; -+ abstract_pkg_t *possibility ; -+ -+ for (i = 0; i < conflicts_count; i++) { -+ possibility_count = conflicts[i].possibility_count; -+ possibilities = conflicts[i].possibilities; -+ for (j = 0; j < possibility_count; j++) { -+ possibility = possibilities[j]->pkg; -+ for (k = 0; k < conflictee_provides_count; k++) { -+ if (possibility == conflictee_provides[k]) { -+ return 1; -+ } -+ } -+ } -+ } -+ return 0; -+} -+ -+static char ** merge_unresolved(char ** oldstuff, char ** newstuff) -+{ -+ int oldlen = 0, newlen = 0; -+ char ** result; -+ register int i, j; -+ -+ if(!newstuff) -+ return oldstuff; -+ -+ while(oldstuff && oldstuff[oldlen]) oldlen++; -+ while(newstuff && newstuff[newlen]) newlen++; -+ -+ result = (char **)realloc(oldstuff, sizeof(char *) * (oldlen + newlen + 1)); -+ if (result == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ for(i = oldlen, j = 0; i < (oldlen + newlen); i++, j++) -+ *(result + i) = *(newstuff + j); -+ -+ *(result + i) = NULL; -+ -+ return result; -+} -+ -+/* -+ * a kinda kludgy way to back out depends str from two different arrays (reg'l'r 'n pre) -+ * this is null terminated, no count is carried around -+ */ -+char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx) -+{ -+ int count; -+ char ** resized; -+ char *depend_str = pkg_depend_str(pkg, ref_ndx); -+ -+ count = 0; -+ while(the_lost && the_lost[count]) count++; -+ -+ count++; /* need one to hold the null */ -+ resized = (char **)realloc(the_lost, sizeof(char *) * (count + 1)); -+ if (resized == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ resized[count - 1] = strdup(depend_str); -+ resized[count] = NULL; -+ -+ return resized; -+} -+ -+void printDepends(pkg_t * pkg) -+{ -+ register int i, j; -+ compound_depend_t * depend; -+ int count; -+ -+ count = pkg->pre_depends_count + pkg->depends_count; -+ -+ depend = pkg->depends; -+ if(!depend){ -+ fprintf(stderr, "Depends pointer is NULL\n"); -+ return; -+ } -+ for(i = 0; i < count; i++){ -+ fprintf(stderr, "%s has %d possibilities:\n", -+ (depend->type == GREEDY_DEPEND) ? "Greedy-Depend" : ((depend->type == DEPEND) ? "Depend" : "Pre-Depend"), -+ depend->possibility_count); -+ for(j = 0; j < depend->possibility_count; j++) -+ fprintf(stderr, "\t%s version %s (%d)\n", -+ depend->possibilities[j]->pkg->name, -+ depend->possibilities[j]->version, -+ depend->possibilities[j]->constraint); -+ depend++; -+ } -+} -+ -+int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) -+{ -+ register int i, j; -+ -+ /* every pkg provides itself */ -+ abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg); -+ -+ if (!pkg->provides_count) -+ return 0; -+ -+ pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1)); -+ if (pkg->provides == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return -1 ; -+ } -+ pkg->provides[0] = ab_pkg; -+ -+ // if (strcmp(ab_pkg->name, pkg->name)) -+ // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name); -+ -+ for(i = 0; i < pkg->provides_count; i++){ -+ abstract_pkg_t *provided_abpkg = ensure_abstract_pkg_by_name(hash, pkg->provides_str[i]); -+ -+ pkg->provides[i+1] = provided_abpkg; -+ -+ j = 0; -+ abstract_pkg_vec_insert(provided_abpkg->provided_by, ab_pkg); -+ } -+ return 0; -+} -+ -+/* Abhaya: added conflicts support */ -+int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) -+{ -+ register int i; -+ compound_depend_t * conflicts; -+ -+ if (!pkg->conflicts_count) -+ return 0; -+ -+ conflicts = pkg->conflicts = malloc(sizeof(compound_depend_t) * -+ pkg->conflicts_count); -+ if (conflicts == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return -1; -+ } -+ for (i = 0; i < pkg->conflicts_count; i++) { -+ conflicts->type = CONFLICTS; -+ parseDepends(conflicts, hash, -+ pkg->conflicts_str[i]); -+#if 0 -+ for (j = 0; j < conflicts->possibility_count; j++) { -+ depend_t *possibility = conflicts->possibilities[j]; -+ abstract_pkg_t *conflicting_apkg = possibility->pkg; -+ pkg_add_conflict_pair(ab_pkg, conflicting_apkg); -+ } -+#endif -+ conflicts++; -+ } -+ return 0; -+} -+ -+int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) -+{ -+ register int i, j; -+ -+ if (!pkg->replaces_count) -+ return 0; -+ -+ pkg->replaces = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * pkg->replaces_count); -+ if (pkg->replaces == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return -1; -+ } -+ -+ // if (strcmp(ab_pkg->name, pkg->name)) -+ // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name); -+ -+ for(i = 0; i < pkg->replaces_count; i++){ -+ abstract_pkg_t *old_abpkg = ensure_abstract_pkg_by_name(hash, pkg->replaces_str[i]); -+ -+ pkg->replaces[i] = old_abpkg; -+ -+ j = 0; -+ if (!old_abpkg->replaced_by) -+ old_abpkg->replaced_by = abstract_pkg_vec_alloc(); -+ if ( old_abpkg->replaced_by == NULL ){ -+ return -1; -+ } -+ /* if a package pkg both replaces and conflicts old_abpkg, -+ * then add it to the replaced_by vector so that old_abpkg -+ * will be upgraded to ab_pkg automatically */ -+ if (pkg_conflicts_abstract(pkg, old_abpkg)) -+ abstract_pkg_vec_insert(old_abpkg->replaced_by, ab_pkg); -+ } -+ return 0; -+} -+ -+int buildDepends(hash_table_t * hash, pkg_t * pkg) -+{ -+ int count; -+ register int i; -+ compound_depend_t * depends; -+ -+ if(!(count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count)) -+ return 0; -+ -+ if (0 && pkg->pre_depends_count) -+ fprintf(stderr, "pkg=%s pre_depends_count=%d depends_count=%d\n", -+ pkg->name, pkg->pre_depends_count, pkg->depends_count); -+ depends = pkg->depends = malloc(sizeof(compound_depend_t) * count); -+ if (depends == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return -1; -+ } -+ -+ -+ for(i = 0; i < pkg->pre_depends_count; i++){ -+ parseDepends(depends, hash, pkg->pre_depends_str[i]); -+ if (0 && pkg->pre_depends_count) -+ fprintf(stderr, " pre_depends_str=%s depends=%p possibility_count=%x\n", -+ pkg->pre_depends_str[i], depends, depends->possibility_count); -+ depends->type = PREDEPEND; -+ depends++; -+ } -+ -+ for(i = 0; i < pkg->recommends_count; i++){ -+ parseDepends(depends, hash, pkg->recommends_str[i]); -+ if (0 && pkg->recommends_count) -+ fprintf(stderr, " recommends_str=%s depends=%p possibility_count=%x\n", -+ pkg->recommends_str[i], depends, depends->possibility_count); -+ depends->type = RECOMMEND; -+ depends++; -+ } -+ -+ for(i = 0; i < pkg->suggests_count; i++){ -+ parseDepends(depends, hash, pkg->suggests_str[i]); -+ if (0 && pkg->suggests_count) -+ fprintf(stderr, " suggests_str=%s depends=%p possibility_count=%x\n", -+ pkg->suggests_str[i], depends, depends->possibility_count); -+ depends->type = SUGGEST; -+ depends++; -+ } -+ -+ for(i = 0; i < pkg->depends_count; i++){ -+ parseDepends(depends, hash, pkg->depends_str[i]); -+ if (0 && pkg->depends_count) -+ fprintf(stderr, " depends_str=%s depends=%p possibility_count=%x\n", -+ pkg->depends_str[i], depends, depends->possibility_count); -+ depends++; -+ } -+ return 0; -+} -+ -+/* -+ * pkg_depend_string: returns the depends string specified by index. -+ * All 4 kinds of dependences: dependence, pre-dependence, recommend, and suggest are number starting from 0. -+ * [0,npredepends) -> returns pre_depends_str[index] -+ * [npredepends,npredepends+nrecommends) -> returns recommends_str[index] -+ * [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index] -+ * [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index] -+ */ -+char *pkg_depend_str(pkg_t *pkg, int index) -+{ -+ if (index < pkg->pre_depends_count) { -+ return pkg->pre_depends_str[index]; -+ } -+ index -= pkg->pre_depends_count; -+ -+ if (index < pkg->recommends_count) { -+ return pkg->recommends_str[index]; -+ } -+ index -= pkg->recommends_count; -+ -+ if (index < pkg->suggests_count) { -+ return pkg->suggests_str[index]; -+ } -+ index -= pkg->suggests_count; -+ -+ if (index < pkg->depends_count) { -+ return pkg->depends_str[index]; -+ } -+ fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name); -+ return NULL; -+} -+ -+void freeDepends(pkg_t *pkg) -+{ -+ int i; -+ -+ if (pkg == NULL || pkg->depends == NULL) { -+ return; -+ } -+ -+ fprintf(stderr, "Freeing depends=%p\n", pkg->depends); -+ for (i=0; i < pkg->depends->possibility_count; i++) { -+ depend_deinit(pkg->depends->possibilities[i]); -+ } -+ free(pkg->depends->possibilities); -+ free(pkg->depends); -+ pkg->depends = NULL; -+} -+ -+void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg) -+{ -+ compound_depend_t * depends; -+ int count, othercount; -+ register int i, j; -+ abstract_pkg_t * ab_depend; -+ abstract_pkg_t ** temp; -+ -+ count = pkg->pre_depends_count + pkg->depends_count; -+ depends = pkg->depends; -+ -+ if (0 && pkg->pre_depends_count) -+ fprintf(stderr, "pkg=%s pre_depends_count=%d depends_count=%d\n", -+ pkg->name, pkg->pre_depends_count, pkg->depends_count); -+ for (i = 0; i < count; i++) { -+ if (0 && pkg->pre_depends_count) -+ fprintf(stderr, " i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends); -+ for (j = 0; j < depends->possibility_count; j++){ -+ ab_depend = depends->possibilities[j]->pkg; -+ if(!ab_depend->depended_upon_by) -+ ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *)); -+ -+ temp = ab_depend->depended_upon_by; -+ othercount = 1; -+ while(*temp){ -+ temp++; -+ othercount++; -+ } -+ *temp = ab_pkg; -+ -+ ab_depend->depended_upon_by = (abstract_pkg_t **)realloc(ab_depend->depended_upon_by, -+ (othercount + 1) * sizeof(abstract_pkg_t *)); -+ /* the array may have moved */ -+ temp = ab_depend->depended_upon_by + othercount; -+ *temp = NULL; -+ } -+ depends++; -+ } -+} -+ -+static depend_t * depend_init(void) -+{ -+ depend_t * d = (depend_t *)malloc(sizeof(depend_t)); -+ if ( d==NULL ){ -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ d->constraint = NONE; -+ d->version = NULL; -+ d->pkg = NULL; -+ -+ return d; -+} -+ -+static void depend_deinit(depend_t *d) -+{ -+ free(d); -+} -+ -+static int parseDepends(compound_depend_t *compound_depend, -+ hash_table_t * hash, char * depend_str) -+{ -+ char * pkg_name, buffer[2048]; -+ int num_of_ors = 0; -+ register int i; -+ register char * src, * dest; -+ depend_t ** possibilities; -+ -+ /* first count the number of ored possibilities for satisfying dependency */ -+ src = depend_str; -+ while(*src) -+ if(*src++ == '|') -+ num_of_ors++; -+ -+ compound_depend->type = DEPEND; -+ -+ compound_depend->possibility_count = num_of_ors + 1; -+ possibilities = (depend_t **)malloc(sizeof(depend_t *) * (num_of_ors + 1)); -+ if (!possibilities) -+ return -ENOMEM; -+ compound_depend->possibilities = possibilities; -+ -+ src = depend_str; -+ for(i = 0; i < num_of_ors + 1; i++){ -+ possibilities[i] = depend_init(); -+ if (!possibilities[i]) -+ return -ENOMEM; -+ /* gobble up just the name first */ -+ dest = buffer; -+ while(*src && -+ !isspace(*src) && -+ (*src != '(') && -+ (*src != '*') && -+ (*src != '|')) -+ *dest++ = *src++; -+ *dest = '\0'; -+ pkg_name = trim_alloc(buffer); -+ if (pkg_name == NULL ) -+ return -ENOMEM; -+ -+ /* now look at possible version info */ -+ -+ /* skip to next chars */ -+ if(isspace(*src)) -+ while(*src && isspace(*src)) src++; -+ -+ /* extract constraint and version */ -+ if(*src == '('){ -+ src++; -+ if(!strncmp(src, "<<", 2)){ -+ possibilities[i]->constraint = EARLIER; -+ src += 2; -+ } -+ else if(!strncmp(src, "<=", 2)){ -+ possibilities[i]->constraint = EARLIER_EQUAL; -+ src += 2; -+ } -+ else if(!strncmp(src, ">=", 2)){ -+ possibilities[i]->constraint = LATER_EQUAL; -+ src += 2; -+ } -+ else if(!strncmp(src, ">>", 2)){ -+ possibilities[i]->constraint = LATER; -+ src += 2; -+ } -+ else if(!strncmp(src, "=", 1)){ -+ possibilities[i]->constraint = EQUAL; -+ src++; -+ } -+ /* should these be here to support deprecated designations; dpkg does */ -+ else if(!strncmp(src, "<", 1)){ -+ possibilities[i]->constraint = EARLIER_EQUAL; -+ src++; -+ } -+ else if(!strncmp(src, ">", 1)){ -+ possibilities[i]->constraint = LATER_EQUAL; -+ src++; -+ } -+ -+ /* now we have any constraint, pass space to version string */ -+ while(isspace(*src)) src++; -+ -+ /* this would be the version string */ -+ dest = buffer; -+ while(*src && *src != ')') -+ *dest++ = *src++; -+ *dest = '\0'; -+ -+ possibilities[i]->version = trim_alloc(buffer); -+ /* fprintf(stderr, "let's print the depends version string:"); -+ fprintf(stderr, "version %s\n", possibilities[i]->version);*/ -+ if (possibilities[i]->version == NULL ) -+ return -ENOMEM; -+ -+ -+ } -+ /* hook up the dependency to its abstract pkg */ -+ possibilities[i]->pkg = ensure_abstract_pkg_by_name(hash, pkg_name); -+ -+ free(pkg_name); -+ -+ /* now get past the ) and any possible | chars */ -+ while(*src && -+ (isspace(*src) || -+ (*src == ')') || -+ (*src == '|'))) -+ src++; -+ if (*src == '*') -+ { -+ compound_depend->type = GREEDY_DEPEND; -+ src++; -+ } -+ } -+ -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_depends.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,105 @@ -+/* pkg_depends.h - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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_DEPENDS_H -+#define PKG_DEPENDS_H -+ -+#include "pkg.h" -+#include "pkg_hash.h" -+ -+enum depend_type { -+ PREDEPEND, -+ DEPEND, -+ CONFLICTS, -+ GREEDY_DEPEND, -+ RECOMMEND, -+ SUGGEST -+}; -+typedef enum depend_type depend_type_t; -+ -+enum version_constraint { -+ NONE, -+ EARLIER, -+ EARLIER_EQUAL, -+ EQUAL, -+ LATER_EQUAL, -+ LATER -+}; -+typedef enum version_constraint version_constraint_t; -+ -+struct depend{ -+ version_constraint_t constraint; -+ char * version; -+ abstract_pkg_t * pkg; -+}; -+typedef struct depend depend_t; -+ -+struct compound_depend{ -+ depend_type_t type; -+ int possibility_count; -+ struct depend ** possibilities; -+}; -+typedef struct compound_depend compound_depend_t; -+ -+#include "hash_table.h" -+ -+int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg); -+int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg); -+int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg); -+int buildDepends(hash_table_t * hash, pkg_t * pkg); -+ -+/** -+ * pkg_has_common_provides returns 1 if pkg and replacee both provide -+ * the same abstract package and 0 otherwise. -+ */ -+int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee); -+ -+/** -+ * pkg_provides returns 1 if pkg->provides contains providee and 0 -+ * otherwise. -+ */ -+int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee); -+ -+/** -+ * pkg_replaces returns 1 if pkg->replaces contains one of replacee's provides and 0 -+ * otherwise. -+ */ -+int pkg_replaces(pkg_t *pkg, pkg_t *replacee); -+ -+/** -+ * pkg_conflicts_abstract returns 1 if pkg->conflicts contains conflictee provides and 0 -+ * otherwise. -+ */ -+int pkg_conflicts_abstract(pkg_t *pkg, abstract_pkg_t *conflicts); -+ -+/** -+ * pkg_conflicts returns 1 if pkg->conflicts contains one of conflictee's provides and 0 -+ * otherwise. -+ */ -+int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts); -+ -+char *pkg_depend_str(pkg_t *pkg, int index); -+void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg); -+void freeDepends(pkg_t *pkg); -+void printDepends(pkg_t * pkg); -+int version_constraints_satisfied(depend_t * depends, pkg_t * pkg); -+int pkg_hash_fetch_unsatisfied_dependencies(ipkg_conf_t *conf, pkg_t * pkg, pkg_vec_t *depends, char *** unresolved); -+pkg_vec_t * pkg_hash_fetch_conflicts(hash_table_t * hash, pkg_t * pkg); -+int pkg_dependence_satisfiable(ipkg_conf_t *conf, depend_t *depend); -+int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_dest.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,92 @@ -+/* pkg_dest.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "pkg_dest.h" -+#include "file_util.h" -+#include "str_util.h" -+#include "sprintf_alloc.h" -+ -+int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char * lists_dir) -+{ -+ dest->name = strdup(name); -+ -+ /* Guarantee that dest->root_dir ends with a '/' */ -+ if (str_ends_with(root_dir, "/")) { -+ dest->root_dir = strdup(root_dir); -+ } else { -+ sprintf_alloc(&dest->root_dir, "%s/", root_dir); -+ } -+ file_mkdir_hier(dest->root_dir, 0755); -+ -+ sprintf_alloc(&dest->ipkg_dir, "%s%s", -+ dest->root_dir, IPKG_STATE_DIR_PREFIX); -+ file_mkdir_hier(dest->ipkg_dir, 0755); -+ -+ if (str_starts_with (lists_dir, "/")) -+ sprintf_alloc(&dest->lists_dir, "%s", lists_dir); -+ else -+ sprintf_alloc(&dest->lists_dir, "/%s", lists_dir); -+ -+ file_mkdir_hier(dest->lists_dir, 0755); -+ -+ sprintf_alloc(&dest->info_dir, "%s/%s", -+ dest->ipkg_dir, IPKG_INFO_DIR_SUFFIX); -+ file_mkdir_hier(dest->info_dir, 0755); -+ -+ sprintf_alloc(&dest->status_file_name, "%s/%s", -+ dest->ipkg_dir, IPKG_STATUS_FILE_SUFFIX); -+ -+ sprintf_alloc(&dest->status_file_tmp_name, "%s/%s.tmp", -+ dest->ipkg_dir, IPKG_STATUS_FILE_SUFFIX); -+ -+ dest->status_file = NULL; -+ -+ return 0; -+} -+ -+void pkg_dest_deinit(pkg_dest_t *dest) -+{ -+ free(dest->name); -+ dest->name = NULL; -+ -+ free(dest->root_dir); -+ dest->root_dir = NULL; -+ -+ free(dest->ipkg_dir); -+ dest->ipkg_dir = NULL; -+ -+ free(dest->lists_dir); -+ dest->lists_dir = NULL; -+ -+ free(dest->info_dir); -+ dest->info_dir = NULL; -+ -+ free(dest->status_file_name); -+ dest->status_file_name = NULL; -+ -+ free(dest->status_file_tmp_name); -+ dest->status_file_tmp_name = NULL; -+ -+ if (dest->status_file) { -+ fclose(dest->status_file); -+ } -+ dest->status_file = NULL; -+ -+ dest->root_dir = NULL; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_dest.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,38 @@ -+/* pkg_dest.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_DEST_H -+#define PKG_DEST_H -+ -+typedef struct pkg_dest pkg_dest_t; -+struct pkg_dest -+{ -+ char *name; -+ char *root_dir; -+ char *ipkg_dir; -+ char *lists_dir; -+ char *info_dir; -+ char *status_file_name; -+ char *status_file_tmp_name; -+ FILE *status_file; -+}; -+ -+int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char *lists_dir); -+void pkg_dest_deinit(pkg_dest_t *dest); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_dest_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,85 @@ -+/* pkg_dest_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "pkg_dest.h" -+#include "void_list.h" -+#include "pkg_dest_list.h" -+ -+int pkg_dest_list_elt_init(pkg_dest_list_elt_t *elt, pkg_dest_t *data) -+{ -+ return void_list_elt_init((void_list_elt_t *) elt, data); -+} -+ -+void pkg_dest_list_elt_deinit(pkg_dest_list_elt_t *elt) -+{ -+ void_list_elt_deinit((void_list_elt_t *) elt); -+} -+ -+int pkg_dest_list_init(pkg_dest_list_t *list) -+{ -+ return void_list_init((void_list_t *) list); -+} -+ -+void pkg_dest_list_deinit(pkg_dest_list_t *list) -+{ -+ pkg_dest_list_elt_t *iter; -+ pkg_dest_t *pkg_dest; -+ -+ for (iter = list->head; iter; iter = iter->next) { -+ pkg_dest = iter->data; -+ pkg_dest_deinit(pkg_dest); -+ -+ /* malloced in pkg_dest_list_append */ -+ free(pkg_dest); -+ iter->data = NULL; -+ } -+ void_list_deinit((void_list_t *) list); -+} -+ -+pkg_dest_t *pkg_dest_list_append(pkg_dest_list_t *list, const char *name, -+ const char *root_dir,const char *lists_dir) -+{ -+ int err; -+ pkg_dest_t *pkg_dest; -+ -+ /* freed in plg_dest_list_deinit */ -+ pkg_dest = malloc(sizeof(pkg_dest_t)); -+ if (pkg_dest == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ -+ pkg_dest_init(pkg_dest, name, root_dir,lists_dir); -+ err = void_list_append((void_list_t *) list, pkg_dest); -+ if (err) { -+ return NULL; -+ } -+ -+ return pkg_dest; -+} -+ -+int pkg_dest_list_push(pkg_dest_list_t *list, pkg_dest_t *data) -+{ -+ return void_list_push((void_list_t *) list, data); -+} -+ -+pkg_dest_list_elt_t *pkg_dest_list_pop(pkg_dest_list_t *list) -+{ -+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_dest_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,50 @@ -+/* pkg_dest_list.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_DEST_LIST_H -+#define PKG_DEST_LIST_H -+ -+#include "pkg_dest.h" -+ -+typedef struct pkg_dest_list_elt pkg_dest_list_elt_t; -+struct pkg_dest_list_elt -+{ -+ pkg_dest_list_elt_t *next; -+ pkg_dest_t *data; -+}; -+ -+typedef struct pkg_dest_list pkg_dest_list_t; -+struct pkg_dest_list -+{ -+ pkg_dest_list_elt_t pre_head; -+ pkg_dest_list_elt_t *head; -+ pkg_dest_list_elt_t *tail; -+}; -+ -+int pkg_dest_list_elt_init(pkg_dest_list_elt_t *elt, pkg_dest_t *data); -+void pkg_dest_list_elt_deinit(pkg_dest_list_elt_t *elt); -+ -+int pkg_dest_list_init(pkg_dest_list_t *list); -+void pkg_dest_list_deinit(pkg_dest_list_t *list); -+ -+pkg_dest_t *pkg_dest_list_append(pkg_dest_list_t *list, const char *name, -+ const char *root_dir,const char* lists_dir); -+int pkg_dest_list_push(pkg_dest_list_t *list, pkg_dest_t *data); -+pkg_dest_list_elt_t *pkg_dest_list_pop(pkg_dest_list_t *list); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_extract.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,224 @@ -+/* pkg_extract.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <fcntl.h> -+#include <stdio.h> -+ -+#include "pkg_extract.h" -+ -+#include "libbb.h" -+#include "file_util.h" -+#include "sprintf_alloc.h" -+#include "unarchive.h" -+ -+#define IPKG_CONTROL_ARCHIVE "control.tar.gz" -+#define IPKG_DATA_ARCHIVE "data.tar.gz" -+#define IPKG_CONTROL_FILE "control" -+ -+static void extract_ipkg_file_to_dir(pkg_t *pkg, const char *dir, const char *filename) -+{ -+ archive_handle_t *archive; -+ char *path; -+ -+ sprintf_alloc(&path, "%s/", dir); -+ archive = init_handle(); -+ archive->src_fd = bb_xopen(pkg->local_filename, O_RDONLY); -+ archive->filter = filter_accept_list; -+ archive->accept = llist_add_to(NULL, (char *)filename); -+ archive->buffer = path; -+ archive->action_data = data_extract_all_prefix; -+ archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL; -+ while( get_header_tar_gz(archive) == EXIT_SUCCESS ); -+ close(archive->src_fd); -+ free(archive->accept); -+ free(archive); -+ free(path); -+} -+ -+static void data_extract_file_name_to_buffer(archive_handle_t *archive) -+{ -+ unsigned int size = strlen(archive->file_header->name) + 2; -+ -+ if (archive->buffer == NULL) { -+ archive->buffer = xmalloc(size); -+ strcpy(archive->buffer, archive->file_header->name); -+ } else { -+ size += strlen(archive->buffer); -+ archive->buffer = xrealloc(archive->buffer, size); -+ strcat(archive->buffer, archive->file_header->name); -+ } -+ strcat(archive->buffer, "\n"); -+ data_skip(archive); -+} -+ -+int pkg_extract_control_file_to_stream(pkg_t *pkg, FILE *stream) -+{ -+ archive_handle_t *archive; -+ char *name; -+ -+ extract_ipkg_file_to_dir(pkg, global_conf->tmp_dir, "./" IPKG_CONTROL_ARCHIVE); -+ sprintf_alloc(&name, "%s/%s", global_conf->tmp_dir, IPKG_CONTROL_ARCHIVE); -+ archive = init_handle(); -+ archive->src_fd = bb_xopen(name, O_RDONLY); -+ archive->filter = filter_accept_list; -+ archive->accept = llist_add_to(NULL, "./" IPKG_CONTROL_FILE); -+ archive->action_data = data_extract_to_buffer; -+ while( get_header_tar_gz(archive) == EXIT_SUCCESS ); -+ close(archive->src_fd); -+ fputs(archive->buffer, stream); -+ free(archive->buffer); -+ free(archive->accept); -+ free(archive); -+ free(name); -+ -+ return 0; -+} -+ -+int pkg_extract_control_files_to_dir(pkg_t *pkg, const char *dir) -+{ -+ return pkg_extract_control_files_to_dir_with_prefix(pkg, dir, ""); -+} -+ -+int pkg_extract_control_files_to_dir_with_prefix(pkg_t *pkg, const char *dir, const char *prefix) -+{ -+ archive_handle_t *archive; -+ char *name; -+ char *path; -+ -+ extract_ipkg_file_to_dir(pkg, global_conf->tmp_dir, "./" IPKG_CONTROL_ARCHIVE); -+ sprintf_alloc(&name, "%s/%s", global_conf->tmp_dir, IPKG_CONTROL_ARCHIVE); -+ sprintf_alloc(&path, "%s/%s", dir, prefix); -+ archive = init_handle(); -+ archive->src_fd = bb_xopen(name, O_RDONLY); -+ archive->filter = filter_accept_all; -+ archive->buffer = path; -+ archive->action_data = data_extract_all_prefix; -+ archive->flags |= ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; -+ while( get_header_tar_gz(archive) == EXIT_SUCCESS ); -+ close(archive->src_fd); -+ free(archive); -+ free(path); -+ free(name); -+ -+ return 0; -+} -+ -+int pkg_extract_data_files_to_dir(pkg_t *pkg, const char *dir) -+{ -+ archive_handle_t *archive; -+ char *name; -+ char *path; -+ -+ extract_ipkg_file_to_dir(pkg, global_conf->tmp_dir, "./" IPKG_DATA_ARCHIVE); -+ sprintf_alloc(&name, "%s/%s", global_conf->tmp_dir, IPKG_DATA_ARCHIVE); -+ sprintf_alloc(&path, "%s/", dir); -+ archive = init_handle(); -+ archive->src_fd = bb_xopen(name, O_RDONLY); -+ archive->filter = filter_accept_all; -+ archive->buffer = path; -+ archive->action_data = data_extract_all_prefix; -+ archive->flags |= ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; -+ while( get_header_tar_gz(archive) == EXIT_SUCCESS ); -+ close(archive->src_fd); -+ free(archive); -+ free(path); -+ free(name); -+ -+ return 0; -+} -+ -+int pkg_extract_data_file_names_to_file(pkg_t *pkg, const char *file_name) -+{ -+ int err=0; -+ char *line, *data_file; -+ FILE *file; -+ FILE *tmp; -+ -+ file = fopen(file_name, "w"); -+ if (file == NULL) { -+ fprintf(stderr, "%s: ERROR: Failed to open %s for writing.\n", -+ __FUNCTION__, file_name); -+ return EINVAL; -+ } -+ -+ tmp = tmpfile(); -+ if (pkg->installed_files) { -+ str_list_elt_t *elt; -+ for (elt = pkg->installed_files->head; elt; elt = elt->next) { -+ fprintf(file, "%s\n", elt->data); -+ } -+ } else { -+ err = pkg_extract_data_file_names_to_stream(pkg, tmp); -+ if (err) { -+ fclose(file); -+ fclose(tmp); -+ return err; -+ } -+ -+ /* Fixup data file names by removing the initial '.' */ -+ rewind(tmp); -+ while (1) { -+ line = file_read_line_alloc(tmp); -+ if (line == NULL) { -+ break; -+ } -+ -+ data_file = line; -+ if (*data_file == '.') { -+ data_file++; -+ } -+ -+ if (*data_file != '/') { -+ fputs("/", file); -+ } -+ -+ /* I have no idea why, but this is what dpkg does */ -+ if (strcmp(data_file, "/\n") == 0) { -+ fputs("/.\n", file); -+ } else { -+ fputs(data_file, file); -+ } -+ } -+ } -+ fclose(tmp); -+ fclose(file); -+ -+ return err; -+} -+ -+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file) -+{ -+ archive_handle_t *archive; -+ char *name; -+ -+ extract_ipkg_file_to_dir(pkg, global_conf->tmp_dir, "./" IPKG_DATA_ARCHIVE); -+ sprintf_alloc(&name, "%s/%s", global_conf->tmp_dir, IPKG_DATA_ARCHIVE); -+ archive = init_handle(); -+ archive->src_fd = bb_xopen(name, O_RDONLY); -+ archive->filter = filter_accept_all; -+ archive->action_data = data_extract_file_name_to_buffer; -+ while( get_header_tar_gz(archive) == EXIT_SUCCESS ); -+ close(archive->src_fd); -+ fputs(archive->buffer, file); -+ free(archive->buffer); -+ free(archive); -+ free(name); -+ -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_extract.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,32 @@ -+/* pkg_extract.c - 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_EXTRACT_H -+#define PKG_EXTRACT_H -+ -+#include "pkg.h" -+ -+int pkg_extract_control_file_to_stream(pkg_t *pkg, FILE *stream); -+int pkg_extract_control_files_to_dir(pkg_t *pkg, const char *dir); -+int pkg_extract_control_files_to_dir_with_prefix(pkg_t *pkg, -+ const char *dir, -+ const char *prefix); -+int pkg_extract_data_files_to_dir(pkg_t *pkg, const char *dir); -+int pkg_extract_data_file_names_to_file(pkg_t *pkg, const char *file_name); -+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_hash.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,617 @@ -+/* ipkg_hash.c - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <ctype.h> -+#include <stdlib.h> -+#include <string.h> -+ -+#include "hash_table.h" -+#include "pkg.h" -+#include "ipkg_message.h" -+#include "pkg_vec.h" -+#include "pkg_hash.h" -+#include "pkg_parse.h" -+#include "ipkg_utils.h" -+ -+static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name); -+ -+/* -+ * this will talk to both feeds-lists files and installed status files -+ * example api: -+ * -+ * hash_table_t hash; -+ * pkg_hash_init(name, &hash, 1000); -+ * pkg_hash_add_from_file(<feed filename>); -+ * -+ * the query function is just there as a shell to prove to me that this -+ * sort of works, but isn't far from doing something useful -+ * -+ * -sma, 12/21/01 -+ * modified: CDW 3 Jan. 2002 -+ */ -+ -+ -+ -+int pkg_hash_init(const char *name, hash_table_t *hash, int len) -+{ -+ return hash_table_init(name, hash, len); -+} -+ -+void pkg_hash_deinit(hash_table_t *hash) -+{ -+ hash_table_deinit(hash); -+} -+ -+ -+/* Find the default arch for a given package status file if none is given. */ -+static char *pkg_get_default_arch(ipkg_conf_t *conf) -+{ -+ nv_pair_list_elt_t *l; -+ char *def_arch = HOST_CPU_STR; /* Default arch */ -+ int def_prio = 0; /* Other archs override this */ -+ -+ l = conf->arch_list.head; -+ -+ while (l) { -+ nv_pair_t *nv = l->data; -+ int priority = strtol(nv->value, NULL, 0); -+ -+ /* Check if this arch has higher priority, and is valid */ -+ if ((priority > def_prio) && -+ (strcmp(nv->name, "all")) && (strcmp(nv->name, "noarch"))) { -+ /* Our new default */ -+ def_prio = priority; -+ def_arch = nv->name; -+ } -+ l = l->next; -+ } -+ -+ return strdup(def_arch); -+} -+ -+int pkg_hash_add_from_file(ipkg_conf_t *conf, const char *file_name, -+ pkg_src_t *src, pkg_dest_t *dest, int is_status_file) -+{ -+ hash_table_t *hash = &conf->pkg_hash; -+ char **raw; -+ char **raw_start; -+ pkg_t *pkg; -+ -+ raw = raw_start = read_raw_pkgs_from_file(file_name); -+ if (!raw) -+ return -ENOMEM; -+ -+ while(*raw){ /* don't worry, we'll increment raw in the parsing function */ -+ pkg = pkg_new(); -+ if (!pkg) -+ return -ENOMEM; -+ -+ if (pkg_parse_raw(pkg, &raw, src, dest) == 0) { -+ if (!pkg->architecture) { -+ char *version_str = pkg_version_str_alloc(pkg); -+ pkg->architecture = pkg_get_default_arch(conf); -+ ipkg_message(conf, IPKG_ERROR, "Package %s version %s has no architecture specified, defaulting to %s.\n", -+ pkg->name, version_str, pkg->architecture); -+ free(version_str); -+ } -+ hash_insert_pkg(hash, pkg, is_status_file,conf); -+ } else { -+ free(pkg); -+ } -+ } -+ -+ /* XXX: CLEANUP: I'd like a cleaner interface for cleaning up -+ memory after read_raw_pkgs_from_file */ -+ raw = raw_start; -+ while (*raw) { -+ free(*raw++); -+ } -+ free(raw_start); -+ return 0; -+} -+ -+abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name) -+{ -+ return (abstract_pkg_t *)hash_table_get(hash, pkg_name); -+} -+ -+abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *hash, const char *name) -+{ -+ abstract_pkg_t *apkg = abstract_pkg_fetch_by_name(hash, name); -+ if (apkg) -+ return NULL; -+ return apkg->provided_by; -+} -+ -+ -+pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, -+ int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet) -+{ -+ int i; -+ int nprovides = 0; -+ int nmatching = 0; -+ pkg_vec_t *matching_pkgs = pkg_vec_alloc(); -+ abstract_pkg_vec_t *matching_apkgs = abstract_pkg_vec_alloc(); -+ abstract_pkg_vec_t *provided_apkg_vec; -+ abstract_pkg_t **provided_apkgs; -+ abstract_pkg_vec_t *providers = abstract_pkg_vec_alloc(); -+ pkg_t *latest_installed_parent = NULL; -+ pkg_t *latest_matching = NULL; -+ pkg_t *held_pkg = NULL; -+ pkg_t *good_pkg_by_name = NULL; -+ -+ if (matching_apkgs == NULL || providers == NULL || -+ apkg == NULL || apkg->provided_by == NULL || (apkg->provided_by->len == 0)) -+ return NULL; -+ -+ ipkg_message(conf, IPKG_DEBUG, "best installation candidate for %s\n", apkg->name); -+ -+ provided_apkg_vec = apkg->provided_by; -+ nprovides = provided_apkg_vec->len; -+ provided_apkgs = provided_apkg_vec->pkgs; -+ if (nprovides > 1) -+ ipkg_message(conf, IPKG_DEBUG, " apkg=%s nprovides=%d\n", apkg->name, nprovides); -+ -+ /* accumulate all the providers */ -+ for (i = 0; i < nprovides; i++) { -+ abstract_pkg_t *provider_apkg = provided_apkgs[i]; -+ ipkg_message(conf, IPKG_DEBUG, " adding %s to providers\n", provider_apkg->name); -+ abstract_pkg_vec_insert(providers, provider_apkg); -+ } -+ nprovides = providers->len; -+ -+ for (i = 0; i < nprovides; i++) { -+ abstract_pkg_t *provider_apkg = abstract_pkg_vec_get(providers, i); -+ abstract_pkg_t *replacement_apkg = NULL; -+ pkg_vec_t *vec; -+ -+ if (provider_apkg->replaced_by && provider_apkg->replaced_by->len) { -+ replacement_apkg = provider_apkg->replaced_by->pkgs[0]; -+ if (provider_apkg->replaced_by->len > 1) { -+ ipkg_message(conf, IPKG_NOTICE, "Multiple replacers for %s, using first one (%s)\n", -+ provider_apkg->name, replacement_apkg->name); -+ } -+ } -+ -+ if (replacement_apkg) -+ ipkg_message(conf, IPKG_DEBUG, " replacement_apkg=%s for provider_apkg=%s\n", -+ replacement_apkg->name, provider_apkg->name); -+ -+ if (replacement_apkg && (replacement_apkg != provider_apkg)) { -+ if (abstract_pkg_vec_contains(providers, replacement_apkg)) -+ continue; -+ else -+ provider_apkg = replacement_apkg; -+ } -+ -+ if (!(vec = provider_apkg->pkgs)) { -+ ipkg_message(conf, IPKG_DEBUG, " no pkgs for provider_apkg %s\n", provider_apkg->name); -+ continue; -+ } -+ -+ -+ /* now check for supported architecture */ -+ { -+ int max_count = 0; -+ int i; -+ -+ /* count packages matching max arch priority and keep track of last one */ -+ for (i = 0; i < vec->len; i++) { -+ pkg_t *maybe = vec->pkgs[i]; -+ ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d version=%s \n", -+ maybe->name, maybe->architecture, maybe->arch_priority, maybe->version); -+ if (maybe->arch_priority > 0) { -+ max_count++; -+ abstract_pkg_vec_insert(matching_apkgs, maybe->parent); -+ pkg_vec_insert(matching_pkgs, maybe); -+ } -+ } -+ } -+ } -+ -+ if (matching_pkgs->len > 1) -+ pkg_vec_sort(matching_pkgs, pkg_name_version_and_architecture_compare); -+ if (matching_apkgs->len > 1) -+ abstract_pkg_vec_sort(matching_pkgs, abstract_pkg_name_compare); -+ -+/* Here it is usefull, if ( matching_apkgs->len > 1 ), to test if one of this matching packages has the same name of the -+ needed package. In this case, I would return it for install, otherwise I will continue with the procedure */ -+/* The problem is what to do when there are more than a mathing package, with the same name and several version ? -+ Until now I always got the latest, but that breaks the downgrade option. -+ If I stop at the first one, I would probably miss the new ones -+ Maybe the way is to have some kind of flag somewhere, to see if the package been asked to install is from a file, -+ or from a Packages feed. -+ It it is from a file it always need to be checked whatever version I have in feeds or everywhere, according to force-down or whatever options*/ -+/*Pigi*/ -+ -+ for (i = 0; i < matching_pkgs->len; i++) { -+ pkg_t *matching = matching_pkgs->pkgs[i]; -+ if (constraint_fcn(matching, cdata)) { /* We found it */ -+ ipkg_message(conf, IPKG_DEBUG, " Found a valid candidate for the install: %s %s \n", matching->name, matching->version) ; -+ good_pkg_by_name = matching; -+ if ( matching->provided_by_hand == 1 ) /* It has been provided by hand, so it is what user want */ -+ break; -+ } -+ } -+ -+ -+ for (i = 0; i < matching_pkgs->len; i++) { -+ pkg_t *matching = matching_pkgs->pkgs[i]; -+ latest_matching = matching; -+ if (matching->parent->state_status == SS_INSTALLED || matching->parent->state_status == SS_UNPACKED) -+ latest_installed_parent = matching; -+ if (matching->state_flag & (SF_HOLD|SF_PREFER)) { -+ if (held_pkg) -+ ipkg_message(conf, IPKG_ERROR, "Multiple packages (%s and %s) providing same name marked HOLD or PREFER. Using latest.\n", -+ held_pkg->name, matching->name); -+ held_pkg = matching; -+ } -+ } -+ -+ if (!good_pkg_by_name && !held_pkg && !latest_installed_parent && matching_apkgs->len > 1 && !quiet) { -+ ipkg_message(conf, IPKG_ERROR, "Package=%s, %d matching providers\n", -+ apkg->name, matching_apkgs->len); -+ for (i = 0; i < matching_apkgs->len; i++) { -+ abstract_pkg_t *matching = matching_apkgs->pkgs[i]; -+ ipkg_message(conf, IPKG_ERROR, " %s\n", matching->name); -+ } -+ ipkg_message(conf, IPKG_ERROR, "Please select one with ipkg install or ipkg flag prefer\n"); -+ } -+ -+ if (matching_apkgs->len > 1 && conf->verbosity > 1) { -+ ipkg_message(conf, IPKG_NOTICE, "%s: for apkg=%s, %d matching pkgs\n", -+ __FUNCTION__, apkg->name, matching_pkgs->len); -+ for (i = 0; i < matching_pkgs->len; i++) { -+ pkg_t *matching = matching_pkgs->pkgs[i]; -+ ipkg_message(conf, IPKG_INFO, " %s %s %s\n", -+ matching->name, matching->version, matching->architecture); -+ } -+ } -+ -+ nmatching = matching_apkgs->len; -+ -+ pkg_vec_free(matching_pkgs); -+ abstract_pkg_vec_free(matching_apkgs); -+ abstract_pkg_vec_free(providers); -+ -+ if (good_pkg_by_name) { /* We found a good candidate, we will install it */ -+ return good_pkg_by_name; -+ } -+ if (held_pkg) { -+ ipkg_message(conf, IPKG_INFO, " using held package %s\n", held_pkg->name); -+ return held_pkg; -+ } -+ if (latest_installed_parent) { -+ ipkg_message(conf, IPKG_INFO, " using latest version of installed package %s\n", latest_installed_parent->name); -+ return latest_installed_parent; -+ } -+ if (nmatching > 1) { -+ ipkg_message(conf, IPKG_INFO, " no matching pkg out of matching_apkgs=%d\n", nmatching); -+ return NULL; -+ } -+ if (latest_matching) { -+ ipkg_message(conf, IPKG_INFO, " using latest matching %s %s %s\n", -+ latest_matching->name, latest_matching->version, latest_matching->architecture); -+ return latest_matching; -+ } -+ return NULL; -+} -+ -+static int pkg_name_constraint_fcn(pkg_t *pkg, void *cdata) -+{ -+ const char *name = (const char *)cdata; -+ if (strcmp(pkg->name, name) == 0) -+ return 1; -+ else -+ return 0; -+} -+ -+pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(ipkg_conf_t *conf, const char *name) -+{ -+ hash_table_t *hash = &conf->pkg_hash; -+ abstract_pkg_t *apkg = NULL; -+ -+ if (!(apkg = abstract_pkg_fetch_by_name(hash, name))) -+ return NULL; -+ -+ return pkg_hash_fetch_best_installation_candidate(conf, apkg, pkg_name_constraint_fcn, apkg->name, 0); -+} -+ -+ -+pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, -+ const char *pkg_name, -+ const char * version) -+{ -+ pkg_vec_t * vec; -+ register int i; -+ char *version_str = NULL; -+ -+ if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) -+ return NULL; -+ -+ for(i = 0; i < vec->len; i++) { -+ version_str = pkg_version_str_alloc(vec->pkgs[i]); -+ if(!strcmp(version_str, version)) { -+ free(version_str); -+ break; -+ } -+ free(version_str); -+ } -+ -+ if(i == vec->len) -+ return NULL; -+ -+ return vec->pkgs[i]; -+} -+ -+pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash, -+ const char *pkg_name, -+ pkg_dest_t *dest) -+{ -+ pkg_vec_t * vec; -+ register int i; -+ -+ if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))) { -+ return NULL; -+ } -+ -+ for(i = 0; i < vec->len; i++) -+ if((vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED) && vec->pkgs[i]->dest == dest) { -+ return vec->pkgs[i]; -+ } -+ return NULL; -+} -+ -+pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash, -+ const char *pkg_name) -+{ -+ pkg_vec_t * vec; -+ register int i; -+ -+ if(!(vec = pkg_vec_fetch_by_name(hash, pkg_name))){ -+ return NULL; -+ } -+ -+ for(i = 0; i < vec->len; i++) -+ if (vec->pkgs[i]->state_status == SS_INSTALLED || vec->pkgs[i]->state_status == SS_UNPACKED){ -+ return vec->pkgs[i]; -+ } -+ -+ return NULL; -+} -+ -+pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name) -+{ -+ abstract_pkg_t * ab_pkg; -+ -+ if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name))){ -+ return NULL; -+ } -+ -+ if (ab_pkg->pkgs) { -+ return ab_pkg->pkgs; -+ } else if (ab_pkg->provided_by) { -+ abstract_pkg_t *abpkg = abstract_pkg_vec_get(ab_pkg->provided_by, 0); -+ if (abpkg != NULL){ -+ return abpkg->pkgs; -+ } else { -+ return ab_pkg->pkgs; -+ } -+ } else { -+ return NULL; -+ } -+} -+ -+static int pkg_compare_names(const void *p1, const void *p2) -+{ -+ const pkg_t *pkg1 = *(const pkg_t **)p1; -+ const pkg_t *pkg2 = *(const pkg_t **)p2; -+ if (pkg1->name == NULL) -+ return 1; -+ if (pkg2->name == NULL) -+ return -1; -+ return(strcmp(pkg1->name, pkg2->name)); -+} -+ -+ -+static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data) -+{ -+ int j; -+ abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry; -+ pkg_vec_t *all = (pkg_vec_t *)data; -+ pkg_vec_t *pkg_vec = ab_pkg->pkgs; -+ if (pkg_vec) { -+ for (j = 0; j < pkg_vec->len; j++) { -+ pkg_t *pkg = pkg_vec->pkgs[j]; -+ pkg_vec_insert(all, pkg); -+ } -+ } -+} -+ -+void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *all) -+{ -+ hash_table_foreach(hash, pkg_hash_fetch_available_helper, all); -+ qsort(all->pkgs, all->len, sizeof(pkg_t *), pkg_compare_names); -+} -+ -+static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry, void *data) -+{ -+ abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry; -+ pkg_vec_t *all = (pkg_vec_t *)data; -+ pkg_vec_t *pkg_vec = ab_pkg->pkgs; -+ int j; -+ if (pkg_vec) { -+ for (j = 0; j < pkg_vec->len; j++) { -+ pkg_t *pkg = pkg_vec->pkgs[j]; -+ if (pkg->state_status == SS_INSTALLED || pkg->state_status == SS_UNPACKED) { -+ pkg_vec_insert(all, pkg); -+ } -+ } -+ } -+} -+void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *all) -+{ -+ hash_table_foreach(hash, pkg_hash_fetch_all_installed_helper, all); -+ qsort(all->pkgs, all->len, sizeof(void*), pkg_compare_names); -+} -+ -+static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data) -+{ -+ int i; -+ pkg_t *pkg; -+ abstract_pkg_t *ab_pkg = (abstract_pkg_t *)entry; -+ ipkg_conf_t *conf = (ipkg_conf_t *)data; -+ abstract_pkg_t ** dependents = ab_pkg->depended_upon_by; -+ fprintf(stdout, "%s\n", ab_pkg->name); -+ i = 0; -+ if (dependents != NULL) -+ while (dependents [i] != NULL) -+ printf ("\tdepended upon by - %s\n", dependents [i ++]->name); -+ dependents = ab_pkg->provided_by->pkgs; -+ i = 0; -+ if (dependents != NULL) -+ while (dependents [i] != NULL && i < ab_pkg->provided_by->len) -+ printf ("\tprovided by - %s\n", dependents [i ++]->name); -+ pkg = pkg_hash_fetch_best_installation_candidate_by_name (conf, ab_pkg->name); -+ if (pkg) { -+ i = 0; -+ while (i < pkg->depends_count) -+ printf ("\tdepends on - %s\n", pkg->depends_str [i ++]); -+ } -+} -+void pkg_hash_dump(hash_table_t *hash, void *data) -+{ -+ -+ printf ("\n\n+=+%s+=+\n\n", __FUNCTION__); -+ hash_table_foreach(hash, pkg_hash_dump_helper, data); -+ printf ("\n+=+%s+=+\n\n", __FUNCTION__); -+} -+ -+abstract_pkg_t * ensure_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name) -+{ -+ abstract_pkg_t * ab_pkg; -+ -+ if(!(ab_pkg = abstract_pkg_fetch_by_name(hash, pkg_name))) -+ ab_pkg = add_new_abstract_pkg_by_name(hash, pkg_name); -+ -+ return ab_pkg; -+} -+ -+pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,ipkg_conf_t *conf) -+{ -+ abstract_pkg_t * ab_pkg; -+ int arch_priority; -+ -+ if(!pkg) -+ return pkg; -+ -+ arch_priority = pkg->arch_priority; -+ -+ if (buildDepends(hash, pkg)<0){ -+ fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); -+ return NULL; -+ } -+ ab_pkg = ensure_abstract_pkg_by_name(hash, pkg->name); -+ -+ if (set_status) { -+ if (pkg->state_status == SS_INSTALLED) { -+ ab_pkg->state_status = SS_INSTALLED; -+ } else if (pkg->state_status == SS_UNPACKED) { -+ ab_pkg->state_status = SS_UNPACKED; -+ } -+ } -+ -+ if(!ab_pkg->pkgs) -+ ab_pkg->pkgs = pkg_vec_alloc(); -+ -+ /* pkg_vec_insert_merge might munge package, but it returns an unmunged pkg */ -+ pkg = pkg_vec_insert_merge(ab_pkg->pkgs, pkg, set_status,conf ); -+ pkg->parent = ab_pkg; -+ -+ if (buildProvides(hash, ab_pkg, pkg)<0){ -+ fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); -+ return NULL; -+ } -+ /* need to build the conflicts graph before replaces for correct calculation of replaced_by relation */ -+ if (buildConflicts(hash, ab_pkg, pkg)<0){ -+ fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); -+ return NULL; -+ } -+ if (buildReplaces(hash, ab_pkg, pkg)<0) { -+ fprintf(stderr, "%s : This should never happen. Report this Bug in bugzilla please \n ",__FUNCTION__); -+ return NULL; -+ } -+ -+ buildDependedUponBy(pkg, ab_pkg); -+ return pkg; -+} -+ -+/* -+ * this will assume that we've already determined that -+ * the abstract pkg doesn't exist, 'cause we should know these things... -+ */ -+static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name) -+{ -+ abstract_pkg_t * ab_pkg; -+ -+ ab_pkg = abstract_pkg_new(); -+ if (ab_pkg == NULL) { return NULL; } -+ -+ ab_pkg->name = strdup(pkg_name); -+ hash_table_insert(hash, pkg_name, ab_pkg); -+ -+ return ab_pkg; -+} -+ -+ -+pkg_t *file_hash_get_file_owner(ipkg_conf_t *conf, const char *file_name) -+{ -+ hash_table_t *file_hash = &conf->file_hash; -+ -+ return hash_table_get(file_hash, file_name); -+} -+ -+int file_hash_set_file_owner(ipkg_conf_t *conf, const char *file_name, pkg_t *owning_pkg) -+{ -+ hash_table_t *file_hash = &conf->file_hash; -+ pkg_t *old_owning_pkg = hash_table_get(file_hash, file_name); -+ int file_name_len = strlen(file_name); -+ -+ if (file_name[file_name_len -1] == '/') -+ return 0; -+ -+ if (conf->offline_root) { -+ int len = strlen(conf->offline_root); -+ if (strncmp(file_name, conf->offline_root, len) == 0) { -+ file_name += len; -+ } -+ } -+ -+ // ipkg_message(conf, IPKG_DEBUG2, "owning_pkg=%s filename=%s\n", owning_pkg->name, file_name); -+ hash_table_insert(file_hash, file_name, owning_pkg); -+ if (old_owning_pkg) { -+ str_list_remove_elt(old_owning_pkg->installed_files, file_name); -+ /* mark this package to have its filelist written */ -+ old_owning_pkg->state_flag |= SF_FILELIST_CHANGED; -+ owning_pkg->state_flag |= SF_FILELIST_CHANGED; -+ } -+ return 0; -+} -+ -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_hash.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,61 @@ -+/* pkg_hash.h - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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_HASH_H -+#define PKG_HASH_H -+ -+#include "pkg.h" -+#include "pkg_vec.h" -+#include "hash_table.h" -+ -+ -+int pkg_hash_init(const char *name, hash_table_t *hash, int len); -+void pkg_hash_deinit(hash_table_t *hash); -+void pkg_hash_map(hash_table_t *hash, void (*f)(void *data, void *entry), void *data); -+ -+void pkg_hash_dump(hash_table_t *hash, void *data); -+void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *available); -+ -+int pkg_hash_add_from_file(ipkg_conf_t *conf, const char *file_name, -+ pkg_src_t *src, pkg_dest_t *dest, int is_status_file); -+pkg_t *hash_insert_pkg(hash_table_t *hash, pkg_t *pkg, int set_status,ipkg_conf_t *conf); -+ -+abstract_pkg_t * ensure_abstract_pkg_by_name(hash_table_t * hash, const char * pkg_name); -+abstract_pkg_t * abstract_pkg_fetch_by_name(hash_table_t * hash, const char * pkg_name); -+pkg_vec_t *pkg_hash_fetch_by_name(hash_table_t *hash, const char *pkg_name); -+void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *installed); -+pkg_t * pkg_hash_fetch_by_name_version(hash_table_t *hash, -+ const char *pkg_name, -+ const char * version); -+abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *hash, const char *name); -+pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, -+ int (*constraint_fcn)(pkg_t *pkg, void *data), void *cdata, int quiet); -+pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(ipkg_conf_t *conf, const char *name); -+pkg_t *pkg_hash_fetch_installed_by_name(hash_table_t *hash, -+ const char *pkg_name); -+pkg_t *pkg_hash_fetch_installed_by_name_dest(hash_table_t *hash, -+ const char *pkg_name, -+ pkg_dest_t *dest); -+ -+pkg_t *file_hash_get_file_owner(ipkg_conf_t *conf, const char *file_name); -+int file_hash_set_file_owner(ipkg_conf_t *conf, const char *file_name, pkg_t *pkg); -+ -+/* XXX: shouldn't this go in pkg_vec.[ch]? */ -+pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_parse.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,366 @@ -+/* pkg_parse.c - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+#include <ctype.h> -+ -+#include "pkg.h" -+#include "ipkg_utils.h" -+#include "pkg_parse.h" -+ -+int isGenericFieldType(char * type, char * line) -+{ -+ if(!strncmp(line, type, strlen(type))) -+ return 1; -+ return 0; -+} -+ -+char * parseGenericFieldType(char * type, char * raw) -+{ -+ char * field_value = raw + (strlen(type) + 1); -+ return trim_alloc(field_value); -+} -+ -+void parseStatus(pkg_t *pkg, char * raw) -+{ -+ char sw_str[64], sf_str[64], ss_str[64]; -+ -+ sscanf(raw, "Status: %s %s %s", sw_str, sf_str, ss_str); -+ pkg->state_want = pkg_state_want_from_str(sw_str); -+ pkg->state_flag = pkg_state_flag_from_str(sf_str); -+ pkg->state_status = pkg_state_status_from_str(ss_str); -+} -+ -+char ** parseDependsString(char * raw, int * depends_count) -+{ -+ char ** depends = NULL; -+ int line_count = 0; -+ char buff[2048], * dest; -+ -+ while(raw && *raw && !isspace(*raw)) { -+ raw++; -+ } -+ -+ if(line_is_blank(raw)){ -+ *depends_count = line_count; -+ return NULL; -+ } -+ while(raw && *raw){ -+ depends = (char **)realloc(depends, sizeof(char *) * (line_count + 1)); -+ -+ while(isspace(*raw)) raw++; -+ -+ dest = buff; -+ while((*raw != ',') && *raw) -+ *dest++ = *raw++; -+ -+ *dest = '\0'; -+ depends[line_count] = trim_alloc(buff); -+ if(depends[line_count] ==NULL) -+ return NULL; -+ line_count++; -+ if(*raw == ',') -+ raw++; -+ } -+ *depends_count = line_count; -+ return depends; -+} -+ -+void parseConffiles(pkg_t * pkg, char * raw) -+{ -+ char file_name[1048], md5sum[1048]; /* please tell me there aren't any longer that 1k */ -+ -+ if(!strncmp(raw, "Conffiles:", 10)) -+ raw += strlen("Conffiles:"); -+ -+ while(*raw && (sscanf(raw, "%s%s", file_name, md5sum) == 2)){ -+ conffile_list_append(&pkg->conffiles, file_name, md5sum); -+ /* fprintf(stderr, "%s %s ", file_name, md5sum);*/ -+ while (*raw && isspace(*raw)) { -+ raw++; -+ } -+ raw += strlen(file_name); -+ while (*raw && isspace(*raw)) { -+ raw++; -+ } -+ raw += strlen(md5sum); -+ } -+} -+ -+int parseVersion(pkg_t *pkg, char *raw) -+{ -+ char *colon, *eepochcolon; -+#ifdef USE_DEBVERSION -+ char *hyphen; -+#endif -+ unsigned long epoch; -+ -+ if (!*raw) { -+ fprintf(stderr, "%s: ERROR: version string is empty", __FUNCTION__); -+ return EINVAL; -+ } -+ -+ if (strncmp(raw, "Version:", 8) == 0) { -+ raw += 8; -+ } -+ while (*raw && isspace(*raw)) { -+ raw++; -+ } -+ -+ colon= strchr(raw,':'); -+ if (colon) { -+ epoch= strtoul(raw,&eepochcolon,10); -+ if (colon != eepochcolon) { -+ fprintf(stderr, "%s: ERROR: epoch in version is not number", __FUNCTION__); -+ return EINVAL; -+ } -+ if (!*++colon) { -+ fprintf(stderr, "%s: ERROR: nothing after colon in version number", __FUNCTION__); -+ return EINVAL; -+ } -+ raw= colon; -+ pkg->epoch= epoch; -+ } else { -+ pkg->epoch= 0; -+ } -+ -+ pkg->revision = ""; -+ pkg->familiar_revision = ""; -+ -+ pkg->version= malloc(strlen(raw)+1); -+ if ( pkg->version == NULL ) { -+ fprintf(stderr, "%s: out of memory \n", __FUNCTION__); -+ return ENOMEM; -+ } -+ strcpy(pkg->version, raw); -+ -+#ifdef USE_DEBVERSION -+ hyphen= strrchr(pkg->version,'-'); -+ -+ if (hyphen) { -+ *hyphen++= 0; -+ if (strncmp("fam", hyphen, 3) == 0) { -+ pkg->familiar_revision=hyphen+3; -+ hyphen= strrchr(pkg->version,'-'); -+ if (hyphen) { -+ *hyphen++= 0; -+ pkg->revision = hyphen; -+ } -+ } else { -+ pkg->revision = hyphen; -+ } -+ } -+#endif -+ -+/* -+ fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n", -+ pkg->epoch, -+ pkg->version, -+ pkg->revision, -+ pkg->familiar_revision); -+*/ -+ -+ return 0; -+} -+ -+ -+/* This code is needed to insert in first position the keyword for the aligning bug */ -+ -+int alterProvidesLine(char *raw, char *temp) -+{ -+ -+ -+ if (!*raw) { -+ fprintf(stderr, "%s: ERROR: Provides string is empty", __FUNCTION__); -+ return -EINVAL; -+ } -+ -+ if ( temp == NULL ) { -+ fprintf(stderr, "%s: out of memory \n", __FUNCTION__); -+ return -ENOMEM; -+ } -+ -+ if (strncmp(raw, "Provides:", 9) == 0) { -+ raw += 9; -+ } -+ while (*raw && isspace(*raw)) { -+ raw++; -+ } -+ -+ snprintf ( temp, 35, "Provides: ipkg_internal_use_only, "); /* First part of the line */ -+ while (*raw) { -+ strncat( temp, raw++, 1); -+ } -+ return 0; -+ -+} -+ -+/* Some random thoughts from Carl: -+ -+ This function could be considerably simplified if we just kept -+ an array of all the generic string-valued field names, and looped -+ through those looking for a match. Also, these fields could perhaps -+ be stored in the package as an array as well, (or, probably better, -+ as an nv_pair_list_t). -+ -+ Fields which require special parsing or storage, (such as Depends: -+ and Status:) could be handled as they are now. -+*/ -+/* XXX: FEATURE: The Suggests: field needs to be changed from a string -+ to a dependency list. And, since we already have -+ Depends/Pre-Depends and need to add Conflicts, Recommends, and -+ Enhances, perhaps we could generalize all of these and save some -+ code duplication. -+*/ -+int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest) -+{ -+ int reading_conffiles, reading_description; -+ int pkg_false_provides=1; -+ char ** lines; -+ char * provide=NULL; -+ -+ pkg->src = src; -+ pkg->dest = dest; -+ -+ reading_conffiles = reading_description = 0; -+ -+ for (lines = *raw; *lines; lines++) { -+ /* fprintf(stderr, "PARSING %s\n", *lines);*/ -+ if(isGenericFieldType("Package:", *lines)) -+ pkg->name = parseGenericFieldType("Package", *lines); -+ else if(isGenericFieldType("Architecture:", *lines)) -+ pkg->architecture = parseGenericFieldType("Architecture", *lines); -+ else if(isGenericFieldType("Filename:", *lines)) -+ pkg->filename = parseGenericFieldType("Filename", *lines); -+ else if(isGenericFieldType("Section:", *lines)) -+ pkg->section = parseGenericFieldType("Section", *lines); -+ else if(isGenericFieldType("MD5sum:", *lines)) -+ pkg->md5sum = parseGenericFieldType("MD5sum", *lines); -+ /* The old ipkg wrote out status files with the wrong case for MD5sum, -+ let's parse it either way */ -+ else if(isGenericFieldType("MD5Sum:", *lines)) -+ pkg->md5sum = parseGenericFieldType("MD5Sum", *lines); -+ else if(isGenericFieldType("Size:", *lines)) -+ pkg->size = parseGenericFieldType("Size", *lines); -+ else if(isGenericFieldType("Source:", *lines)) -+ pkg->source = parseGenericFieldType("Source", *lines); -+ else if(isGenericFieldType("Installed-Size:", *lines)) -+ pkg->installed_size = parseGenericFieldType("Installed-Size", *lines); -+ else if(isGenericFieldType("Installed-Time:", *lines)) { -+ char *time_str = parseGenericFieldType("Installed-Time", *lines); -+ pkg->installed_time = strtoul(time_str, NULL, 0); -+ } else if(isGenericFieldType("Priority:", *lines)) -+ pkg->priority = parseGenericFieldType("Priority", *lines); -+ else if(isGenericFieldType("Essential:", *lines)) { -+ char *essential_value; -+ essential_value = parseGenericFieldType("Essential", *lines); -+ if (strcmp(essential_value, "yes") == 0) { -+ pkg->essential = 1; -+ } -+ free(essential_value); -+ } -+ else if(isGenericFieldType("Status", *lines)) -+ parseStatus(pkg, *lines); -+ else if(isGenericFieldType("Version", *lines)) -+ parseVersion(pkg, *lines); -+ else if(isGenericFieldType("Maintainer", *lines)) -+ pkg->maintainer = parseGenericFieldType("Maintainer", *lines); -+ else if(isGenericFieldType("Conffiles", *lines)){ -+ parseConffiles(pkg, *lines); -+ reading_conffiles = 1; -+ } -+ else if(isGenericFieldType("Description", *lines)) { -+ pkg->description = parseGenericFieldType("Description", *lines); -+ reading_conffiles = 0; -+ reading_description = 1; -+ } -+ -+ else if(isGenericFieldType("Provides", *lines)){ -+/* Here we add the internal_use to align the off by one problem between provides_str and provides */ -+ provide = (char * ) malloc(strlen(*lines)+ 35 ); /* Preparing the space for the new ipkg_internal_use_only */ -+ if ( alterProvidesLine(*lines,provide) ){ -+ return EINVAL; -+ } -+ pkg->provides_str = parseDependsString( provide, &pkg->provides_count); -+/* Let's try to hack a bit here. -+ The idea is that if a package has no Provides, we would add one generic, to permit the check of dependencies -+ in alot of other places. We will remove it before writing down the status database */ -+ pkg_false_provides=0; -+ free(provide); -+ } -+ -+ else if(isGenericFieldType("Depends", *lines)) -+ pkg->depends_str = parseDependsString(*lines, &pkg->depends_count); -+ else if(isGenericFieldType("Pre-Depends", *lines)) -+ pkg->pre_depends_str = parseDependsString(*lines, &pkg->pre_depends_count); -+ else if(isGenericFieldType("Recommends", *lines)) -+ pkg->recommends_str = parseDependsString(*lines, &pkg->recommends_count); -+ else if(isGenericFieldType("Suggests", *lines)) -+ pkg->suggests_str = parseDependsString(*lines, &pkg->suggests_count); -+ /* Abhaya: support for conflicts */ -+ else if(isGenericFieldType("Conflicts", *lines)) -+ pkg->conflicts_str = parseDependsString(*lines, &pkg->conflicts_count); -+ else if(isGenericFieldType("Replaces", *lines)) -+ pkg->replaces_str = parseDependsString(*lines, &pkg->replaces_count); -+ else if(line_is_blank(*lines)) { -+ lines++; -+ break; -+ } -+ else if(**lines == ' '){ -+ if(reading_description) { -+ /* we already know it's not blank, so the rest of description */ -+ pkg->description = realloc(pkg->description, -+ strlen(pkg->description) -+ + 1 + strlen(*lines) + 1); -+ strcat(pkg->description, "\n"); -+ strcat(pkg->description, (*lines)); -+ } -+ else if(reading_conffiles) -+ parseConffiles(pkg, *lines); -+ } -+ } -+ *raw = lines; -+/* If the ipk has not a Provides line, we insert our false line */ -+ if ( pkg_false_provides==1) -+ pkg->provides_str = parseDependsString ((char *)"Provides: ipkg_internal_use_only ", &pkg->provides_count); -+ -+ if (pkg->name) { -+ return 0; -+ } else { -+ return EINVAL; -+ } -+} -+ -+int pkg_valorize_other_field(pkg_t *pkg, char ***raw) -+{ -+ char ** lines; -+ -+ for (lines = *raw; *lines; lines++) { -+ if(isGenericFieldType("Essential:", *lines)) { -+ char *essential_value; -+ essential_value = parseGenericFieldType("Essential", *lines); -+ if (strcmp(essential_value, "yes") == 0) { -+ pkg->essential = 1; -+ } -+ free(essential_value); -+ } -+ } -+ *raw = lines; -+ -+ return 0; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_parse.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,31 @@ -+/* pkg_parse.h - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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_PARSE_H -+#define PKG_PARSE_H -+ -+int isGenericFieldType(char * type, char * line); -+char * parseGenericFieldType(char * type, char * raw); -+void parseStatus(pkg_t *pkg, char * raw); -+int parseVersion(pkg_t *pkg, char *raw); -+char ** parseDependsString(char * raw, int * depends_count); -+int parseVersion(pkg_t *pkg, char *raw); -+void parseConffiles(pkg_t * pkg, char * raw); -+int pkg_parse_raw(pkg_t *pkg, char ***raw, pkg_src_t *src, pkg_dest_t *dest); -+int pkg_valorize_other_field(pkg_t *pkg, char ***raw); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_src.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,43 @@ -+/* pkg_src.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "pkg_src.h" -+#include "str_util.h" -+ -+int pkg_src_init(pkg_src_t *src, const char *name, const char *base_url, const char *extra_data, int gzip) -+{ -+ src->gzip = gzip; -+ src->name = str_dup_safe (name); -+ src->value = str_dup_safe (base_url); -+ if (extra_data) -+ src->extra_data = str_dup_safe (extra_data); -+ else -+ src->extra_data = NULL; -+ return 0; -+} -+ -+void pkg_src_deinit(pkg_src_t *src) -+{ -+ free (src->name); -+ free (src->value); -+ if (src->extra_data) -+ free (src->extra_data); -+} -+ -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_src.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,34 @@ -+/* pkg_src.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_SRC_H -+#define PKG_SRC_H -+ -+#include "nv_pair.h" -+ -+typedef struct -+{ -+ char *name; -+ char *value; -+ char *extra_data; -+ int gzip; -+} pkg_src_t; -+ -+int pkg_src_init(pkg_src_t *src, const char *name, const char *base_url, const char *extra_data, int gzip); -+void pkg_src_deinit(pkg_src_t *src); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_src_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,75 @@ -+/* pkg_src_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "pkg_src_list.h" -+#include "void_list.h" -+ -+int pkg_src_list_init(pkg_src_list_t *list) -+{ -+ return void_list_init((void_list_t *) list); -+} -+ -+void pkg_src_list_deinit(pkg_src_list_t *list) -+{ -+ pkg_src_list_elt_t *iter; -+ pkg_src_t *pkg_src; -+ -+ for (iter = list->head; iter; iter = iter->next) { -+ pkg_src = iter->data; -+ pkg_src_deinit(pkg_src); -+ -+ /* malloced in pkg_src_list_append */ -+ free(pkg_src); -+ iter->data = NULL; -+ } -+ void_list_deinit((void_list_t *) list); -+} -+ -+pkg_src_t *pkg_src_list_append(pkg_src_list_t *list, -+ const char *name, const char *base_url, const char *extra_data, -+ int gzip) -+{ -+ int err; -+ -+ /* freed in pkg_src_list_deinit */ -+ pkg_src_t *pkg_src = malloc(sizeof(pkg_src_t)); -+ -+ if (pkg_src == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ pkg_src_init(pkg_src, name, base_url, extra_data, gzip); -+ -+ err = void_list_append((void_list_t *) list, pkg_src); -+ if (err) { -+ return NULL; -+ } -+ -+ return pkg_src; -+} -+ -+int pkg_src_list_push(pkg_src_list_t *list, pkg_src_t *data) -+{ -+ return void_list_push((void_list_t *) list, data); -+} -+ -+pkg_src_list_elt_t *pkg_src_list_pop(pkg_src_list_t *list) -+{ -+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_src_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,57 @@ -+/* pkg_src_list.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_SRC_LIST_H -+#define PKG_SRC_LIST_H -+ -+#include "pkg_src.h" -+ -+typedef struct pkg_src_list_elt pkg_src_list_elt_t; -+struct pkg_src_list_elt -+{ -+ pkg_src_list_elt_t *next; -+ pkg_src_t *data; -+}; -+ -+typedef struct pkg_src_list pkg_src_list_t; -+struct pkg_src_list -+{ -+ pkg_src_list_elt_t pre_head; -+ pkg_src_list_elt_t *head; -+ pkg_src_list_elt_t *tail; -+}; -+ -+static inline int pkg_src_list_empty(pkg_src_list_t *list) -+{ -+ if (list->head == NULL) -+ return 1; -+ else -+ return 0; -+} -+ -+int pkg_src_list_elt_init(pkg_src_list_elt_t *elt, nv_pair_t *data); -+void pkg_src_list_elt_deinit(pkg_src_list_elt_t *elt); -+ -+int pkg_src_list_init(pkg_src_list_t *list); -+void pkg_src_list_deinit(pkg_src_list_t *list); -+ -+pkg_src_t *pkg_src_list_append(pkg_src_list_t *list, const char *name, const char *root_dir, const char *extra_data, int gzip); -+int pkg_src_list_push(pkg_src_list_t *list, pkg_src_t *data); -+pkg_src_list_elt_t *pkg_src_list_pop(pkg_src_list_t *list); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_vec.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.c ---- busybox-1.1.2-orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.c 2006-05-09 02:12:05.000000000 +0200 -@@ -0,0 +1,230 @@ -+/* pkg_vec.c - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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. -+*/ -+ -+#include <stdlib.h> -+#include <fnmatch.h> -+#include "xregex.h" -+#include "ipkg.h" -+#include "pkg.h" -+ -+pkg_vec_t * pkg_vec_alloc(void) -+{ -+ pkg_vec_t * vec = (pkg_vec_t *)malloc(sizeof(pkg_vec_t)); -+ if (!vec) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ vec->pkgs = NULL; -+ vec->len = 0; -+ -+ return vec; -+} -+ -+void pkg_vec_free(pkg_vec_t *vec) -+{ -+ free(vec->pkgs); -+ free(vec); -+} -+ -+/* -+ * assumption: all names in a vector are identical -+ * assumption: all version strings are trimmed, -+ * so identical versions have identical version strings, -+ * implying identical packages; let's marry these -+ */ -+pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status,ipkg_conf_t *conf) -+{ -+ int i; -+ int found = 0; -+ -+ /* look for a duplicate pkg by name, version, and architecture */ -+ for (i = 0; i < vec->len; i++){ -+ ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Found pkg=%s version=%s arch=%s cmp=%s version=%s arch=%s \n", -+ __FUNCTION__, pkg->name, pkg->version, pkg->architecture, -+ vec->pkgs[i]->name, vec->pkgs[i]->version,vec->pkgs[i]->architecture ); -+ if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0) -+ && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0) -+ && (strcmp(pkg->architecture, vec->pkgs[i]->architecture) == 0)) { -+ found = 1; -+ ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Found duplicate for pkg=%s version=%s arch=%s\n", -+ __FUNCTION__, pkg->name, pkg->version, pkg->architecture); -+ break; -+ } -+ } -+ -+ /* we didn't find one, add it */ -+ if (!found){ -+ ipkg_message(conf, IPKG_DEBUG2, "Function: %s. Adding new pkg=%s version=%s arch=%s\n", -+ __FUNCTION__, pkg->name, pkg->version, pkg->architecture); -+ -+ vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *)); -+ vec->pkgs[vec->len] = pkg; -+ vec->len++; -+ return pkg; -+ } -+ /* update the one that we have */ -+ else { -+ ipkg_message(conf, IPKG_DEBUG2, "Function: %s. calling pkg_merge for pkg=%s version=%s arch=%s", -+ __FUNCTION__, pkg->name, pkg->version, pkg->architecture); -+ if (set_status) { -+ /* this is from the status file, so need to merge with existing database */ -+ ipkg_message(conf, IPKG_DEBUG2, " with set_status\n"); -+ pkg_merge(vec->pkgs[i], pkg, set_status); -+ /* XXX: CLEANUP: It's not so polite to free something here -+ that was passed in from above. */ -+ pkg_deinit(pkg); -+ free(pkg); -+ } else { -+ ipkg_message(conf, IPKG_DEBUG2, " WITHOUT set_status\n"); -+ /* just overwrite the old one */ -+ pkg_deinit(vec->pkgs[i]); -+ free(vec->pkgs[i]); -+ vec->pkgs[i] = pkg; -+ } -+ return vec->pkgs[i]; -+ } -+} -+ -+void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg) -+{ -+ int i; -+ int found = 0; -+ -+ /* look for a duplicate pkg by name, version, and architecture */ -+ for (i = 0; i < vec->len; i++) -+ if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0) -+ && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0) -+ && (strcmp(pkg->architecture, vec->pkgs[i]->name) == 0)) { -+ found = 1; -+ break; -+ } -+ -+ /* we didn't find one, add it */ -+ if(!found){ -+ vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *)); -+ *(const pkg_t **)&vec->pkgs[vec->len] = pkg; -+ vec->len++; -+ } -+} -+ -+int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg) -+{ -+ int i; -+ for (i = 0; i < vec->len; i++) -+ if (vec->pkgs[i] == apkg) -+ return 1; -+ return 0; -+} -+ -+typedef int (*compare_fcn_t)(const void *, const void *); -+void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *)) -+{ -+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); -+} -+ -+int pkg_vec_clear_marks(pkg_vec_t *vec) -+{ -+ int npkgs = vec->len; -+ int i; -+ for (i = 0; i < npkgs; i++) { -+ pkg_t *pkg = vec->pkgs[i]; -+ pkg->state_flag &= ~SF_MARKED; -+ } -+ return 0; -+} -+ -+int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern) -+{ -+ int matching_count = 0; -+ pkg_t **pkgs = vec->pkgs; -+ int npkgs = vec->len; -+ int i; -+ for (i = 0; i < npkgs; i++) { -+ pkg_t *pkg = pkgs[i]; -+ if (fnmatch(pattern, pkg->name, 0)==0) { -+ pkg->state_flag |= SF_MARKED; -+ matching_count++; -+ } -+ } -+ return matching_count; -+} -+ -+ -+abstract_pkg_vec_t * abstract_pkg_vec_alloc(void) -+{ -+ abstract_pkg_vec_t * vec ; -+ vec = (abstract_pkg_vec_t *)malloc(sizeof(abstract_pkg_vec_t)); -+ if (!vec) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return NULL; -+ } -+ vec->pkgs = NULL; -+ vec->len = 0; -+ -+ return vec; -+} -+ -+void abstract_pkg_vec_free(abstract_pkg_vec_t *vec) -+{ -+ free(vec->pkgs); -+ free(vec); -+} -+ -+/* -+ * assumption: all names in a vector are unique -+ */ -+void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg) -+{ -+ int i; -+ -+ /* look for a duplicate pkg by name */ -+ for(i = 0; i < vec->len; i++) -+ if (strcmp(pkg->name, vec->pkgs[i]->name) == 0) -+ break; -+ -+ /* we didn't find one, add it */ -+ if(i == vec->len){ -+ vec->pkgs = -+ (abstract_pkg_t **) -+ realloc(vec->pkgs, (vec->len + 1) * sizeof(abstract_pkg_t *)); -+ vec->pkgs[vec->len] = pkg; -+ vec->len++; -+ } -+} -+ -+abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i) -+{ -+ if (vec->len > i) -+ return vec->pkgs[i]; -+ else -+ return NULL; -+} -+ -+int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg) -+{ -+ int i; -+ for (i = 0; i < vec->len; i++) -+ if (vec->pkgs[i] == apkg) -+ return 1; -+ return 0; -+} -+ -+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)) -+{ -+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/pkg_vec.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h ---- busybox-1.1.2-orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,62 @@ -+/* pkg_vec.h - the itsy package management system -+ -+ Steven M. Ayer -+ -+ Copyright (C) 2002 Compaq Computer Corporation -+ -+ 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_VEC_H -+#define PKG_VEC_H -+ -+typedef struct pkg pkg_t; -+typedef struct abstract_pkg abstract_pkg_t; -+ -+struct pkg_vec -+{ -+ pkg_t **pkgs; -+ int len; -+}; -+typedef struct pkg_vec pkg_vec_t; -+ -+struct abstract_pkg_vec -+{ -+ abstract_pkg_t **pkgs; -+ int len; -+}; -+typedef struct abstract_pkg_vec abstract_pkg_vec_t; -+ -+ -+pkg_vec_t * pkg_vec_alloc(void); -+void pkg_vec_free(pkg_vec_t *vec); -+void marry_two_packages(pkg_t * newpkg, pkg_t * oldpkg); -+ -+void pkg_vec_add(pkg_vec_t *vec, pkg_t *pkg); -+/* pkg_vec_insert_merge: might munge pkg. -+* returns the pkg that is in the pkg graph */ -+pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status, ipkg_conf_t *conf); -+/* this one never munges pkg */ -+void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg); -+int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg); -+void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *)); -+ -+int pkg_vec_clear_marks(pkg_vec_t *vec); -+int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern); -+ -+abstract_pkg_vec_t * abstract_pkg_vec_alloc(void); -+void abstract_pkg_vec_free(abstract_pkg_vec_t *vec); -+void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg); -+abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i); -+int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg); -+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/sprintf_alloc.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/sprintf_alloc.h ---- busybox-1.1.2-orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/sprintf_alloc.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,25 @@ -+/* sprintf_alloca.c -- like sprintf with memory allocation -+ -+ 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 SPRINTF_ALLOC_H -+#define SPRINTF_ALLOC_H -+ -+#include "libbb.h" -+ -+#define sprintf_alloc(str, fmt, args...) *str = bb_xasprintf(fmt, ## args) -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/str_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_list.c ---- busybox-1.1.2-orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,76 @@ -+/* str_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+#include "str_list.h" -+ -+int str_list_elt_init(str_list_elt_t *elt, char *data) -+{ -+ return void_list_elt_init((void_list_elt_t *) elt, data); -+} -+ -+void str_list_elt_deinit(str_list_elt_t *elt) -+{ -+ void_list_elt_deinit((void_list_elt_t *) elt); -+} -+ -+str_list_t *str_list_alloc() -+{ -+ str_list_t *list = (str_list_t *)malloc(sizeof(str_list_t)); -+ if (list) -+ str_list_init(list); -+ return list; -+} -+ -+int str_list_init(str_list_t *list) -+{ -+ return void_list_init((void_list_t *) list); -+} -+ -+void str_list_deinit(str_list_t *list) -+{ -+ void_list_deinit((void_list_t *) list); -+} -+ -+int str_list_append(str_list_t *list, char *data) -+{ -+ return void_list_append((void_list_t *) list, data); -+} -+ -+int str_list_push(str_list_t *list, char *data) -+{ -+ return void_list_push((void_list_t *) list, data); -+} -+ -+str_list_elt_t *str_list_pop(str_list_t *list) -+{ -+ return (str_list_elt_t *) void_list_pop((void_list_t *) list); -+} -+ -+str_list_elt_t *str_list_remove(str_list_t *list, str_list_elt_t **iter) -+{ -+ return (str_list_elt_t *) void_list_remove((void_list_t *) list, -+ (void_list_elt_t **) iter); -+} -+ -+char *str_list_remove_elt(str_list_t *list, const char *target_str) -+{ -+ return (char *)void_list_remove_elt((void_list_t *) list, -+ (void *)target_str, -+ (void_list_cmp_t)strcmp); -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/str_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_list.h ---- busybox-1.1.2-orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,51 @@ -+/* str_list.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 STR_LIST_H -+#define STR_LIST_H -+ -+#include "void_list.h" -+ -+typedef struct str_list_elt str_list_elt_t; -+struct str_list_elt -+{ -+ str_list_elt_t *next; -+ char *data; -+}; -+ -+typedef struct xstr_list str_list_t; -+struct xstr_list -+{ -+ str_list_elt_t pre_head; -+ str_list_elt_t *head; -+ str_list_elt_t *tail; -+}; -+ -+int str_list_elt_init(str_list_elt_t *elt, char *data); -+void str_list_elt_deinit(str_list_elt_t *elt); -+ -+str_list_t *str_list_alloc(void); -+int str_list_init(str_list_t *list); -+void str_list_deinit(str_list_t *list); -+ -+int str_list_append(str_list_t *list, char *data); -+int str_list_push(str_list_t *list, char *data); -+str_list_elt_t *str_list_pop(str_list_t *list); -+str_list_elt_t *str_list_remove(str_list_t *list, str_list_elt_t **iter); -+char *str_list_remove_elt(str_list_t *list, const char *target_str); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/str_util.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_util.c ---- busybox-1.1.2-orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_util.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,73 @@ -+/* str_utils.c - 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. -+*/ -+ -+#include "ipkg.h" -+ -+int str_starts_with(const char *str, const char *prefix) -+{ -+ return (strncmp(str, prefix, strlen(prefix)) == 0); -+} -+ -+int str_ends_with(const char *str, const char *suffix) -+{ -+ int suffix_len; -+ int str_len; -+ -+ str_len = strlen(str); -+ suffix_len = strlen(suffix); -+ -+ if (str_len < suffix_len) { -+ return 0; -+ } -+ -+ return (strcmp(str + str_len - suffix_len, suffix) == 0); -+} -+ -+int str_chomp(char *str) -+{ -+ if (str[strlen(str) - 1] == '\n') { -+ str[strlen(str) - 1] = '\0'; -+ return 1; -+ } -+ return 0; -+} -+ -+int str_tolower(char *str) -+{ -+ while (*str) { -+ *str = tolower(*str); -+ str++; -+ } -+ -+ return 0; -+} -+ -+int str_toupper(char *str) -+{ -+ while (*str) { -+ *str = toupper(*str); -+ str++; -+ } -+ -+ return 0; -+} -+ -+char *str_dup_safe(const char *str) -+{ -+ return str ? strdup(str) : NULL; -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/str_util.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_util.h ---- busybox-1.1.2-orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/str_util.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,28 @@ -+/* str_utils.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 STR_UTILS_H -+#define STR_UTILS_H -+ -+int str_starts_with(const char *str, const char *prefix); -+int str_ends_with(const char *str, const char *suffix); -+int str_chomp(char *str); -+int str_tolower(char *str); -+int str_toupper(char *str); -+char *str_dup_safe(const char *str); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/user.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/user.c ---- busybox-1.1.2-orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/user.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,58 @@ -+/* user.c - the itsy package management system -+ -+ Jamey Hicks -+ -+ Copyright (C) 2002 Hewlett Packard Company -+ 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. -+*/ -+ -+#include <stdio.h> -+#include <stdarg.h> -+#include "file_util.h" -+#include "str_util.h" -+#ifdef IPKG_LIB -+#include "libipkg.h" -+#endif -+ -+ -+#ifdef IPKG_LIB -+static char *question = NULL; -+static int question_len = 255; -+#endif -+char *get_user_response(const char *format, ...) -+{ -+ int len = question_len; -+ va_list ap; -+ char *response; -+ va_start(ap, format); -+ -+#ifndef IPKG_LIB -+ vprintf(format, ap); -+ do { -+ response = file_read_line_alloc(stdin); -+ } while (response == NULL); -+#else -+ do { -+ if (question == NULL || len > question_len) { -+ question = realloc(question, len + 1); -+ question_len = len; -+ } -+ len = vsnprintf(question,question_len,format,ap); -+ } while (len > question_len); -+ response = strdup(ipkg_cb_response(question)); -+#endif -+ str_chomp(response); -+ str_tolower(response); -+ -+ return response; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/user.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/user.h ---- busybox-1.1.2-orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/user.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,23 @@ -+/* user.c - the itsy package management system -+ -+ Jamey Hicks -+ -+ Copyright (C) 2002 Hewlett Packard Company -+ 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. -+*/ -+ -+#include <stdio.h> -+#include <stdarg.h> -+ -+char *get_user_response(const char *format, ...); -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/void_list.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/void_list.c ---- busybox-1.1.2-orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/void_list.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,194 @@ -+/* void_list.c - 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. -+*/ -+ -+#include "ipkg.h" -+#include <errno.h> -+ -+#include "void_list.h" -+ -+int void_list_elt_init(void_list_elt_t *elt, void *data) -+{ -+ elt->next = NULL; -+ elt->data = data; -+ -+ return 0; -+} -+ -+void void_list_elt_deinit(void_list_elt_t *elt) -+{ -+ void_list_elt_init(elt, NULL); -+} -+ -+int void_list_init(void_list_t *list) -+{ -+ void_list_elt_init(&list->pre_head, NULL); -+ list->head = NULL; -+ list->pre_head.next = list->head; -+ list->tail = NULL; -+ -+ return 0; -+} -+ -+void void_list_deinit(void_list_t *list) -+{ -+ void_list_elt_t *elt; -+ -+ while (list->head) { -+ elt = void_list_pop(list); -+ void_list_elt_deinit(elt); -+ /* malloced in void_list_append */ -+ free(elt); -+ } -+} -+ -+int void_list_append(void_list_t *list, void *data) -+{ -+ void_list_elt_t *elt; -+ -+ /* freed in void_list_deinit */ -+ elt = malloc(sizeof(void_list_elt_t)); -+ if (elt == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return ENOMEM; -+ } -+ -+ void_list_elt_init(elt, data); -+ -+ if (list->tail) { -+ list->tail->next = elt; -+ list->tail = elt; -+ } else { -+ list->head = elt; -+ list->pre_head.next = list->head; -+ list->tail = elt; -+ } -+ -+ return 0; -+} -+ -+int void_list_push(void_list_t *list, void *data) -+{ -+ void_list_elt_t *elt; -+ -+ elt = malloc(sizeof(void_list_elt_t)); -+ if (elt == NULL) { -+ fprintf(stderr, "%s: out of memory\n", __FUNCTION__); -+ return ENOMEM; -+ } -+ -+ void_list_elt_init(elt, data); -+ -+ elt->next = list->head; -+ list->head->next = elt; -+ if (list->tail == NULL) { -+ list->tail = list->head; -+ } -+ -+ return 0; -+} -+ -+void_list_elt_t *void_list_pop(void_list_t *list) -+{ -+ void_list_elt_t *elt; -+ -+ elt = list->head; -+ -+ if (list->head) { -+ list->head = list->head->next; -+ list->pre_head.next = list->head; -+ if (list->head == NULL) { -+ list->tail = NULL; -+ } -+ } -+ -+ return elt; -+} -+ -+void *void_list_remove(void_list_t *list, void_list_elt_t **iter) -+{ -+ void_list_elt_t *prior; -+ void_list_elt_t *old_elt; -+ void *old_data; -+ -+ old_elt = *iter; -+ old_data = old_elt->data; -+ -+ if (old_elt == list->head) { -+ prior = &list->pre_head; -+ void_list_pop(list); -+ } else { -+ for (prior = list->head; prior; prior = prior->next) { -+ if (prior->next == old_elt) { -+ break; -+ } -+ } -+ if (prior == NULL || prior->next != old_elt) { -+ fprintf(stderr, "%s: ERROR: element not found in list\n", __FUNCTION__); -+ return NULL; -+ } -+ prior->next = old_elt->next; -+ -+ if (old_elt == list->tail) { -+ list->tail = prior; -+ } -+ } -+ -+ void_list_elt_deinit(old_elt); -+ *iter = prior; -+ -+ return old_data; -+} -+ -+/* remove element containing elt data, using cmp(elt->data, target_data) == 0. */ -+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp) -+{ -+ void_list_elt_t *prior; -+ void_list_elt_t *old_elt = NULL; -+ void *old_data = NULL; -+ -+ /* first element */ -+ if (list->head && list->head->data && (cmp(list->head->data, target_data) == 0)) { -+ old_elt = list->head; -+ old_data = list->head->data; -+ void_list_pop(list); -+ } else { -+ int found = 0; -+ for (prior = list->head; prior && prior->next; prior = prior->next) { -+ if (prior->next->data && (cmp(prior->next->data, target_data) == 0)) { -+ old_elt = prior->next; -+ old_data = old_elt->data; -+ found = 1; -+ break; -+ } -+ } -+ if (!found) { -+ return NULL; -+ } -+ prior->next = old_elt->next; -+ -+ if (old_elt == list->tail) { -+ list->tail = prior; -+ } -+ } -+ if (old_elt) -+ void_list_elt_deinit(old_elt); -+ -+ if (old_data) -+ return old_data; -+ else -+ return NULL; -+} -diff -ruN busybox-1.1.2-orig/archival/libipkg/void_list.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/void_list.h ---- busybox-1.1.2-orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/void_list.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,59 @@ -+/* void_list.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 VOID_LIST_H -+#define VOID_LIST_H -+ -+typedef struct void_list_elt void_list_elt_t; -+struct void_list_elt -+{ -+ void_list_elt_t *next; -+ void *data; -+}; -+ -+typedef struct void_list void_list_t; -+struct void_list -+{ -+ void_list_elt_t pre_head; -+ void_list_elt_t *head; -+ void_list_elt_t *tail; -+}; -+ -+static inline int void_list_empty(void_list_t *list) -+{ -+ if (list->head == NULL) -+ return 1; -+ else -+ return 0; -+} -+ -+int void_list_elt_init(void_list_elt_t *elt, void *data); -+void void_list_elt_deinit(void_list_elt_t *elt); -+ -+int void_list_init(void_list_t *list); -+void void_list_deinit(void_list_t *list); -+ -+int void_list_append(void_list_t *list, void *data); -+int void_list_push(void_list_t *list, void *data); -+void_list_elt_t *void_list_pop(void_list_t *list); -+ -+void *void_list_remove(void_list_t *list, void_list_elt_t **iter); -+/* remove element containing elt data, using cmp(elt->data, target_data) == 0. */ -+typedef int (*void_list_cmp_t)(const void *, const void *); -+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); -+ -+#endif -diff -ruN busybox-1.1.2-orig/archival/libipkg/xsystem.c busybox-1.1.2+ipkg-0.99.162/archival/libipkg/xsystem.c ---- busybox-1.1.2-orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/xsystem.c 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,64 @@ -+/* xsystem.c - system(3) with error messages -+ -+ 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. -+*/ -+ -+#include "ipkg.h" -+#include <sys/wait.h> -+ -+#include "xsystem.h" -+ -+/* XXX: FEATURE: I shouldn't actually use system(3) at all. I don't -+ really need the /bin/sh invocation which takes resources and -+ introduces security problems. I should switch all of this to a sort -+ of execl() or execv() interface/implementation. -+*/ -+ -+/* Like system(3), but with error messages printed if the fork fails -+ or if the child process dies due to an uncaught signal. Also, the -+ return value is a bit simpler: -+ -+ -1 if there was any problem -+ Otherwise, the 8-bit return value of the program ala WEXITSTATUS -+ as defined in <sys/wait.h>. -+*/ -+int xsystem(const char *cmd) -+{ -+ int err; -+ -+ err = system(cmd); -+ -+ if (err == -1) { -+ fprintf(stderr, "%s: ERROR: fork failed before execution: `%s'\n", -+ __FUNCTION__, cmd); -+ return -1; -+ } -+ -+ if (WIFSIGNALED(err)) { -+ fprintf(stderr, "%s: ERROR: Child process died due to signal %d: `%s'\n", -+ __FUNCTION__, WTERMSIG(err), cmd); -+ return -1; -+ } -+ -+ if (WIFEXITED(err)) { -+ /* Normal child exit */ -+ return WEXITSTATUS(err); -+ } -+ -+ fprintf(stderr, "%s: ERROR: Received unintelligible return value from system: %d", -+ __FUNCTION__, err); -+ return -1; -+} -+ -diff -ruN busybox-1.1.2-orig/archival/libipkg/xsystem.h busybox-1.1.2+ipkg-0.99.162/archival/libipkg/xsystem.h ---- busybox-1.1.2-orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libipkg/xsystem.h 2006-05-09 02:06:48.000000000 +0200 -@@ -0,0 +1,34 @@ -+/* xsystem.h - system(3) with error messages -+ -+ 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 XSYSTEM_H -+#define XSYSTEM_H -+ -+#include <stdlib.h> -+ -+/* Like system(3), but with error messages printed if the fork fails -+ or if the child process dies due to an uncaught signal. Also, the -+ return value is a bit simpler: -+ -+ -1 if there was any problem -+ Otherwise, the 8-bit return value of the program ala WEXITSTATUS -+ as defined in <sys/wait.h>. -+*/ -+int xsystem(const char *cmd); -+ -+#endif -+ -diff -ruN busybox-1.1.2-orig/archival/libunarchive/Makefile.in busybox-1.1.2+ipkg-0.99.162/archival/libunarchive/Makefile.in ---- busybox-1.1.2-orig/archival/libunarchive/Makefile.in 2006-03-22 22:16:20.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libunarchive/Makefile.in 2006-05-09 02:06:48.000000000 +0200 -@@ -58,6 +58,7 @@ - LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o - LIBUNARCHIVE-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) - LIBUNARCHIVE-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o -+LIBUNARCHIVE-$(CONFIG_IPKG) += $(GUNZIP_FILES) get_header_tar.o get_header_tar_gz.o - LIBUNARCHIVE-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o - LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o - LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o -diff -ruN busybox-1.1.2-orig/archival/libunarchive/data_extract_all.c busybox-1.1.2+ipkg-0.99.162/archival/libunarchive/data_extract_all.c ---- busybox-1.1.2-orig/archival/libunarchive/data_extract_all.c 2006-03-22 22:16:20.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/archival/libunarchive/data_extract_all.c 2006-05-09 02:06:48.000000000 +0200 -@@ -126,3 +126,17 @@ - utime(file_header->name, &t); - } - } -+ -+extern void data_extract_all_prefix(archive_handle_t *archive_handle) -+{ -+ char *name_ptr = archive_handle->file_header->name; -+ -+ name_ptr += strspn(name_ptr, "./"); -+ if (name_ptr[0] != '\0') { -+ archive_handle->file_header->name = xmalloc(strlen(archive_handle->buffer) + 1 + strlen(name_ptr) + 1); -+ strcpy(archive_handle->file_header->name, archive_handle->buffer); -+ strcat(archive_handle->file_header->name, name_ptr); -+ data_extract_all(archive_handle); -+ } -+} -+ -diff -ruN busybox-1.1.2-orig/include/applets.h busybox-1.1.2+ipkg-0.99.162/include/applets.h ---- busybox-1.1.2-orig/include/applets.h 2006-03-22 22:16:24.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/include/applets.h 2006-05-09 02:06:48.000000000 +0200 -@@ -149,6 +149,7 @@ - USE_IPCALC(APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_IPCRM(APPLET(ipcrm, ipcrm_main, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) - USE_IPCS(APPLET(ipcs, ipcs_main, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) -+USE_IPKG(APPLET(ipkg, ipkg_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_IPLINK(APPLET(iplink, iplink_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_IPROUTE(APPLET(iproute, iproute_main, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_IPTUNNEL(APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)) -diff -ruN busybox-1.1.2-orig/include/unarchive.h busybox-1.1.2+ipkg-0.99.162/include/unarchive.h ---- busybox-1.1.2-orig/include/unarchive.h 2006-03-22 22:16:24.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/include/unarchive.h 2006-05-09 02:06:48.000000000 +0200 -@@ -74,6 +74,7 @@ - - extern void data_skip(archive_handle_t *archive_handle); - extern void data_extract_all(archive_handle_t *archive_handle); -+extern void data_extract_all_prefix(archive_handle_t *archive_handle); - extern void data_extract_to_stdout(archive_handle_t *archive_handle); - extern void data_extract_to_buffer(archive_handle_t *archive_handle); - -diff -ruN busybox-1.1.2-orig/include/usage.h busybox-1.1.2+ipkg-0.99.162/include/usage.h ---- busybox-1.1.2-orig/include/usage.h 2006-03-22 22:16:24.000000000 +0100 -+++ busybox-1.1.2+ipkg-0.99.162/include/usage.h 2006-05-09 02:06:48.000000000 +0200 -@@ -1013,6 +1013,82 @@ - "$ ls -la /tmp/busybox*\n" \ - "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" - -+#define ipkg_trivial_usage \ -+ "[options]... sub-command [arguments]..." -+#define ipkg_full_usage \ -+ "ipkg is an utility to install, remove and manage .ipk packages.\n" \ -+ "\n" \ -+ "Sub-commands:\n" \ -+ "\nPackage Manipulation:\n" \ -+ "\tupdate Update list of available packages\n" \ -+ "\tupgrade Upgrade all installed packages to latest version\n" \ -+ "\tinstall <pkg> Download and install <pkg> (and dependencies)\n" \ -+ "\tinstall <file.ipk> Install package <file.ipk>\n" \ -+ "\tconfigure [<pkg>] Configure unpacked packages\n" \ -+ "\tremove <pkg|regexp> Remove package <pkg|packages following regexp>\n" \ -+ "\tflag <flag> <pkg> ... Flag package(s) <pkg>\n" \ -+ "\t <flag>=hold|noprune|user|ok|installed|unpacked (one per invocation) \n" \ -+ "\n" \ -+ "Informational Commands:\n" \ -+ "\tlist List available packages and descriptions\n" \ -+ "\tlist_installed List all and only the installed packages and description \n" \ -+ "\tfiles <pkg> List all files belonging to <pkg>\n" \ -+ "\tsearch <file|regexp> Search for a package providing <file>\n" \ -+ "\tinfo [pkg|regexp [<field>]] Display all/some info fields for <pkg> or all\n" \ -+ "\tstatus [pkg|regexp [<field>]] Display all/some status fields for <pkg> or all\n" \ -+ "\tdownload <pkg> Download <pkg> to current directory.\n" \ -+ "\tcompare_versions <v1> <op> <v2>\n" \ -+ "\t compare versions using <= < > >= = << >>\n" \ -+ "\tprint_architecture prints the architecture.\n" \ -+ "\tprint_installation_architecture\n" \ -+ "\twhatdepends [-A] [pkgname|pat]+\n" \ -+ "\twhatdependsrec [-A] [pkgname|pat]+\n" \ -+ "\twhatprovides [-A] [pkgname|pat]+\n" \ -+ "\twhatconflicts [-A] [pkgname|pat]+\n" \ -+ "\twhatreplaces [-A] [pkgname|pat]+\n" \ -+ "\t prints the installation architecture.\n" \ -+ "\n" \ -+ "\nOptions:\n" \ -+ "\t-A Query all packages with whatdepends, whatprovides, whatreplaces, whatconflicts\n" \ -+ "\t-V <level> Set verbosity level to <level>. If no value is\n" \ -+ "\t--verbosity <level> provided increase verbosity by one. Verbosity levels:\n" \ -+ "\t 0 errors only\n" \ -+ "\t 1 normal messages (default)\n" \ -+ "\t 2 informative messages\n" \ -+ "\t 3 debug output\n" \ -+ "\t-f <conf_file> Use <conf_file> as the ipkg configuration file\n" \ -+ "\t-conf <conf_file> Default configuration file location\n" \ -+ " is /etc/ipkg.conf\n" \ -+ "\t-d <dest_name> Use <dest_name> as the the root directory for\n" \ -+ "\t-dest <dest_name> package installation, removal, upgrading.\n" \ -+ " <dest_name> should be a defined dest name from\n" \ -+ " the configuration file, (but can also be a\n" \ -+ " directory name in a pinch).\n" \ -+ "\t-o <offline_root> Use <offline_root> as the root directory for\n" \ -+ "\t-offline <offline_root> offline installation of packages.\n" \ -+ "\t-verbose_wget more wget messages\n" \ -+ "\n" \ -+ "Force Options (use when ipkg is too smart for its own good):\n" \ -+ "\t-force-depends Make dependency checks warnings instead of errors\n" \ -+ "\t Install/remove package in spite of failed dependences\n" \ -+ "\t-force-defaults Use default options for questions asked by ipkg.\n" \ -+ " (no prompts). Note that this will not prevent\n" \ -+ " package installation scripts from prompting.\n" \ -+ "\t-force-reinstall Allow ipkg to reinstall a package.\n" \ -+ "\t-force-overwrite Allow ipkg to overwrite files from another package during an install.\n" \ -+ "\t-force-downgrade Allow ipkg to downgrade packages.\n" \ -+ "\t-force_space Install even if there does not seem to be enough space.\n" \ -+ "\t-noaction No action -- test only\n" \ -+ "\t-nodeps Do not follow dependences\n" \ -+ "\t-force-removal-of-dependent-packages\n" \ -+ "\t-recursive Allow ipkg to remove package and all that depend on it.\n" \ -+ "\t-test No action -- test only\n" \ -+ "\t-t Specify tmp-dir.\n" \ -+ "\t--tmp-dir Specify tmp-dir.\n" \ -+ "\n" \ -+ "\tregexp could be something like 'pkgname*' '*file*' or similar\n" \ -+ "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" -+ - #define halt_trivial_usage \ - "[-d<delay>] [-n<nosync>] [-f<force>]" - #define halt_full_usage \ diff --git a/openwrt/package/busybox/patches/912-ipkg-no_warnings.patch b/openwrt/package/busybox/patches/912-ipkg-no_warnings.patch deleted file mode 100644 index 74133b0..0000000 --- a/openwrt/package/busybox/patches/912-ipkg-no_warnings.patch +++ /dev/null @@ -1,444 +0,0 @@ -# -# remove (numerous) compile warnings -# -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/file_util.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/file_util.c 2006-05-09 02:06:48.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/file_util.c 2006-05-09 02:16:48.000000000 +0200 -@@ -123,7 +123,7 @@ - - int file_mkdir_hier(const char *path, long mode) - { -- return bb_make_directory(path, mode, FILEUTILS_RECUR); -+ return bb_make_directory((char *)path, mode, FILEUTILS_RECUR); - } - - char *file_md5sum_alloc(const char *file_name) -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_cmd.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.c 2006-05-09 02:23:37.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_cmd.c 2006-05-09 02:23:17.000000000 +0200 -@@ -246,7 +246,7 @@ - in = fopen (tmp_file_name, "r"); - out = fopen (list_file_name, "w"); - if (in && out) -- inflate_unzip (in, out); -+ inflate_unzip (fileno(in), fileno(out)); - else - err = 1; - if (in) -@@ -894,14 +894,13 @@ - pkg_vec_free(available); - } else { - pkg_vec_t *installed_pkgs = pkg_vec_alloc(); -- int i; - int flagged_pkg_count = 0; - int removed; - - pkg_hash_fetch_all_installed(&conf->pkg_hash, installed_pkgs); - - for (i = 0; i < installed_pkgs->len; i++) { -- pkg_t *pkg = installed_pkgs->pkgs[i]; -+ pkg = installed_pkgs->pkgs[i]; - if (pkg->state_flag & SF_USER) { - flagged_pkg_count++; - } else { -@@ -921,7 +920,7 @@ - do { - removed = 0; - for (i = 0; i < installed_pkgs->len; i++) { -- pkg_t *pkg = installed_pkgs->pkgs[i]; -+ pkg = installed_pkgs->pkgs[i]; - if (!(pkg->state_flag & SF_USER) - && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) { - removed++; -@@ -976,7 +975,7 @@ - { - int i; - pkg_t *pkg; -- const char *flags = argv[0]; -+ char *flags = argv[0]; - - global_conf = conf; - signal(SIGINT, sigint_handler); -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_conf.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c 2006-05-09 02:12:04.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_conf.c 2006-05-09 02:16:48.000000000 +0200 -@@ -542,14 +542,14 @@ - if (strcmp(type, "option") == 0) { - ipkg_conf_set_option(options, name, value); - } else if (strcmp(type, "src") == 0) { -- if (!nv_pair_list_find(pkg_src_list, name)) { -+ if (!nv_pair_list_find((nv_pair_list_t *)pkg_src_list, name)) { - pkg_src_list_append (pkg_src_list, name, value, extra, 0); - } else { - ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n", - name, value); - } - } else if (strcmp(type, "src/gz") == 0) { -- if (!nv_pair_list_find(pkg_src_list, name)) { -+ if (!nv_pair_list_find((nv_pair_list_t *)pkg_src_list, name)) { - pkg_src_list_append (pkg_src_list, name, value, extra, 1); - } else { - ipkg_message(conf, IPKG_ERROR, "ERROR: duplicate src declaration. Skipping:\n\t src %s %s\n", -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_download.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c 2006-05-09 02:12:04.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/ipkg_download.c 2006-05-09 02:22:51.000000000 +0200 -@@ -166,7 +166,7 @@ - if (err) - return err; - pkg->local_filename = strdup(url); -- ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename); -+ ipkg_message(conf, IPKG_DEBUG2, "Package %s provided by hand (%s).\n", pkg->name,pkg->local_filename); - pkg->provided_by_hand = 1; - - } else { -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/libipkg.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/libipkg.c 2006-05-09 02:12:05.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/libipkg.c 2006-05-09 02:16:48.000000000 +0200 -@@ -445,7 +445,7 @@ - int - ipkg_op (int argc, char *argv[]) - { -- int err, optind; -+ int err, opt_index; - args_t args; - char *cmd_name; - ipkg_cmd_t *cmd; -@@ -453,13 +453,13 @@ - - args_init (&args); - -- optind = args_parse (&args, argc, argv); -- if (optind == argc || optind < 0) -+ opt_index = args_parse (&args, argc, argv); -+ if (opt_index == argc || opt_index < 0) - { - args_usage ("ipkg must have one sub-command argument"); - } - -- cmd_name = argv[optind++]; -+ cmd_name = argv[opt_index++]; - /* Pigi: added a flag to disable the checking of structures if the command does not need to - read anything from there. - */ -@@ -509,7 +509,7 @@ - args_usage (NULL); - } - -- if (cmd->requires_args && optind == argc) -+ if (cmd->requires_args && opt_index == argc) - { - fprintf (stderr, - "%s: the ``%s'' command requires at least one argument\n", -@@ -517,7 +517,7 @@ - args_usage (NULL); - } - -- err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind, (const char **) (argv + optind), NULL); -+ err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - opt_index, (const char **) (argv + opt_index), NULL); - - ipkg_conf_deinit (&ipkg_conf); - -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/md5.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/md5.c 2006-05-09 02:06:48.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/md5.c 2006-05-09 02:16:48.000000000 +0200 -@@ -25,7 +25,6 @@ - int md5_stream(FILE *stream, void *resblock) - { - int fd; -- int sum; - - if( (fd = fileno(stream)) == -1 ) { - bb_error_msg("bad file descriptor"); -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.c 2006-05-09 02:12:05.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c 2006-05-09 02:16:48.000000000 +0200 -@@ -528,6 +528,7 @@ - char * pkg_formatted_field(pkg_t *pkg, const char *field ) - { - static size_t LINE_LEN = 128; -+ char line_str[LINE_LEN]; - char * temp = (char *)malloc(1); - int len = 0; - int flag_provide_false = 0; -@@ -567,7 +568,6 @@ - if (strcasecmp(field, "Conffiles") == 0) { - /* Conffiles */ - conffile_list_elt_t *iter; -- char confstr[LINE_LEN]; - - if (pkg->conffiles.head == NULL) { - return temp; -@@ -588,15 +588,14 @@ - strncpy(temp, "Conffiles:\n", 12); - for (iter = pkg->conffiles.head; iter; iter = iter->next) { - if (iter->data->name && iter->data->value) { -- snprintf(confstr, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value); -- strncat(temp, confstr, strlen(confstr)); -+ snprintf(line_str, LINE_LEN, "%s %s\n", iter->data->name, iter->data->value); -+ strncat(temp, line_str, strlen(line_str)); - } - } - } else if (strcasecmp(field, "Conflicts") == 0) { - int i; - - if (pkg->conflicts_count) { -- char conflictstr[LINE_LEN]; - len = 14 ; - for(i = 0; i < pkg->conflicts_count; i++) { - len = len + (strlen(pkg->conflicts_str[i])+5); -@@ -609,8 +608,8 @@ - temp[0]='\0'; - strncpy(temp, "Conflicts:", 11); - for(i = 0; i < pkg->conflicts_count; i++) { -- snprintf(conflictstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]); -- strncat(temp, conflictstr, strlen(conflictstr)); -+ snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->conflicts_str[i]); -+ strncat(temp, line_str, strlen(line_str)); - } - strncat(temp, "\n", strlen("\n")); - } -@@ -625,7 +624,6 @@ - int i; - - if (pkg->depends_count) { -- char depstr[LINE_LEN]; - len = 14 ; - for(i = 0; i < pkg->depends_count; i++) { - len = len + (strlen(pkg->depends_str[i])+4); -@@ -638,8 +636,8 @@ - temp[0]='\0'; - strncpy(temp, "Depends:", 10); - for(i = 0; i < pkg->depends_count; i++) { -- snprintf(depstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]); -- strncat(temp, depstr, strlen(depstr)); -+ snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]); -+ strncat(temp, line_str, strlen(line_str)); - } - strncat(temp, "\n", strlen("\n")); - } -@@ -804,7 +802,6 @@ - /* Replaces | Recommends*/ - if (strcasecmp (field, "Replaces") == 0) { - if (pkg->replaces_count) { -- char replstr[LINE_LEN]; - len = 14; - for (i = 0; i < pkg->replaces_count; i++) { - len = len + (strlen(pkg->replaces_str[i])+5); -@@ -817,14 +814,13 @@ - temp[0]='\0'; - strncpy(temp, "Replaces:", 12); - for (i = 0; i < pkg->replaces_count; i++) { -- snprintf(replstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]); -- strncat(temp, replstr, strlen(replstr)); -+ snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->replaces_str[i]); -+ strncat(temp, line_str, strlen(line_str)); - } - strncat(temp, "\n", strlen("\n")); - } - } else if (strcasecmp (field, "Recommends") == 0) { - if (pkg->recommends_count) { -- char recstr[LINE_LEN]; - len = 15; - for(i = 0; i < pkg->recommends_count; i++) { - len = len + (strlen( pkg->recommends_str[i])+5); -@@ -837,8 +833,8 @@ - temp[0]='\0'; - strncpy(temp, "Recommends:", 13); - for(i = 0; i < pkg->recommends_count; i++) { -- snprintf(recstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]); -- strncat(temp, recstr, strlen(recstr)); -+ snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->recommends_str[i]); -+ strncat(temp, line_str, strlen(line_str)); - } - strncat(temp, "\n", strlen("\n")); - } -@@ -907,7 +903,6 @@ - } else if (strcasecmp(field, "Suggests") == 0) { - if (pkg->suggests_count) { - int i; -- char sugstr[LINE_LEN]; - len = 13; - for(i = 0; i < pkg->suggests_count; i++) { - len = len + (strlen(pkg->suggests_str[i])+5); -@@ -920,8 +915,8 @@ - temp[0]='\0'; - strncpy(temp, "Suggests:", 10); - for(i = 0; i < pkg->suggests_count; i++) { -- snprintf(sugstr, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]); -- strncat(temp, sugstr, strlen(sugstr)); -+ snprintf(line_str, LINE_LEN, "%s %s", i == 0 ? "" : ",", pkg->suggests_str[i]); -+ strncat(temp, line_str, strlen(line_str)); - } - strncat(temp, "\n", strlen("\n")); - } -@@ -1140,10 +1135,8 @@ - return 0; - } - --int pkg_name_version_and_architecture_compare(void *p1, void *p2) -+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b) - { -- const pkg_t *a = *(const pkg_t **)p1; -- const pkg_t *b = *(const pkg_t **)p2; - int namecmp; - int vercmp; - if (!a->name || !b->name) { -@@ -1170,10 +1163,8 @@ - return 0; - } - --int abstract_pkg_name_compare(void *p1, void *p2) -+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b) - { -- const abstract_pkg_t *a = *(const abstract_pkg_t **)p1; -- const abstract_pkg_t *b = *(const abstract_pkg_t **)p2; - if (!a->name || !b->name) { - fprintf(stderr, "abstract_pkg_name_compare: a=%p a->name=%p b=%p b->name=%p\n", - a, a->name, b, b->name); -@@ -1193,7 +1184,7 @@ - #endif - - if (pkg->epoch) { -- sprintf_alloc(&epoch_str, "%d:", pkg->epoch); -+ sprintf_alloc(&epoch_str, "%d:", (int)(pkg->epoch)); - } else { - epoch_str = strdup(""); - } -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.h ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg.h 2006-05-09 02:12:05.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.h 2006-05-09 02:16:48.000000000 +0200 -@@ -194,8 +194,8 @@ - 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(void *a, void *b); --int abstract_pkg_name_compare(void *a, void *b); -+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 ); -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.c 2006-05-09 02:12:05.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.c 2006-05-09 02:16:48.000000000 +0200 -@@ -68,7 +68,7 @@ - pkg_vec_t *unsatisfied, char *** unresolved) - { - pkg_t * satisfier_entry_pkg; -- register int i, j, k; -+ register int i, j, k, l; - int count, found; - char ** the_lost; - abstract_pkg_t * ab_pkg; -@@ -113,7 +113,6 @@ - abstract_pkg_vec_t *ab_provider_vec = abpkg->provided_by; - int nposs = ab_provider_vec->len; - abstract_pkg_t **ab_providers = ab_provider_vec->pkgs; -- int l; - for (l = 0; l < nposs; l++) { - pkg_vec_t *test_vec = ab_providers[l]->pkgs; - /* if no depends on this one, try the first package that Provides this one */ -@@ -137,10 +136,9 @@ - tmp_vec, - &newstuff); - if (newstuff == NULL) { -- int i; - int ok = 1; -- for (i = 0; i < rc; i++) { -- pkg_t *p = tmp_vec->pkgs[i]; -+ for (l = 0; l < rc; l++) { -+ pkg_t *p = tmp_vec->pkgs[l]; - if (p->state_want == SW_INSTALL) - continue; - ipkg_message(conf, IPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name); -@@ -814,27 +812,27 @@ - * [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index] - * [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index] - */ --char *pkg_depend_str(pkg_t *pkg, int index) -+char *pkg_depend_str(pkg_t *pkg, int pkg_index) - { -- if (index < pkg->pre_depends_count) { -- return pkg->pre_depends_str[index]; -+ if (pkg_index < pkg->pre_depends_count) { -+ return pkg->pre_depends_str[pkg_index]; - } -- index -= pkg->pre_depends_count; -+ pkg_index -= pkg->pre_depends_count; - -- if (index < pkg->recommends_count) { -- return pkg->recommends_str[index]; -+ if (pkg_index < pkg->recommends_count) { -+ return pkg->recommends_str[pkg_index]; - } -- index -= pkg->recommends_count; -+ pkg_index -= pkg->recommends_count; - -- if (index < pkg->suggests_count) { -- return pkg->suggests_str[index]; -+ if (pkg_index < pkg->suggests_count) { -+ return pkg->suggests_str[pkg_index]; - } -- index -= pkg->suggests_count; -+ pkg_index -= pkg->suggests_count; - -- if (index < pkg->depends_count) { -- return pkg->depends_str[index]; -+ if (pkg_index < pkg->depends_count) { -+ return pkg->depends_str[pkg_index]; - } -- fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name); -+ fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", pkg_index, pkg->name); - return NULL; - } - -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.h ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h 2006-05-09 02:06:48.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_depends.h 2006-05-09 02:16:48.000000000 +0200 -@@ -92,7 +92,7 @@ - */ - int pkg_conflicts(pkg_t *pkg, pkg_t *conflicts); - --char *pkg_depend_str(pkg_t *pkg, int index); -+char *pkg_depend_str(pkg_t *pkg, int pkg_index); - void buildDependedUponBy(pkg_t * pkg, abstract_pkg_t * ab_pkg); - void freeDepends(pkg_t *pkg); - void printDepends(pkg_t * pkg); -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_hash.c ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.c 2006-05-09 02:12:05.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_hash.c 2006-05-09 02:17:35.000000000 +0200 -@@ -143,7 +143,7 @@ - pkg_t *pkg_hash_fetch_best_installation_candidate(ipkg_conf_t *conf, abstract_pkg_t *apkg, - int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet) - { -- int i; -+ int i, j; - int nprovides = 0; - int nmatching = 0; - pkg_vec_t *matching_pkgs = pkg_vec_alloc(); -@@ -209,11 +209,10 @@ - /* now check for supported architecture */ - { - int max_count = 0; -- int i; - - /* count packages matching max arch priority and keep track of last one */ -- for (i = 0; i < vec->len; i++) { -- pkg_t *maybe = vec->pkgs[i]; -+ for (j = 0; j < vec->len; j++) { -+ pkg_t *maybe = vec->pkgs[j]; - ipkg_message(conf, IPKG_DEBUG, " %s arch=%s arch_priority=%d version=%s \n", - maybe->name, maybe->architecture, maybe->arch_priority, maybe->version); - if (maybe->arch_priority > 0) { -diff -ruN busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_vec.h ---- busybox-1.1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h 2006-05-09 02:06:48.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg_vec.h 2006-05-09 02:16:48.000000000 +0200 -@@ -35,6 +35,8 @@ - }; - typedef struct abstract_pkg_vec abstract_pkg_vec_t; - -+typedef int (*pkg_compar_t)(pkg_t *, pkg_t *); -+typedef int (*abstract_pkg_compar_t)(abstract_pkg_t *, abstract_pkg_t *); - - pkg_vec_t * pkg_vec_alloc(void); - void pkg_vec_free(pkg_vec_t *vec); diff --git a/openwrt/package/busybox/patches/913-libbb_hash.patch b/openwrt/package/busybox/patches/913-libbb_hash.patch deleted file mode 100644 index 3a6a2ba..0000000 --- a/openwrt/package/busybox/patches/913-libbb_hash.patch +++ /dev/null @@ -1,218 +0,0 @@ -# -# expose (again) an hash_fd function (used 911-ipkg.patch) -# -diff -ruN busybox-1.1.1-old/coreutils/md5_sha1_sum.c busybox-1.1.1-new/coreutils/md5_sha1_sum.c ---- busybox-1.1.1-old/coreutils/md5_sha1_sum.c 2006-03-30 00:14:50.000000000 +0200 -+++ busybox-1.1.1-new/coreutils/md5_sha1_sum.c 2006-03-29 23:46:51.000000000 +0200 -@@ -15,80 +15,10 @@ - - #include "busybox.h" - --typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; -- - #define FLAG_SILENT 1 - #define FLAG_CHECK 2 - #define FLAG_WARN 4 - --/* This might be useful elsewhere */ --static unsigned char *hash_bin_to_hex(unsigned char *hash_value, -- unsigned char hash_length) --{ -- int x, len, max; -- unsigned char *hex_value; -- -- max = (hash_length * 2) + 2; -- hex_value = xmalloc(max); -- for (x = len = 0; x < hash_length; x++) { -- len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]); -- } -- return (hex_value); --} -- --static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) --{ -- int src_fd, hash_len, count; -- union _ctx_ { -- sha1_ctx_t sha1; -- md5_ctx_t md5; -- } context; -- uint8_t *hash_value = NULL; -- RESERVE_CONFIG_UBUFFER(in_buf, 4096); -- void (*update)(const void*, size_t, void*); -- void (*final)(void*, void*); -- -- if(strcmp(filename, "-") == 0) { -- src_fd = STDIN_FILENO; -- } else if(0 > (src_fd = open(filename, O_RDONLY))) { -- bb_perror_msg("%s", filename); -- return NULL; -- } -- -- // figure specific hash algorithims -- if(ENABLE_MD5SUM && hash_algo==HASH_MD5) { -- md5_begin(&context.md5); -- update = (void (*)(const void*, size_t, void*))md5_hash; -- final = (void (*)(void*, void*))md5_end; -- hash_len = 16; -- } else if(ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { -- sha1_begin(&context.sha1); -- update = (void (*)(const void*, size_t, void*))sha1_hash; -- final = (void (*)(void*, void*))sha1_end; -- hash_len = 20; -- } else { -- bb_error_msg_and_die("algotithm not supported"); -- } -- -- -- while(0 < (count = read(src_fd, in_buf, sizeof in_buf))) { -- update(in_buf, count, &context); -- } -- -- if(count == 0) { -- final(in_buf, &context); -- hash_value = hash_bin_to_hex(in_buf, hash_len); -- } -- -- RELEASE_CONFIG_BUFFER(in_buf); -- -- if(src_fd != STDIN_FILENO) { -- close(src_fd); -- } -- -- return hash_value; --} -- - /* This could become a common function for md5 as well, by using md5_stream */ - static int hash_files(int argc, char **argv, hash_algo_t hash_algo) - { -diff -ruN busybox-1.1.1-old/include/libbb.h busybox-1.1.1-new/include/libbb.h ---- busybox-1.1.1-old/include/libbb.h 2006-03-30 00:14:50.000000000 +0200 -+++ busybox-1.1.1-new/include/libbb.h 2006-03-30 00:31:48.000000000 +0200 -@@ -490,6 +490,12 @@ - void md5_hash(const void *data, size_t length, md5_ctx_t *ctx); - void *md5_end(void *resbuf, md5_ctx_t *ctx); - -+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; -+ -+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length); -+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value); -+uint8_t *hash_file(const char *filename, hash_algo_t hash_algo); -+ - /* busybox.h will include dmalloc later for us, else include it here. */ - #if !defined _BB_INTERNAL_H_ && defined DMALLOC - #include <dmalloc.h> -diff -ruN busybox-1.1.1-old/libbb/Makefile.in busybox-1.1.1-new/libbb/Makefile.in ---- busybox-1.1.1-old/libbb/Makefile.in 2006-03-30 00:14:50.000000000 +0200 -+++ busybox-1.1.1-new/libbb/Makefile.in 2006-03-29 23:46:51.000000000 +0200 -@@ -11,6 +11,7 @@ - - LIBBB-n:= - LIBBB-y:= \ -+ hash.c \ - bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \ - compare_string_array.c concat_path_file.c copy_file.c copyfd.c \ - create_icmp_socket.c create_icmp6_socket.c \ -diff -ruN busybox-1.1.1-old/libbb/hash.c busybox-1.1.1-new/libbb/hash.c ---- busybox-1.1.1-old/libbb/hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.1.1-new/libbb/hash.c 2006-03-30 00:35:54.000000000 +0200 -@@ -0,0 +1,100 @@ -+/* -+ * Copyright (C) 2003 Glenn L. McGrath -+ * Copyright (C) 2003-2004 Erik Andersen -+ * -+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. -+ */ -+ -+#include <fcntl.h> -+#include <limits.h> -+#include <stdio.h> -+#include <stdint.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> -+ -+#include "busybox.h" -+ -+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length) -+{ -+ int x, len, max; -+ unsigned char *hex_value; -+ -+ max = (hash_length * 2) + 2; -+ hex_value = xmalloc(max); -+ for (x = len = 0; x < hash_length; x++) { -+ len += snprintf((char*)(hex_value + len), max - len, "%02x", hash_value[x]); -+ } -+ return (hex_value); -+} -+ -+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value) -+{ -+ int count, result = 0; -+ union _ctx_ { -+ sha1_ctx_t sha1; -+ md5_ctx_t md5; -+ } context; -+ RESERVE_CONFIG_UBUFFER(in_buf, 4096); -+ void (*update)(const void*, size_t, void*) = NULL; -+ void (*final)(void*, void*) = NULL; -+ -+ // figure specific hash algorithims -+ if(hash_algo==HASH_MD5) { -+ md5_begin(&context.md5); -+ update = (void (*)(const void*, size_t, void*))md5_hash; -+ final = (void (*)(void*, void*))md5_end; -+ } else if(hash_algo==HASH_SHA1) { -+ sha1_begin(&context.sha1); -+ update = (void (*)(const void*, size_t, void*))sha1_hash; -+ final = (void (*)(void*, void*))sha1_end; -+ } -+ -+ -+ while(0 < (count = read(fd, in_buf, sizeof in_buf))) { -+ update(in_buf, count, &context); -+ result += count; -+ } -+ -+ if(count == 0) { -+ final(hash_value, &context); -+ } -+ -+ RELEASE_CONFIG_BUFFER(in_buf); -+ -+ return result; -+} -+ -+uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) -+{ -+ int src_fd, hash_len; -+ RESERVE_CONFIG_UBUFFER(hash_buf, 20); -+ uint8_t *hash_value = NULL; -+ -+ if(ENABLE_MD5SUM && hash_algo==HASH_MD5) { -+ hash_len = 16; -+ } else if(ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { -+ hash_len = 20; -+ } else { -+ bb_error_msg_and_die("algotithm not supported"); -+ } -+ -+ if(strcmp(filename, "-") == 0) { -+ src_fd = STDIN_FILENO; -+ } else if(0 > (src_fd = open(filename, O_RDONLY))) { -+ bb_perror_msg("%s", filename); -+ return NULL; -+ } -+ -+ if(hash_fd(src_fd, hash_algo, hash_buf) > 0) { -+ hash_value = hash_bin_to_hex(hash_buf, hash_len); -+ } -+ -+ if(src_fd != STDIN_FILENO) { -+ close(src_fd); -+ } -+ -+ RELEASE_CONFIG_BUFFER(hash_buf); -+ -+ return hash_value; -+} diff --git a/openwrt/package/busybox/patches/914-ipkg-fixes.patch b/openwrt/package/busybox/patches/914-ipkg-fixes.patch deleted file mode 100644 index 55cd904..0000000 --- a/openwrt/package/busybox/patches/914-ipkg-fixes.patch +++ /dev/null @@ -1,15 +0,0 @@ -# -# fix ipkg bugs -# -diff -ruN busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c ---- busybox-1.1.2+ipkg-0.99.162-no_warnings/archival/libipkg/pkg.c 2006-05-09 02:16:48.000000000 +0200 -+++ busybox-1.1.2+ipkg-0.99.162-fixes/archival/libipkg/pkg.c 2006-05-09 05:15:29.000000000 +0200 -@@ -359,6 +359,8 @@ - if (!oldpkg->essential) - oldpkg->essential = newpkg->essential; - -+ oldpkg->provided_by_hand |= newpkg->provided_by_hand; -+ - return 0; - } - |