diff options
Diffstat (limited to 'package/busybox/patches')
| -rw-r--r-- | package/busybox/patches/001-ipkg.patch | 464 | ||||
| -rw-r--r-- | package/busybox/patches/016-fix-musl-warning.patch | 12 |
2 files changed, 244 insertions, 232 deletions
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 28ced4519..07d31b802 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,6 @@ -diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src ---- busybox-1.20.2.orig//archival/Config.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/Config.src 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src +--- busybox-1.21.1.orig/archival/Config.src 2013-05-12 01:30:43.000000000 +0200 ++++ busybox-1.21.1/archival/Config.src 2013-11-02 15:26:12.000000000 +0100 @@ -214,6 +214,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -14,9 +14,9 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Confi config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c ---- busybox-1.20.2.orig//archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/ipkg.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c +--- busybox-1.21.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/ipkg.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -46,9 +46,9 @@ diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuild.src ---- busybox-1.20.2.orig//archival/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/Kbuild.src 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src +--- busybox-1.21.1.orig/archival/Kbuild.src 2013-05-12 01:30:43.000000000 +0200 ++++ busybox-1.21.1/archival/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 @@ -22,6 +22,7 @@ lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o @@ -57,9 +57,9 @@ diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuil lib-$(CONFIG_UNXZ) += bbunzip.o lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/archival/libarchive/Kbuild.src ---- busybox-1.20.2.orig//archival/libarchive/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/libarchive/Kbuild.src 2013-01-31 16:44:50.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src +--- busybox-1.21.1.orig/archival/libarchive/Kbuild.src 2013-06-29 16:58:06.000000000 +0200 ++++ busybox-1.21.1/archival/libarchive/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 @@ -25,14 +25,14 @@ \ data_align.o \ @@ -77,9 +77,9 @@ diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/arc get_header_tar_bz2.o \ get_header_tar_lzma.o \ -diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/libipkg/args.c ---- busybox-1.20.2.orig//archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/args.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c +--- busybox-1.21.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -323,9 +323,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/l +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/libipkg/args.h ---- busybox-1.20.2.orig//archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/args.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h +--- busybox-1.21.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -399,9 +399,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/l +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archival/libipkg/conffile.c ---- busybox-1.20.2.orig//archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c +--- busybox-1.21.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -468,9 +468,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archiv + + return ret; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archival/libipkg/conffile.h ---- busybox-1.20.2.orig//archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h +--- busybox-1.21.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -502,9 +502,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archiv + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/archival/libipkg/conffile_list.c ---- busybox-1.20.2.orig//archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c +--- busybox-1.21.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -553,9 +553,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/a + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/archival/libipkg/conffile_list.h ---- busybox-1.20.2.orig//archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h +--- busybox-1.21.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -593,9 +593,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/a + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archival/libipkg/file_util.c ---- busybox-1.20.2.orig//archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/file_util.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c +--- busybox-1.21.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -783,9 +783,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archi + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archival/libipkg/file_util.h ---- busybox-1.20.2.orig//archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/file_util.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h +--- busybox-1.21.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -816,9 +816,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archi +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/archival/libipkg/hash_table.c ---- busybox-1.20.2.orig//archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/hash_table.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c +--- busybox-1.21.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -975,9 +975,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/arch + } +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/archival/libipkg/hash_table.h ---- busybox-1.20.2.orig//archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/hash_table.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h +--- busybox-1.21.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1023,9 +1023,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/arch +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archival/libipkg/ipkg_cmd.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,1367 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2394,9 +2394,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archiv +} + + -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archival/libipkg/ipkg_cmd.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2439,9 +2439,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archiv +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archival/libipkg/ipkg_conf.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_conf.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3154,9 +3154,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archi + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archival/libipkg/ipkg_conf.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_conf.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3265,9 +3265,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archi +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/archival/libipkg/ipkg_configure.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_configure.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3309,9 +3309,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/ + return 0; +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/archival/libipkg/ipkg_configure.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_configure.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3338,9 +3338,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/ +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/archival/libipkg/ipkg_download.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_download.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3537,9 +3537,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/a + } + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/archival/libipkg/ipkg_download.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_download.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3571,9 +3571,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/a +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/libipkg/ipkg.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -3643,9 +3643,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/l +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/archival/libipkg/ipkg_includes.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_includes.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3729,9 +3729,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/a +#include <mntent.h> + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/archival/libipkg/ipkg_install.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_install.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5715,9 +5715,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/ar +} + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/archival/libipkg/ipkg_install.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_install.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5754,9 +5754,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/ar +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/archival/libipkg/ipkg_message.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_message.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5793,9 +5793,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/ar + ipkg_cb_message(conf,level,ts); + } +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/archival/libipkg/ipkg_message.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_message.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5829,9 +5829,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/ar +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/archival/libipkg/ipkg_remove.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_remove.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6218,9 +6218,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/arc + + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/archival/libipkg/ipkg_remove.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_remove.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6255,9 +6255,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/arc + + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/archival/libipkg/ipkg_upgrade.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6338,9 +6338,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/ar + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/archival/libipkg/ipkg_upgrade.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6360,9 +6360,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/ar +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/archival/libipkg/ipkg_utils.c ---- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_utils.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c +--- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6549,9 +6549,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/arch +} + + -diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/archival/libipkg/ipkg_utils.h ---- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_utils.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h +--- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6582,9 +6582,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/arch +int line_is_blank(const char *line); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/libipkg/Kbuild ---- busybox-1.20.2.orig//archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/Kbuild 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild +--- busybox-1.21.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/Kbuild 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6646,9 +6646,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/l +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archival/libipkg/libipkg.c ---- busybox-1.20.2.orig//archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/libipkg.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c +--- busybox-1.21.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7233,9 +7233,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archiva + + return err; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archival/libipkg/libipkg.h ---- busybox-1.20.2.orig//archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/libipkg.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h +--- busybox-1.21.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7315,9 +7315,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archiva +extern void free_error_list(struct errlist **errors); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archival/libipkg/nv_pair.c ---- busybox-1.20.2.orig//archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c +--- busybox-1.21.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7359,9 +7359,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archiva +} + + -diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archival/libipkg/nv_pair.h ---- busybox-1.20.2.orig//archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h +--- busybox-1.21.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7395,9 +7395,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archiva + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/archival/libipkg/nv_pair_list.c ---- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c +--- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7497,9 +7497,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/ar + } + return NULL; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/archival/libipkg/nv_pair_list.h ---- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h +--- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7561,9 +7561,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/ar + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/libipkg/pkg.c ---- busybox-1.20.2.orig//archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c +--- busybox-1.21.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9322,9 +9322,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/li + } + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/archival/libipkg/pkg_depends.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_depends.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10358,9 +10358,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/arc + + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/archival/libipkg/pkg_depends.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_depends.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10467,9 +10467,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/arc +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archival/libipkg/pkg_dest.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10563,9 +10563,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archiv + + dest->root_dir = NULL; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archival/libipkg/pkg_dest.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10605,9 +10605,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archiv + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/archival/libipkg/pkg_dest_list.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10694,9 +10694,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/a +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/archival/libipkg/pkg_dest_list.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10748,9 +10748,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/a + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/archival/libipkg/pkg_extract.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_extract.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11007,9 +11007,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/arc + + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/archival/libipkg/pkg_extract.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_extract.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11043,9 +11043,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/arc +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/libipkg/pkg.h ---- busybox-1.20.2.orig//archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h +--- busybox-1.21.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11276,9 +11276,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/li +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archival/libipkg/pkg_hash.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_hash.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11903,9 +11903,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archiv +} + + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archival/libipkg/pkg_hash.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_hash.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11968,9 +11968,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archiv + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archival/libipkg/pkg_parse.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_parse.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12340,9 +12340,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archi + + return 0; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archival/libipkg/pkg_parse.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_parse.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12375,9 +12375,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archi +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archival/libipkg/pkg_src.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12422,9 +12422,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archiva +} + + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archival/libipkg/pkg_src.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12460,9 +12460,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archiva +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/archival/libipkg/pkg_src_list.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12539,9 +12539,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/ar +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/archival/libipkg/pkg_src_list.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12600,9 +12600,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/ar + +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archival/libipkg/pkg_vec.c ---- busybox-1.20.2.orig//archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_vec.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c +--- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12835,9 +12835,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archiva + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archival/libipkg/pkg_vec.h ---- busybox-1.20.2.orig//archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_vec.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h +--- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12901,9 +12901,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archiva +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/archival/libipkg/sprintf_alloc.h ---- busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h +--- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12930,9 +12930,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/a +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archival/libipkg/str_list.c ---- busybox-1.20.2.orig//archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c +--- busybox-1.21.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13010,9 +13010,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archiv + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archival/libipkg/str_list.h ---- busybox-1.20.2.orig//archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h +--- busybox-1.21.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13065,9 +13065,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archiv +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archival/libipkg/str_util.c ---- busybox-1.20.2.orig//archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_util.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c +--- busybox-1.21.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13138,9 +13138,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archiv + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archival/libipkg/str_util.h ---- busybox-1.20.2.orig//archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_util.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h +--- busybox-1.21.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13169,9 +13169,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archiv +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/libipkg/user.c ---- busybox-1.20.2.orig//archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/user.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c +--- busybox-1.21.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/user.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13222,9 +13222,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/l + + return response; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/libipkg/user.h ---- busybox-1.20.2.orig//archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/user.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h +--- busybox-1.21.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/user.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13249,9 +13249,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/l + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archival/libipkg/void_list.c ---- busybox-1.20.2.orig//archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/void_list.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c +--- busybox-1.21.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13447,9 +13447,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archi + else + return NULL; +} -diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archival/libipkg/void_list.h ---- busybox-1.20.2.orig//archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/void_list.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h +--- busybox-1.21.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13510,9 +13510,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archi +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archival/libipkg/xsystem.c ---- busybox-1.20.2.orig//archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/xsystem.c 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c +--- busybox-1.21.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.c 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13578,9 +13578,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archiva + return -1; +} + -diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archival/libipkg/xsystem.h ---- busybox-1.20.2.orig//archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/xsystem.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h +--- busybox-1.21.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.h 2013-11-02 15:26:12.000000000 +0100 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13616,20 +13616,20 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archiva + +#endif + -diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h ---- busybox-1.20.2.orig//include/applets.src.h 2012-07-02 16:08:25.000000000 +0200 -+++ busybox-1.20.2/include/applets.src.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h +--- busybox-1.21.1.orig/include/applets.src.h 2013-06-29 16:58:06.000000000 +0200 ++++ busybox-1.21.1/include/applets.src.h 2013-11-02 15:27:08.000000000 +0100 @@ -199,6 +199,7 @@ IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP)) +IF_IPKG(APPLET(ipkg, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_IPLINK(APPLET(iplink, BB_DIR_BIN, BB_SUID_DROP)) - IF_IPROUTE(APPLET(iproute, BB_DIR_BIN, BB_SUID_DROP)) - IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP)) -diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_archive.h ---- busybox-1.20.2.orig//include/bb_archive.h 2012-07-02 16:08:25.000000000 +0200 -+++ busybox-1.20.2/include/bb_archive.h 2013-01-31 16:49:28.000000000 +0100 + IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP)) + IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP)) + IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP)) +diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h +--- busybox-1.21.1.orig/include/bb_archive.h 2013-06-29 16:58:06.000000000 +0200 ++++ busybox-1.21.1/include/bb_archive.h 2013-11-02 15:26:12.000000000 +0100 @@ -79,7 +79,7 @@ /* Archiver specific. Can make it a union if it ever gets big */ #define PAX_NEXT_FILE 0 @@ -13648,9 +13648,9 @@ diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_ar /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.src.h ---- busybox-1.20.2.orig//include/usage.src.h 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/include/usage.src.h 2013-01-31 16:44:31.000000000 +0100 +diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h +--- busybox-1.21.1.orig/include/usage.src.h 2013-05-12 01:30:43.000000000 +0200 ++++ busybox-1.21.1/include/usage.src.h 2013-11-02 15:26:12.000000000 +0100 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13732,10 +13732,10 @@ diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage. + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + #endif -diff -Nur busybox-1.20.2.orig//Makefile busybox-1.20.2/Makefile ---- busybox-1.20.2.orig//Makefile 2012-07-02 16:20:27.000000000 +0200 -+++ busybox-1.20.2/Makefile 2013-01-31 16:44:31.000000000 +0100 -@@ -465,6 +465,7 @@ +diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile +--- busybox-1.21.1.orig/Makefile 2013-06-29 17:00:18.000000000 +0200 ++++ busybox-1.21.1/Makefile 2013-11-02 15:26:12.000000000 +0100 +@@ -466,6 +466,7 @@ libs-y := \ archival/ \ archival/libarchive/ \ diff --git a/package/busybox/patches/016-fix-musl-warning.patch b/package/busybox/patches/016-fix-musl-warning.patch new file mode 100644 index 000000000..3f05e8726 --- /dev/null +++ b/package/busybox/patches/016-fix-musl-warning.patch @@ -0,0 +1,12 @@ +diff -Nur busybox-1.21.1.orig/include/libbb.h busybox-1.21.1/include/libbb.h +--- busybox-1.21.1.orig/include/libbb.h 2013-06-29 16:58:06.000000000 +0200 ++++ busybox-1.21.1/include/libbb.h 2013-11-02 16:55:04.000000000 +0100 +@@ -37,7 +37,7 @@ + #include <libgen.h> /* dirname,basename */ + #undef basename + #define basename dont_use_basename +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <sys/socket.h> |