update patch

1 files changed, 231 insertions, 283 deletions

diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 8beac29b7..b28473e02 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,7 +1,7 @@
-diff -Nur busybox-1.15.2.orig/archival/Config.in busybox-1.15.2/archival/Config.in
---- busybox-1.15.2.orig/archival/Config.in	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/archival/Config.in	2010-03-14 20:53:41.000000000 +0100
-@@ -180,6 +180,14 @@
+diff -Nur busybox-1.16.1.orig/archival/Config.in busybox-1.16.1/archival/Config.in
+--- busybox-1.16.1.orig/archival/Config.in	2010-03-28 19:43:35.000000000 +0200
++++ busybox-1.16.1/archival/Config.in	2010-04-04 13:52:46.000000000 +0200
+@@ -187,6 +187,14 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
  
@@ -16,30 +16,9 @@ diff -Nur busybox-1.15.2.orig/archival/Config.in busybox-1.15.2/archival/Config.
  config RPM2CPIO
  	bool "rpm2cpio"
  	default n
-diff -Nur busybox-1.15.2.orig/archival/dpkg.c busybox-1.15.2/archival/dpkg.c
---- busybox-1.15.2.orig/archival/dpkg.c	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/archival/dpkg.c	2010-03-14 20:53:41.000000000 +0100
-@@ -1481,16 +1481,7 @@
- 	return ar_handle->sub_archive->buffer;
- }
- 
--static void FAST_FUNC data_extract_all_prefix(archive_handle_t *archive_handle)
--{
--	char *name_ptr = archive_handle->file_header->name;
--
--	name_ptr += strspn(name_ptr, "./");
--	if (name_ptr[0] != '\0') {
--		archive_handle->file_header->name = xasprintf("%s%s", archive_handle->buffer, name_ptr);
--		data_extract_all(archive_handle);
--	}
--}
-+/* remove data_extract_all_prefix */
- 
- static void unpack_package(deb_file_t *deb_file)
- {
-diff -Nur busybox-1.15.2.orig/archival/ipkg.c busybox-1.15.2/archival/ipkg.c
---- busybox-1.15.2.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/ipkg.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/ipkg.c busybox-1.16.1/archival/ipkg.c
+--- busybox-1.16.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/ipkg.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -69,9 +48,9 @@ diff -Nur busybox-1.15.2.orig/archival/ipkg.c busybox-1.15.2/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.15.2.orig/archival/Kbuild busybox-1.15.2/archival/Kbuild
---- busybox-1.15.2.orig/archival/Kbuild	2009-09-26 15:14:56.000000000 +0200
-+++ busybox-1.15.2/archival/Kbuild	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/Kbuild busybox-1.16.1/archival/Kbuild
+--- busybox-1.16.1.orig/archival/Kbuild	2010-03-20 03:58:07.000000000 +0100
++++ busybox-1.16.1/archival/Kbuild	2010-04-04 13:52:46.000000000 +0200
 @@ -16,6 +16,7 @@
  lib-$(CONFIG_DPKG_DEB)		+= dpkg_deb.o
  lib-$(CONFIG_GUNZIP)		+= bbunzip.o
@@ -80,9 +59,9 @@ diff -Nur busybox-1.15.2.orig/archival/Kbuild busybox-1.15.2/archival/Kbuild
  lib-$(CONFIG_LZOP)		+= lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
  lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
  lib-$(CONFIG_RPM2CPIO)		+= rpm2cpio.o
-diff -Nur busybox-1.15.2.orig/archival/libipkg/args.c busybox-1.15.2/archival/libipkg/args.c
---- busybox-1.15.2.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/args.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/args.c busybox-1.16.1/archival/libipkg/args.c
+--- busybox-1.16.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/args.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -326,9 +305,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/args.c busybox-1.15.2/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/args.h busybox-1.15.2/archival/libipkg/args.h
---- busybox-1.15.2.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/args.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/args.h busybox-1.16.1/archival/libipkg/args.h
+--- busybox-1.16.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/args.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -402,9 +381,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/args.h busybox-1.15.2/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile.c busybox-1.15.2/archival/libipkg/conffile.c
---- busybox-1.15.2.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/conffile.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.c busybox-1.16.1/archival/libipkg/conffile.c
+--- busybox-1.16.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/conffile.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -471,9 +450,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile.c busybox-1.15.2/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile.h busybox-1.15.2/archival/libipkg/conffile.h
---- busybox-1.15.2.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/conffile.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile.h busybox-1.16.1/archival/libipkg/conffile.h
+--- busybox-1.16.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/conffile.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -505,9 +484,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile.h busybox-1.15.2/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile_list.c busybox-1.15.2/archival/libipkg/conffile_list.c
---- busybox-1.15.2.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/conffile_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.c busybox-1.16.1/archival/libipkg/conffile_list.c
+--- busybox-1.16.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/conffile_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -556,9 +535,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile_list.c busybox-1.15.2/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile_list.h busybox-1.15.2/archival/libipkg/conffile_list.h
---- busybox-1.15.2.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/conffile_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/conffile_list.h busybox-1.16.1/archival/libipkg/conffile_list.h
+--- busybox-1.16.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/conffile_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -596,9 +575,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/conffile_list.h busybox-1.15.2/ar
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/file_util.c busybox-1.15.2/archival/libipkg/file_util.c
---- busybox-1.15.2.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/file_util.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.c busybox-1.16.1/archival/libipkg/file_util.c
+--- busybox-1.16.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/file_util.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -786,9 +765,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/file_util.c busybox-1.15.2/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/file_util.h busybox-1.15.2/archival/libipkg/file_util.h
---- busybox-1.15.2.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/file_util.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/file_util.h busybox-1.16.1/archival/libipkg/file_util.h
+--- busybox-1.16.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/file_util.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -819,9 +798,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/file_util.h busybox-1.15.2/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/hash_table.c busybox-1.15.2/archival/libipkg/hash_table.c
---- busybox-1.15.2.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/hash_table.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.c busybox-1.16.1/archival/libipkg/hash_table.c
+--- busybox-1.16.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/hash_table.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -978,9 +957,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/hash_table.c busybox-1.15.2/archi
 +    }
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/hash_table.h busybox-1.15.2/archival/libipkg/hash_table.h
---- busybox-1.15.2.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/hash_table.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/hash_table.h busybox-1.16.1/archival/libipkg/hash_table.h
+--- busybox-1.16.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/hash_table.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1026,9 +1005,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/hash_table.h busybox-1.15.2/archi
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.15.2/archival/libipkg/ipkg_cmd.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_cmd.c	2010-03-14 20:57:14.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.16.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_cmd.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,1386 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2416,9 +2395,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.15.2/archiva
 +}
 +
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.15.2/archival/libipkg/ipkg_cmd.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_cmd.h	2010-03-14 21:06:29.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.16.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_cmd.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2461,9 +2440,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.15.2/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_conf.c busybox-1.15.2/archival/libipkg/ipkg_conf.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_conf.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c busybox-1.16.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_conf.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3176,9 +3155,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_conf.c busybox-1.15.2/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_conf.h busybox-1.15.2/archival/libipkg/ipkg_conf.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_conf.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h busybox-1.16.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_conf.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3287,9 +3266,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_conf.h busybox-1.15.2/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_configure.c busybox-1.15.2/archival/libipkg/ipkg_configure.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_configure.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c busybox-1.16.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_configure.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3331,9 +3310,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_configure.c busybox-1.15.2/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_configure.h busybox-1.15.2/archival/libipkg/ipkg_configure.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_configure.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h busybox-1.16.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_configure.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3360,9 +3339,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_configure.h busybox-1.15.2/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_download.c busybox-1.15.2/archival/libipkg/ipkg_download.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_download.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.c busybox-1.16.1/archival/libipkg/ipkg_download.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_download.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3559,9 +3538,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_download.c busybox-1.15.2/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_download.h busybox-1.15.2/archival/libipkg/ipkg_download.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_download.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_download.h busybox-1.16.1/archival/libipkg/ipkg_download.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_download.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3593,9 +3572,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_download.h busybox-1.15.2/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg.h busybox-1.15.2/archival/libipkg/ipkg.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg.h busybox-1.16.1/archival/libipkg/ipkg.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3665,9 +3644,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg.h busybox-1.15.2/archival/li
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_includes.h busybox-1.15.2/archival/libipkg/ipkg_includes.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_includes.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h busybox-1.16.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_includes.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,79 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3748,9 +3727,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_includes.h busybox-1.15.2/ar
 +#endif
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_install.c busybox-1.15.2/archival/libipkg/ipkg_install.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_install.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.c busybox-1.16.1/archival/libipkg/ipkg_install.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_install.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5734,9 +5713,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_install.c busybox-1.15.2/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_install.h busybox-1.15.2/archival/libipkg/ipkg_install.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_install.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_install.h busybox-1.16.1/archival/libipkg/ipkg_install.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_install.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5773,9 +5752,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_install.h busybox-1.15.2/arc
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_message.c busybox-1.15.2/archival/libipkg/ipkg_message.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_message.c	2010-03-14 20:57:51.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.c busybox-1.16.1/archival/libipkg/ipkg_message.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_message.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5812,9 +5791,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_message.c busybox-1.15.2/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_message.h busybox-1.15.2/archival/libipkg/ipkg_message.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_message.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_message.h busybox-1.16.1/archival/libipkg/ipkg_message.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_message.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5848,9 +5827,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_message.h busybox-1.15.2/arc
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_remove.c busybox-1.15.2/archival/libipkg/ipkg_remove.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_remove.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c busybox-1.16.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_remove.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6237,9 +6216,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_remove.c busybox-1.15.2/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_remove.h busybox-1.15.2/archival/libipkg/ipkg_remove.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_remove.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h busybox-1.16.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_remove.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6274,9 +6253,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_remove.h busybox-1.15.2/arch
 +
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.15.2/archival/libipkg/ipkg_upgrade.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_upgrade.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.16.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6357,9 +6336,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.15.2/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.15.2/archival/libipkg/ipkg_upgrade.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_upgrade.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.16.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_upgrade.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6379,9 +6358,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.15.2/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_utils.c busybox-1.15.2/archival/libipkg/ipkg_utils.c
---- busybox-1.15.2.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_utils.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c busybox-1.16.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_utils.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6568,9 +6547,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_utils.c busybox-1.15.2/archi
 +}
 +
 +       
-diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_utils.h busybox-1.15.2/archival/libipkg/ipkg_utils.h
---- busybox-1.15.2.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/ipkg_utils.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h busybox-1.16.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.16.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/ipkg_utils.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6601,9 +6580,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/ipkg_utils.h busybox-1.15.2/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/Kbuild busybox-1.15.2/archival/libipkg/Kbuild
---- busybox-1.15.2.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/Kbuild	2010-03-14 21:01:18.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/Kbuild busybox-1.16.1/archival/libipkg/Kbuild
+--- busybox-1.16.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/Kbuild	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6665,9 +6644,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/Kbuild busybox-1.15.2/archival/li
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.15.2.orig/archival/libipkg/libipkg.c busybox-1.15.2/archival/libipkg/libipkg.c
---- busybox-1.15.2.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/libipkg.c	2010-03-14 20:59:05.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.c busybox-1.16.1/archival/libipkg/libipkg.c
+--- busybox-1.16.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/libipkg.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,525 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7194,9 +7173,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/libipkg.c busybox-1.15.2/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/libipkg.h busybox-1.15.2/archival/libipkg/libipkg.h
---- busybox-1.15.2.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/libipkg.h	2010-03-14 21:00:54.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/libipkg.h busybox-1.16.1/archival/libipkg/libipkg.h
+--- busybox-1.16.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/libipkg.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7276,9 +7255,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/libipkg.h busybox-1.15.2/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair.c busybox-1.15.2/archival/libipkg/nv_pair.c
---- busybox-1.15.2.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/nv_pair.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.c busybox-1.16.1/archival/libipkg/nv_pair.c
+--- busybox-1.16.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/nv_pair.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7320,9 +7299,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair.c busybox-1.15.2/archival
 +}
 +
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair.h busybox-1.15.2/archival/libipkg/nv_pair.h
---- busybox-1.15.2.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/nv_pair.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair.h busybox-1.16.1/archival/libipkg/nv_pair.h
+--- busybox-1.16.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/nv_pair.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7356,9 +7335,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair.h busybox-1.15.2/archival
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair_list.c busybox-1.15.2/archival/libipkg/nv_pair_list.c
---- busybox-1.15.2.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/nv_pair_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c busybox-1.16.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/nv_pair_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7458,9 +7437,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair_list.c busybox-1.15.2/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair_list.h busybox-1.15.2/archival/libipkg/nv_pair_list.h
---- busybox-1.15.2.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/nv_pair_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h busybox-1.16.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.16.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/nv_pair_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7522,9 +7501,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/nv_pair_list.h busybox-1.15.2/arc
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg.c busybox-1.15.2/archival/libipkg/pkg.c
---- busybox-1.15.2.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.c busybox-1.16.1/archival/libipkg/pkg.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9283,9 +9262,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg.c busybox-1.15.2/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_depends.c busybox-1.15.2/archival/libipkg/pkg_depends.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_depends.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.c busybox-1.16.1/archival/libipkg/pkg_depends.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_depends.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10319,9 +10298,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_depends.c busybox-1.15.2/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_depends.h busybox-1.15.2/archival/libipkg/pkg_depends.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_depends.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_depends.h busybox-1.16.1/archival/libipkg/pkg_depends.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_depends.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10428,9 +10407,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_depends.h busybox-1.15.2/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest.c busybox-1.15.2/archival/libipkg/pkg_dest.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_dest.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.c busybox-1.16.1/archival/libipkg/pkg_dest.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_dest.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10524,9 +10503,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest.c busybox-1.15.2/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest.h busybox-1.15.2/archival/libipkg/pkg_dest.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_dest.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest.h busybox-1.16.1/archival/libipkg/pkg_dest.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_dest.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10566,9 +10545,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest.h busybox-1.15.2/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.15.2/archival/libipkg/pkg_dest_list.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_dest_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.16.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_dest_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10655,9 +10634,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.15.2/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.15.2/archival/libipkg/pkg_dest_list.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_dest_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.16.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_dest_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10709,9 +10688,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.15.2/ar
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_extract.c busybox-1.15.2/archival/libipkg/pkg_extract.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_extract.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.c busybox-1.16.1/archival/libipkg/pkg_extract.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_extract.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,225 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10938,9 +10917,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_extract.c busybox-1.15.2/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_extract.h busybox-1.15.2/archival/libipkg/pkg_extract.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_extract.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_extract.h busybox-1.16.1/archival/libipkg/pkg_extract.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_extract.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10974,9 +10953,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_extract.h busybox-1.15.2/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg.h busybox-1.15.2/archival/libipkg/pkg.h
---- busybox-1.15.2.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg.h busybox-1.16.1/archival/libipkg/pkg.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11207,9 +11186,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg.h busybox-1.15.2/archival/lib
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_hash.c busybox-1.15.2/archival/libipkg/pkg_hash.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_hash.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.c busybox-1.16.1/archival/libipkg/pkg_hash.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_hash.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11834,9 +11813,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_hash.c busybox-1.15.2/archiva
 +}
 +
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_hash.h busybox-1.15.2/archival/libipkg/pkg_hash.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_hash.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_hash.h busybox-1.16.1/archival/libipkg/pkg_hash.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_hash.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11899,9 +11878,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_hash.h busybox-1.15.2/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_parse.c busybox-1.15.2/archival/libipkg/pkg_parse.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_parse.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.c busybox-1.16.1/archival/libipkg/pkg_parse.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_parse.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12271,9 +12250,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_parse.c busybox-1.15.2/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_parse.h busybox-1.15.2/archival/libipkg/pkg_parse.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_parse.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_parse.h busybox-1.16.1/archival/libipkg/pkg_parse.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_parse.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12306,9 +12285,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_parse.h busybox-1.15.2/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src.c busybox-1.15.2/archival/libipkg/pkg_src.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_src.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.c busybox-1.16.1/archival/libipkg/pkg_src.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_src.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12353,9 +12332,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src.c busybox-1.15.2/archival
 +}
 +
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src.h busybox-1.15.2/archival/libipkg/pkg_src.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_src.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src.h busybox-1.16.1/archival/libipkg/pkg_src.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_src.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12391,9 +12370,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src.h busybox-1.15.2/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src_list.c busybox-1.15.2/archival/libipkg/pkg_src_list.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_src_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c busybox-1.16.1/archival/libipkg/pkg_src_list.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_src_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12470,9 +12449,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src_list.c busybox-1.15.2/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src_list.h busybox-1.15.2/archival/libipkg/pkg_src_list.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_src_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h busybox-1.16.1/archival/libipkg/pkg_src_list.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_src_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12531,9 +12510,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_src_list.h busybox-1.15.2/arc
 +
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_vec.c busybox-1.15.2/archival/libipkg/pkg_vec.c
---- busybox-1.15.2.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_vec.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.c busybox-1.16.1/archival/libipkg/pkg_vec.c
+--- busybox-1.16.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_vec.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12766,9 +12745,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_vec.c busybox-1.15.2/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_vec.h busybox-1.15.2/archival/libipkg/pkg_vec.h
---- busybox-1.15.2.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/pkg_vec.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/pkg_vec.h busybox-1.16.1/archival/libipkg/pkg_vec.h
+--- busybox-1.16.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/pkg_vec.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12832,9 +12811,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/pkg_vec.h busybox-1.15.2/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.15.2/archival/libipkg/sprintf_alloc.h
---- busybox-1.15.2.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/sprintf_alloc.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.16.1/archival/libipkg/sprintf_alloc.h
+--- busybox-1.16.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/sprintf_alloc.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12861,9 +12840,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.15.2/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/str_list.c busybox-1.15.2/archival/libipkg/str_list.c
---- busybox-1.15.2.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/str_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.c busybox-1.16.1/archival/libipkg/str_list.c
+--- busybox-1.16.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/str_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12941,9 +12920,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/str_list.c busybox-1.15.2/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/str_list.h busybox-1.15.2/archival/libipkg/str_list.h
---- busybox-1.15.2.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/str_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/str_list.h busybox-1.16.1/archival/libipkg/str_list.h
+--- busybox-1.16.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/str_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -12996,9 +12975,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/str_list.h busybox-1.15.2/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/str_util.c busybox-1.15.2/archival/libipkg/str_util.c
---- busybox-1.15.2.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/str_util.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.c busybox-1.16.1/archival/libipkg/str_util.c
+--- busybox-1.16.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/str_util.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13069,9 +13048,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/str_util.c busybox-1.15.2/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/str_util.h busybox-1.15.2/archival/libipkg/str_util.h
---- busybox-1.15.2.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/str_util.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/str_util.h busybox-1.16.1/archival/libipkg/str_util.h
+--- busybox-1.16.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/str_util.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13100,9 +13079,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/str_util.h busybox-1.15.2/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/user.c busybox-1.15.2/archival/libipkg/user.c
---- busybox-1.15.2.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/user.c	2010-03-14 20:59:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/user.c busybox-1.16.1/archival/libipkg/user.c
+--- busybox-1.16.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/user.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13153,9 +13132,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/user.c busybox-1.15.2/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/user.h busybox-1.15.2/archival/libipkg/user.h
---- busybox-1.15.2.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/user.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/user.h busybox-1.16.1/archival/libipkg/user.h
+--- busybox-1.16.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/user.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13180,9 +13159,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/user.h busybox-1.15.2/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.15.2.orig/archival/libipkg/void_list.c busybox-1.15.2/archival/libipkg/void_list.c
---- busybox-1.15.2.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/void_list.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.c busybox-1.16.1/archival/libipkg/void_list.c
+--- busybox-1.16.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/void_list.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13378,9 +13357,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/void_list.c busybox-1.15.2/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.15.2.orig/archival/libipkg/void_list.h busybox-1.15.2/archival/libipkg/void_list.h
---- busybox-1.15.2.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/void_list.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/void_list.h busybox-1.16.1/archival/libipkg/void_list.h
+--- busybox-1.16.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/void_list.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13441,9 +13420,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/void_list.h busybox-1.15.2/archiv
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
-diff -Nur busybox-1.15.2.orig/archival/libipkg/xsystem.c busybox-1.15.2/archival/libipkg/xsystem.c
---- busybox-1.15.2.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/xsystem.c	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.c busybox-1.16.1/archival/libipkg/xsystem.c
+--- busybox-1.16.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/xsystem.c	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13509,9 +13488,9 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/xsystem.c busybox-1.15.2/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.15.2.orig/archival/libipkg/xsystem.h busybox-1.15.2/archival/libipkg/xsystem.h
---- busybox-1.15.2.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.15.2/archival/libipkg/xsystem.h	2010-03-14 20:53:41.000000000 +0100
+diff -Nur busybox-1.16.1.orig/archival/libipkg/xsystem.h busybox-1.16.1/archival/libipkg/xsystem.h
+--- busybox-1.16.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.1/archival/libipkg/xsystem.h	2010-04-04 13:52:46.000000000 +0200
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13547,30 +13526,10 @@ diff -Nur busybox-1.15.2.orig/archival/libipkg/xsystem.h busybox-1.15.2/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.15.2.orig/archival/libunarchive/data_extract_all.c busybox-1.15.2/archival/libunarchive/data_extract_all.c
---- busybox-1.15.2.orig/archival/libunarchive/data_extract_all.c	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/archival/libunarchive/data_extract_all.c	2010-03-14 20:53:41.000000000 +0100
-@@ -147,3 +147,16 @@
- 		}
- 	}
- }
-+
-+extern void FAST_FUNC data_extract_all_prefix(archive_handle_t *archive_handle)
-+{
-+	char *name_ptr = archive_handle->file_header->name;
-+
-+	name_ptr += strspn(name_ptr, "./");
-+	if (name_ptr[0] != '\0') {
-+		archive_handle->file_header->name = xmalloc(strlen(archive_handle->buffer) + 1 + strlen(name_ptr) + 1);
-+		strcpy(archive_handle->file_header->name, archive_handle->buffer);
-+		strcat(archive_handle->file_header->name, name_ptr);
-+		data_extract_all(archive_handle);
-+	}
-+}
-diff -Nur busybox-1.15.2.orig/archival/libunarchive/Kbuild busybox-1.15.2/archival/libunarchive/Kbuild
---- busybox-1.15.2.orig/archival/libunarchive/Kbuild	2009-09-26 15:14:57.000000000 +0200
-+++ busybox-1.15.2/archival/libunarchive/Kbuild	2010-03-14 20:53:41.000000000 +0100
-@@ -41,6 +41,7 @@
+diff -Nur busybox-1.16.1.orig/archival/libunarchive/Kbuild busybox-1.16.1/archival/libunarchive/Kbuild
+--- busybox-1.16.1.orig/archival/libunarchive/Kbuild	2010-03-20 03:58:07.000000000 +0100
++++ busybox-1.16.1/archival/libunarchive/Kbuild	2010-04-04 13:52:46.000000000 +0200
+@@ -40,6 +40,7 @@
  lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
  lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
  lib-$(CONFIG_GUNZIP)                    += decompress_unzip.o
