diff options
Diffstat (limited to 'package/busybox/patches/911-ipkg.patch')
| -rw-r--r-- | package/busybox/patches/911-ipkg.patch | 546 |
1 files changed, 312 insertions, 234 deletions
diff --git a/package/busybox/patches/911-ipkg.patch b/package/busybox/patches/911-ipkg.patch index 8f482ebc43..d96063b233 100644 --- a/package/busybox/patches/911-ipkg.patch +++ b/package/busybox/patches/911-ipkg.patch @@ -1,6 +1,7 @@ -diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in ---- busybox.old/archival/Config.in 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/Config.in 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/Config.in +=================================================================== +--- busybox-1.4.2.orig/archival/Config.in 2007-06-04 13:21:31.573176816 +0200 ++++ busybox-1.4.2/archival/Config.in 2007-06-04 13:21:36.706396448 +0200 @@ -121,6 +121,14 @@ gzip is used to compress files. It's probably the most widely used UNIX compression program. @@ -16,9 +17,10 @@ diff -urN busybox.old/archival/Config.in busybox.dev/archival/Config.in config RPM2CPIO bool "rpm2cpio" default n -diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c ---- busybox.old/archival/dpkg.c 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/dpkg.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/dpkg.c +=================================================================== +--- busybox-1.4.2.orig/archival/dpkg.c 2007-06-04 13:21:31.579175904 +0200 ++++ busybox-1.4.2/archival/dpkg.c 2007-06-04 13:21:36.706396448 +0200 @@ -1463,6 +1463,10 @@ return ar_handle->sub_archive->buffer; } @@ -39,9 +41,10 @@ diff -urN busybox.old/archival/dpkg.c busybox.dev/archival/dpkg.c static void unpack_package(deb_file_t *deb_file) { const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; -diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c ---- busybox.old/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/ipkg.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/ipkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/ipkg.c 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,26 @@ +/* ipkg.c - the itsy package management system + @@ -69,9 +72,10 @@ diff -urN busybox.old/archival/ipkg.c busybox.dev/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild ---- busybox.old/archival/Kbuild 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/Kbuild 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/Kbuild +=================================================================== +--- busybox-1.4.2.orig/archival/Kbuild 2007-06-04 13:21:31.588174536 +0200 ++++ busybox-1.4.2/archival/Kbuild 2007-06-04 13:21:36.707396296 +0200 @@ -15,6 +15,7 @@ lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o lib-$(CONFIG_GUNZIP) += gunzip.o @@ -80,9 +84,10 @@ diff -urN busybox.old/archival/Kbuild busybox.dev/archival/Kbuild lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o lib-$(CONFIG_RPM) += rpm.o lib-$(CONFIG_TAR) += tar.o -diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args.c ---- busybox.old/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/args.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/args.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/args.c 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -326,9 +331,10 @@ diff -urN busybox.old/archival/libipkg/args.c busybox.dev/archival/libipkg/args. +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args.h ---- busybox.old/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/args.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/args.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/args.h 2007-06-04 13:21:36.707396296 +0200 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -402,9 +408,10 @@ diff -urN busybox.old/archival/libipkg/args.h busybox.dev/archival/libipkg/args. +void args_usage(char *complaint); + +#endif -diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/conffile.c ---- busybox.old/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,64 @@ +/* conffile.c - the itsy package management system + @@ -470,9 +477,10 @@ diff -urN busybox.old/archival/libipkg/conffile.c busybox.dev/archival/libipkg/c + + return ret; +} -diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/conffile.h ---- busybox.old/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -504,9 +512,10 @@ diff -urN busybox.old/archival/libipkg/conffile.h busybox.dev/archival/libipkg/c + +#endif + -diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libipkg/conffile_list.c ---- busybox.old/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile_list.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -555,9 +564,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.c busybox.dev/archival/libi + return nv_pair_list_pop(list); +} + -diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libipkg/conffile_list.h ---- busybox.old/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/conffile_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/conffile_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/conffile_list.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -595,9 +605,10 @@ diff -urN busybox.old/archival/libipkg/conffile_list.h busybox.dev/archival/libi + +#endif + -diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/file_util.c ---- busybox.old/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/file_util.c 2007-01-22 14:00:52.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/file_util.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/file_util.c 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,132 @@ +/* file_util.c - convenience routines for common stat operations + @@ -731,9 +742,10 @@ diff -urN busybox.old/archival/libipkg/file_util.c busybox.dev/archival/libipkg/ + return hash_file(file_name, HASH_MD5); +} + -diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/file_util.h ---- busybox.old/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/file_util.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/file_util.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/file_util.h 2007-06-04 13:21:36.708396144 +0200 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -764,9 +776,10 @@ diff -urN busybox.old/archival/libipkg/file_util.h busybox.dev/archival/libipkg/ +char *file_md5sum_alloc(const char *file_name); + +#endif -diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg/hash_table.c ---- busybox.old/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/hash_table.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/hash_table.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/hash_table.c 2007-06-04 13:21:36.709395992 +0200 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -923,9 +936,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.c busybox.dev/archival/libipkg + } +} + -diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg/hash_table.h ---- busybox.old/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/hash_table.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/hash_table.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/hash_table.h 2007-06-04 13:21:36.709395992 +0200 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -971,9 +985,10 @@ diff -urN busybox.old/archival/libipkg/hash_table.h busybox.dev/archival/libipkg +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/ipkg_cmd.c ---- busybox.old/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_cmd.c 2007-01-22 13:47:47.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.c 2007-06-04 13:21:36.710395840 +0200 @@ -0,0 +1,1431 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2406,9 +2421,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.c busybox.dev/archival/libipkg/i +} + + -diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/ipkg_cmd.h ---- busybox.old/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_cmd.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_cmd.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_cmd.h 2007-06-04 13:21:36.710395840 +0200 @@ -0,0 +1,46 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2456,9 +2472,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_cmd.h busybox.dev/archival/libipkg/i +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/ipkg_conf.c ---- busybox.old/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_conf.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_conf.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_conf.c 2007-06-04 13:21:36.711395688 +0200 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3171,9 +3188,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.c busybox.dev/archival/libipkg/ + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/ipkg_conf.h ---- busybox.old/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_conf.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_conf.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_conf.h 2007-06-04 13:21:36.711395688 +0200 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3282,9 +3300,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_conf.h busybox.dev/archival/libipkg/ +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/libipkg/ipkg_configure.c ---- busybox.old/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_configure.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_configure.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_configure.c 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3326,9 +3345,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.c busybox.dev/archival/lib + return 0; +} + -diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/libipkg/ipkg_configure.h ---- busybox.old/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_configure.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_configure.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_configure.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3355,9 +3375,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_configure.h busybox.dev/archival/lib +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libipkg/ipkg_download.c ---- busybox.old/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_download.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_download.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_download.c 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3554,9 +3575,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.c busybox.dev/archival/libi + } + return 0; +} -diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libipkg/ipkg_download.h ---- busybox.old/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_download.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_download.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_download.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3588,9 +3610,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_download.h busybox.dev/archival/libi +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg.h ---- busybox.old/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg.h 2007-06-04 13:21:36.712395536 +0200 @@ -0,0 +1,74 @@ +/* ipkg.h - the itsy package management system + @@ -3666,9 +3689,10 @@ diff -urN busybox.old/archival/libipkg/ipkg.h busybox.dev/archival/libipkg/ipkg. +extern ipkg_conf_t *global_conf; + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libipkg/ipkg_includes.h ---- busybox.old/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_includes.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_includes.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_includes.h 2007-06-04 13:21:36.713395384 +0200 @@ -0,0 +1,79 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3749,9 +3773,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_includes.h busybox.dev/archival/libi +#endif + +#endif /* IPKG_INCLUDES_H */ -diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libipkg/ipkg_install.c ---- busybox.old/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_install.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_install.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_install.c 2007-06-04 13:21:36.714395232 +0200 @@ -0,0 +1,1942 @@ +/* ipkg_install.c - the itsy package management system + @@ -5695,9 +5720,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.c busybox.dev/archival/libip +} + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libipkg/ipkg_install.h ---- busybox.old/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_install.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_install.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_install.h 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5734,9 +5760,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_install.h busybox.dev/archival/libip +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libipkg/ipkg_message.c ---- busybox.old/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_message.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_message.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_message.c 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,61 @@ +/* ipkg_message.c - the itsy package management system + @@ -5799,9 +5826,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.c busybox.dev/archival/libip + } +} +#endif -diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libipkg/ipkg_message.h ---- busybox.old/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_message.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_message.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_message.h 2007-06-04 13:21:36.715395080 +0200 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5835,9 +5863,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_message.h busybox.dev/archival/libip +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipkg/ipkg_remove.c ---- busybox.old/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_remove.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_remove.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_remove.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,383 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6222,9 +6251,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipkg/ipkg_remove.h ---- busybox.old/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_remove.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_remove.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_remove.h 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6259,9 +6289,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_remove.h busybox.dev/archival/libipk + + +#endif -diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libipkg/ipkg_upgrade.c ---- busybox.old/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_upgrade.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,77 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6340,9 +6371,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.c busybox.dev/archival/libip + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libipkg/ipkg_upgrade.h ---- busybox.old/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_upgrade.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_upgrade.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_upgrade.h 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6362,9 +6394,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_upgrade.h busybox.dev/archival/libip +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg/ipkg_utils.c ---- busybox.old/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_utils.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_utils.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_utils.c 2007-06-04 13:21:36.716394928 +0200 @@ -0,0 +1,181 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6547,9 +6580,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.c busybox.dev/archival/libipkg +} + + -diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg/ipkg_utils.h ---- busybox.old/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/ipkg_utils.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/ipkg_utils.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/ipkg_utils.h 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6580,9 +6614,10 @@ diff -urN busybox.old/archival/libipkg/ipkg_utils.h busybox.dev/archival/libipkg +int line_is_blank(const char *line); + +#endif -diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuild ---- busybox.old/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/Kbuild 2007-01-22 14:01:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/Kbuild +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/Kbuild 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6644,9 +6679,10 @@ diff -urN busybox.old/archival/libipkg/Kbuild busybox.dev/archival/libipkg/Kbuil +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/libipkg.c ---- busybox.old/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/libipkg.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/libipkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/libipkg.c 2007-06-04 13:21:36.717394776 +0200 @@ -0,0 +1,527 @@ +/* ipkglib.c - the itsy package management system + @@ -7175,9 +7211,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.c busybox.dev/archival/libipkg/li +} + +#endif /* IPKG_LIB */ -diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/libipkg.h ---- busybox.old/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/libipkg.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/libipkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/libipkg.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,87 @@ +/* ipkglib.h - the itsy package management system + @@ -7266,9 +7303,10 @@ diff -urN busybox.old/archival/libipkg/libipkg.h busybox.dev/archival/libipkg/li + + +#endif -diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv_pair.c ---- busybox.old/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair.c 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7310,9 +7348,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.c busybox.dev/archival/libipkg/nv +} + + -diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv_pair.h ---- busybox.old/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7346,9 +7385,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair.h busybox.dev/archival/libipkg/nv + +#endif + -diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libipkg/nv_pair_list.c ---- busybox.old/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair_list.c 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7448,9 +7488,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.c busybox.dev/archival/libip + } + return NULL; +} -diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libipkg/nv_pair_list.h ---- busybox.old/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/nv_pair_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/nv_pair_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/nv_pair_list.h 2007-06-04 13:21:36.718394624 +0200 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7512,9 +7553,10 @@ diff -urN busybox.old/archival/libipkg/nv_pair_list.h busybox.dev/archival/libip + +#endif + -diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c ---- busybox.old/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg.c 2007-01-22 13:41:10.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg.c 2007-06-04 13:21:36.720394320 +0200 @@ -0,0 +1,1747 @@ +/* pkg.c - the itsy package management system + @@ -9263,9 +9305,10 @@ diff -urN busybox.old/archival/libipkg/pkg.c busybox.dev/archival/libipkg/pkg.c + } + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipkg/pkg_depends.c ---- busybox.old/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_depends.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_depends.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_depends.c 2007-06-04 13:21:36.724393712 +0200 @@ -0,0 +1,1031 @@ +/* pkg_depends.c - the itsy package management system + @@ -10298,9 +10341,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipkg/pkg_depends.h ---- busybox.old/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_depends.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_depends.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_depends.h 2007-06-04 13:21:36.724393712 +0200 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10407,9 +10451,10 @@ diff -urN busybox.old/archival/libipkg/pkg_depends.h busybox.dev/archival/libipk +int pkg_dependence_satisfied(ipkg_conf_t *conf, depend_t *depend); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/pkg_dest.c ---- busybox.old/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest.c 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10503,9 +10548,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.c busybox.dev/archival/libipkg/p + + dest->root_dir = NULL; +} -diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/pkg_dest.h ---- busybox.old/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest.h 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10545,9 +10591,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest.h busybox.dev/archival/libipkg/p + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libipkg/pkg_dest_list.c ---- busybox.old/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.c 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10634,9 +10681,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.c busybox.dev/archival/libi +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libipkg/pkg_dest_list.h ---- busybox.old/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_dest_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_dest_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_dest_list.h 2007-06-04 13:21:36.725393560 +0200 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10688,9 +10736,10 @@ diff -urN busybox.old/archival/libipkg/pkg_dest_list.h busybox.dev/archival/libi + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipkg/pkg_extract.c ---- busybox.old/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_extract.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_extract.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_extract.c 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,224 @@ +/* pkg_extract.c - the itsy package management system + @@ -10916,9 +10965,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.c busybox.dev/archival/libipk + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipkg/pkg_extract.h ---- busybox.old/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_extract.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_extract.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_extract.h 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -10952,9 +11002,10 @@ diff -urN busybox.old/archival/libipkg/pkg_extract.h busybox.dev/archival/libipk +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h ---- busybox.old/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg.h 2007-06-04 13:21:36.726393408 +0200 @@ -0,0 +1,232 @@ +/* pkg.h - the itsy package management system + @@ -11188,9 +11239,10 @@ diff -urN busybox.old/archival/libipkg/pkg.h busybox.dev/archival/libipkg/pkg.h +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/pkg_hash.c ---- busybox.old/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_hash.c 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_hash.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_hash.c 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,616 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11808,9 +11860,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.c busybox.dev/archival/libipkg/p +} + + -diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/pkg_hash.h ---- busybox.old/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_hash.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_hash.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_hash.h 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11873,9 +11926,10 @@ diff -urN busybox.old/archival/libipkg/pkg_hash.h busybox.dev/archival/libipkg/p + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/pkg_parse.c ---- busybox.old/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_parse.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_parse.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_parse.c 2007-06-04 13:21:36.727393256 +0200 @@ -0,0 +1,366 @@ +/* pkg_parse.c - the itsy package management system + @@ -12243,9 +12297,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.c busybox.dev/archival/libipkg/ + + return 0; +} -diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/pkg_parse.h ---- busybox.old/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_parse.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_parse.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_parse.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12278,9 +12333,10 @@ diff -urN busybox.old/archival/libipkg/pkg_parse.h busybox.dev/archival/libipkg/ +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pkg_src.c ---- busybox.old/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src.c 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12325,9 +12381,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.c busybox.dev/archival/libipkg/pk +} + + -diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pkg_src.h ---- busybox.old/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12363,9 +12420,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src.h busybox.dev/archival/libipkg/pk +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libipkg/pkg_src_list.c ---- busybox.old/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src_list.c 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12442,9 +12500,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.c busybox.dev/archival/libip +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libipkg/pkg_src_list.h ---- busybox.old/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_src_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_src_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_src_list.h 2007-06-04 13:21:36.728393104 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12503,9 +12562,10 @@ diff -urN busybox.old/archival/libipkg/pkg_src_list.h busybox.dev/archival/libip + +#endif + -diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pkg_vec.c ---- busybox.old/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_vec.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_vec.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_vec.c 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,230 @@ +/* pkg_vec.c - the itsy package management system + @@ -12737,9 +12797,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.c busybox.dev/archival/libipkg/pk + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pkg_vec.h ---- busybox.old/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/pkg_vec.h 2007-01-22 13:41:06.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/pkg_vec.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/pkg_vec.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,64 @@ +/* pkg_vec.h - the itsy package management system + @@ -12805,9 +12866,10 @@ diff -urN busybox.old/archival/libipkg/pkg_vec.h busybox.dev/archival/libipkg/pk +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libipkg/sprintf_alloc.h ---- busybox.old/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/sprintf_alloc.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/sprintf_alloc.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/sprintf_alloc.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12834,9 +12896,10 @@ diff -urN busybox.old/archival/libipkg/sprintf_alloc.h busybox.dev/archival/libi +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/str_list.c ---- busybox.old/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_list.c 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -12914,9 +12977,10 @@ diff -urN busybox.old/archival/libipkg/str_list.c busybox.dev/archival/libipkg/s + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/str_list.h ---- busybox.old/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_list.h 2007-06-04 13:21:36.729392952 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -12969,9 +13033,10 @@ diff -urN busybox.old/archival/libipkg/str_list.h busybox.dev/archival/libipkg/s +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/str_util.c ---- busybox.old/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_util.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_util.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_util.c 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,73 @@ +/* str_utils.c - the itsy package management system + @@ -13046,9 +13111,10 @@ diff -urN busybox.old/archival/libipkg/str_util.c busybox.dev/archival/libipkg/s + return str ? strdup(str) : NULL; +} + -diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/str_util.h ---- busybox.old/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/str_util.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/str_util.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/str_util.h 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,28 @@ +/* str_utils.h - the itsy package management system + @@ -13078,9 +13144,10 @@ diff -urN busybox.old/archival/libipkg/str_util.h busybox.dev/archival/libipkg/s +char *str_dup_safe(const char *str); + +#endif -diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user.c ---- busybox.old/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/user.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/user.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/user.c 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,58 @@ +/* user.c - the itsy package management system + @@ -13140,9 +13207,10 @@ diff -urN busybox.old/archival/libipkg/user.c busybox.dev/archival/libipkg/user. + + return response; +} -diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user.h ---- busybox.old/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/user.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/user.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/user.h 2007-06-04 13:21:36.730392800 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13167,9 +13235,10 @@ diff -urN busybox.old/archival/libipkg/user.h busybox.dev/archival/libipkg/user. + +char *get_user_response(const char *format, ...); + -diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/void_list.c ---- busybox.old/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/void_list.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/void_list.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/void_list.c 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13365,9 +13434,10 @@ diff -urN busybox.old/archival/libipkg/void_list.c busybox.dev/archival/libipkg/ + else + return NULL; +} -diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/void_list.h ---- busybox.old/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/void_list.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/void_list.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/void_list.h 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13428,9 +13498,10 @@ diff -urN busybox.old/archival/libipkg/void_list.h busybox.dev/archival/libipkg/ +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xsystem.c ---- busybox.old/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/xsystem.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/xsystem.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/xsystem.c 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13496,9 +13567,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.c busybox.dev/archival/libipkg/xs + return -1; +} + -diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xsystem.h ---- busybox.old/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/archival/libipkg/xsystem.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libipkg/xsystem.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.4.2/archival/libipkg/xsystem.h 2007-06-04 13:21:36.731392648 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13534,9 +13606,10 @@ diff -urN busybox.old/archival/libipkg/xsystem.h busybox.dev/archival/libipkg/xs + +#endif + -diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archival/libunarchive/data_extract_all.c ---- busybox.old/archival/libunarchive/data_extract_all.c 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/libunarchive/data_extract_all.c 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libunarchive/data_extract_all.c +=================================================================== +--- busybox-1.4.2.orig/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:31.879130304 +0200 ++++ busybox-1.4.2/archival/libunarchive/data_extract_all.c 2007-06-04 13:21:36.731392648 +0200 @@ -117,3 +117,17 @@ utime(file_header->name, &t); } @@ -13555,9 +13628,10 @@ diff -urN busybox.old/archival/libunarchive/data_extract_all.c busybox.dev/archi + } +} + -diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarchive/Kbuild ---- busybox.old/archival/libunarchive/Kbuild 2007-01-19 22:23:02.000000000 +0100 -+++ busybox.dev/archival/libunarchive/Kbuild 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/archival/libunarchive/Kbuild +=================================================================== +--- busybox-1.4.2.orig/archival/libunarchive/Kbuild 2007-06-04 13:21:31.886129240 +0200 ++++ busybox-1.4.2/archival/libunarchive/Kbuild 2007-06-04 13:21:36.732392496 +0200 @@ -47,6 +47,7 @@ lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) @@ -13566,9 +13640,10 @@ diff -urN busybox.old/archival/libunarchive/Kbuild busybox.dev/archival/libunarc lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o lib-$(CONFIG_TAR) += get_header_tar.o -diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h ---- busybox.old/include/applets.h 2007-01-20 16:34:47.000000000 +0100 -+++ busybox.dev/include/applets.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/applets.h +=================================================================== +--- busybox-1.4.2.orig/include/applets.h 2007-06-04 13:21:34.786688288 +0200 ++++ busybox-1.4.2/include/applets.h 2007-06-04 13:21:36.732392496 +0200 @@ -160,6 +160,7 @@ USE_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) @@ -13577,9 +13652,10 @@ diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h USE_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_NEVER)) -diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h ---- busybox.old/include/unarchive.h 2007-01-19 22:23:10.000000000 +0100 -+++ busybox.dev/include/unarchive.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/unarchive.h +=================================================================== +--- busybox-1.4.2.orig/include/unarchive.h 2007-06-04 13:21:31.897127568 +0200 ++++ busybox-1.4.2/include/unarchive.h 2007-06-04 13:21:36.732392496 +0200 @@ -76,6 +76,7 @@ extern void data_skip(archive_handle_t *archive_handle); @@ -13588,9 +13664,10 @@ diff -urN busybox.old/include/unarchive.h busybox.dev/include/unarchive.h extern void data_extract_to_stdout(archive_handle_t *archive_handle); extern void data_extract_to_buffer(archive_handle_t *archive_handle); -diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h ---- busybox.old/include/usage.h 2007-01-19 22:23:10.000000000 +0100 -+++ busybox.dev/include/usage.h 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/include/usage.h +=================================================================== +--- busybox-1.4.2.orig/include/usage.h 2007-06-04 13:21:35.005655000 +0200 ++++ busybox-1.4.2/include/usage.h 2007-06-04 13:21:36.734392192 +0200 @@ -1133,6 +1133,82 @@ "$ ls -la /tmp/busybox*\n" \ "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" @@ -13674,9 +13751,10 @@ diff -urN busybox.old/include/usage.h busybox.dev/include/usage.h #define halt_trivial_usage \ "[-d<delay>] [-n<nosync>] [-f<force>]" #define halt_full_usage \ -diff -urN busybox.old/Makefile busybox.dev/Makefile ---- busybox.old/Makefile 2007-01-20 21:21:39.000000000 +0100 -+++ busybox.dev/Makefile 2007-01-22 13:41:03.000000000 +0100 +Index: busybox-1.4.2/Makefile +=================================================================== +--- busybox-1.4.2.orig/Makefile 2007-06-04 13:21:31.910125592 +0200 ++++ busybox-1.4.2/Makefile 2007-06-04 13:21:36.734392192 +0200 @@ -423,6 +423,7 @@ libs-y := \ |