@@ -13578,10 +13537,10 @@ diff -Nur busybox-1.15.2.orig/archival/libunarchive/Kbuild busybox-1.15.2/archiv
  lib-$(CONFIG_RPM2CPIO)                  += decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o get_header_cpio.o
  lib-$(CONFIG_TAR)                       += get_header_tar.o
-diff -Nur busybox-1.15.2.orig/include/applets.h busybox-1.15.2/include/applets.h
---- busybox-1.15.2.orig/include/applets.h	2009-09-26 15:14:57.000000000 +0200
-+++ busybox-1.15.2/include/applets.h	2010-03-14 20:53:41.000000000 +0100
-@@ -213,6 +213,7 @@
+diff -Nur busybox-1.16.1.orig/include/applets.h busybox-1.16.1/include/applets.h
+--- busybox-1.16.1.orig/include/applets.h	2010-03-28 19:43:35.000000000 +0200
++++ busybox-1.16.1/include/applets.h	2010-04-04 13:52:46.000000000 +0200
+@@ -214,6 +214,7 @@
  IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
  IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13589,21 +13548,10 @@ diff -Nur busybox-1.15.2.orig/include/applets.h busybox-1.15.2/include/applets.h
  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.15.2.orig/include/unarchive.h busybox-1.15.2/include/unarchive.h
---- busybox-1.15.2.orig/include/unarchive.h	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/include/unarchive.h	2010-03-14 20:53:41.000000000 +0100
-@@ -93,6 +93,7 @@
- 
- extern void data_skip(archive_handle_t *archive_handle) FAST_FUNC;
- extern void data_extract_all(archive_handle_t *archive_handle) FAST_FUNC;
-+extern void data_extract_all_prefix(archive_handle_t *archive_handle) FAST_FUNC;
- extern void data_extract_to_stdout(archive_handle_t *archive_handle) FAST_FUNC;
- extern void data_extract_to_buffer(archive_handle_t *archive_handle) FAST_FUNC;
- 
-diff -Nur busybox-1.15.2.orig/include/usage.h busybox-1.15.2/include/usage.h
---- busybox-1.15.2.orig/include/usage.h	2009-10-08 02:59:09.000000000 +0200
-+++ busybox-1.15.2/include/usage.h	2010-03-14 20:53:41.000000000 +0100
-@@ -1557,6 +1557,82 @@
+diff -Nur busybox-1.16.1.orig/include/usage.h busybox-1.16.1/include/usage.h
+--- busybox-1.16.1.orig/include/usage.h	2010-03-28 19:44:04.000000000 +0200
++++ busybox-1.16.1/include/usage.h	2010-04-04 13:52:46.000000000 +0200
+@@ -1592,6 +1592,82 @@
         "$ ls -la /tmp/busybox*\n" \
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
  
@@ -13684,12 +13632,12 @@ diff -Nur busybox-1.15.2.orig/include/usage.h busybox-1.15.2/include/usage.h
 +	"\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
 +
  #define halt_trivial_usage \
-        "[-d delay] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
+        "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
  #define halt_full_usage "\n\n" \
-diff -Nur busybox-1.15.2.orig/Makefile busybox-1.15.2/Makefile
---- busybox-1.15.2.orig/Makefile	2009-10-08 03:06:38.000000000 +0200
-+++ busybox-1.15.2/Makefile	2010-03-14 20:53:41.000000000 +0100
-@@ -445,6 +445,7 @@
+diff -Nur busybox-1.16.1.orig/Makefile busybox-1.16.1/Makefile
+--- busybox-1.16.1.orig/Makefile	2010-03-28 19:44:09.000000000 +0200
++++ busybox-1.16.1/Makefile	2010-04-04 13:52:46.000000000 +0200
+@@ -454,6 +454,7 @@
  
  libs-y		:= \
  		archival/ \