rework architecture / embedded systems concept

Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs

I promise, this is the last big fat commit this year ;)

8 files changed, 290 insertions, 410 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index d4b9e8c6a..46752cb72 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.17.2
-PKG_RELEASE:=		5
-PKG_MD5SUM:=		7360b7138b899ee7fc885791c740c3c3
+PKG_VERSION:=		1.18.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f15fe752d8b7012aa5e59f83b88ccb1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 6fe8f7d33..5462ee98a 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -253,6 +253,7 @@ config BUSYBOX_MKFS_REISER
 
 config BUSYBOX_MKFS_VFAT
 	bool "mkfs_vfat"
+	default y if ADK_TARGET_WITH_MMC
 	default n
 	help
 	  Utility to create FAT32 filesystems.
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 10519636b..8269c0718 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,17 +1,17 @@
-diff -Nur busybox-1.17.2.orig/Makefile busybox-1.17.2/Makefile
---- busybox-1.17.2.orig/Makefile	2010-08-23 02:51:08.000000000 +0200
-+++ busybox-1.17.2/Makefile	2010-12-01 22:25:23.000000000 +0100
-@@ -464,6 +464,7 @@
- 
+diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile
+--- busybox-1.18.1.orig/Makefile	2010-12-21 05:31:43.000000000 +0100
++++ busybox-1.18.1/Makefile	2010-12-25 22:38:55.000000000 +0100
+@@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
+ 		archival/libarchive/ \
 +		archival/libipkg/ \
- 		archival/libunarchive/ \
  		console-tools/ \
  		coreutils/ \
-diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config.src
---- busybox-1.17.2.orig/archival/Config.src	2010-08-22 10:21:38.000000000 +0200
-+++ busybox-1.17.2/archival/Config.src	2010-12-01 22:25:23.000000000 +0100
+ 		coreutils/libcoreutils/ \
+diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src
+--- busybox-1.18.1.orig/archival/Config.src	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1/archival/Config.src	2010-12-25 22:38:07.000000000 +0100
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -25,20 +25,20 @@ diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
-diff -Nur busybox-1.17.2.orig/archival/Kbuild.src busybox-1.17.2/archival/Kbuild.src
---- busybox-1.17.2.orig/archival/Kbuild.src	2010-08-23 02:44:35.000000000 +0200
-+++ busybox-1.17.2/archival/Kbuild.src	2010-12-01 22:25:23.000000000 +0100
-@@ -23,6 +23,7 @@
- lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
+diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild.src
+--- busybox-1.18.1.orig/archival/Kbuild.src	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1/archival/Kbuild.src	2010-12-25 22:38:07.000000000 +0100
+@@ -22,6 +22,7 @@
+ lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
  lib-$(CONFIG_BZIP2)		+= bzip2.o bbunzip.o
 +lib-$(CONFIG_IPKG)		+= ipkg.o
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
-diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c
---- busybox-1.17.2.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/ipkg.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c
+--- busybox-1.18.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/ipkg.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -68,9 +68,9 @@ diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/libipkg/Kbuild
---- busybox-1.17.2.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/Kbuild	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/libipkg/Kbuild
+--- busybox-1.18.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/Kbuild	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -132,9 +132,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/li
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/libipkg/args.c
---- busybox-1.17.2.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/args.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/libipkg/args.c
+--- busybox-1.18.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/args.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -378,9 +378,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/libipkg/args.h
---- busybox-1.17.2.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/args.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/libipkg/args.h
+--- busybox-1.18.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/args.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -454,9 +454,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archival/libipkg/conffile.c
---- busybox-1.17.2.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/conffile.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archival/libipkg/conffile.c
+--- busybox-1.18.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/conffile.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -523,9 +523,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archival/libipkg/conffile.h
---- busybox-1.17.2.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/conffile.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archival/libipkg/conffile.h
+--- busybox-1.18.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/conffile.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -557,9 +557,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/archival/libipkg/conffile_list.c
---- busybox-1.17.2.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/conffile_list.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/archival/libipkg/conffile_list.c
+--- busybox-1.18.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/conffile_list.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -608,9 +608,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/archival/libipkg/conffile_list.h
---- busybox-1.17.2.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/conffile_list.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/archival/libipkg/conffile_list.h
+--- busybox-1.18.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/conffile_list.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -648,9 +648,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/ar
 +
 +#endif
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archival/libipkg/file_util.c
---- busybox-1.17.2.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/file_util.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archival/libipkg/file_util.c
+--- busybox-1.18.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/file_util.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -838,9 +838,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archival/libipkg/file_util.h
---- busybox-1.17.2.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/file_util.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archival/libipkg/file_util.h
+--- busybox-1.18.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/file_util.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -871,9 +871,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archival/libipkg/hash_table.c
---- busybox-1.17.2.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/hash_table.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archival/libipkg/hash_table.c
+--- busybox-1.18.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/hash_table.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1030,9 +1030,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archi
 +    }
 +}
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archival/libipkg/hash_table.h
---- busybox-1.17.2.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/hash_table.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archival/libipkg/hash_table.h
+--- busybox-1.18.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/hash_table.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1078,9 +1078,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.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.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/libipkg/ipkg.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/libipkg/ipkg.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -1150,9 +1150,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/li
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archival/libipkg/ipkg_cmd.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c	2010-12-25 22:47:47.000000000 +0100
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -1193,7 +1193,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva
 +#include "pkg.h"
 +#include "file_util.h"
 +#include "str_util.h"
-+#include "unarchive.h"
++#include "archive.h"
 +
 +#include <fnmatch.h>
 +
@@ -2520,9 +2520,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva
 +}
 +
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archival/libipkg/ipkg_cmd.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2565,9 +2565,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archival/libipkg/ipkg_conf.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_conf.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3280,9 +3280,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archival/libipkg/ipkg_conf.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_conf.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3391,9 +3391,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/archival/libipkg/ipkg_configure.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_configure.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3435,9 +3435,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/archival/libipkg/ipkg_configure.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_configure.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3464,9 +3464,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/archival/libipkg/ipkg_download.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_download.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/archival/libipkg/ipkg_download.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_download.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3663,9 +3663,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/archival/libipkg/ipkg_download.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_download.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/archival/libipkg/ipkg_download.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_download.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3697,9 +3697,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/archival/libipkg/ipkg_includes.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_includes.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3783,9 +3783,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/ar
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/archival/libipkg/ipkg_install.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_install.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/archival/libipkg/ipkg_install.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_install.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5769,9 +5769,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/archival/libipkg/ipkg_install.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_install.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/archival/libipkg/ipkg_install.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_install.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5808,9 +5808,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.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.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/archival/libipkg/ipkg_message.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_message.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/archival/libipkg/ipkg_message.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_message.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5847,9 +5847,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/archival/libipkg/ipkg_message.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_message.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/archival/libipkg/ipkg_message.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_message.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5883,9 +5883,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.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.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/archival/libipkg/ipkg_remove.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_remove.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6272,9 +6272,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/archival/libipkg/ipkg_remove.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_remove.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6309,9 +6309,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/arch
 +
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/archival/libipkg/ipkg_upgrade.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6392,9 +6392,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/archival/libipkg/ipkg_upgrade.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6414,9 +6414,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archival/libipkg/ipkg_utils.c
---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_utils.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6603,9 +6603,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archi
 +}
 +
 +       
-diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archival/libipkg/ipkg_utils.h
---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/ipkg_utils.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6636,9 +6636,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival/libipkg/libipkg.c
---- busybox-1.17.2.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/libipkg.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival/libipkg/libipkg.c
+--- busybox-1.18.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/libipkg.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7223,9 +7223,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival/libipkg/libipkg.h
---- busybox-1.17.2.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/libipkg.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival/libipkg/libipkg.h
+--- busybox-1.18.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/libipkg.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7305,9 +7305,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival/libipkg/nv_pair.c
---- busybox-1.17.2.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/nv_pair.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival/libipkg/nv_pair.c
+--- busybox-1.18.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/nv_pair.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7349,9 +7349,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival
 +}
 +
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival/libipkg/nv_pair.h
---- busybox-1.17.2.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/nv_pair.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival/libipkg/nv_pair.h
+--- busybox-1.18.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/nv_pair.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7385,9 +7385,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival
 +
 +#endif
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/archival/libipkg/nv_pair_list.c
---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/nv_pair_list.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7487,9 +7487,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/archival/libipkg/nv_pair_list.h
---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/nv_pair_list.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7551,9 +7551,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/arc
 +
 +#endif
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/libipkg/pkg.c
---- busybox-1.17.2.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/libipkg/pkg.c
+--- busybox-1.18.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9312,9 +9312,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/libipkg/pkg.h
---- busybox-1.17.2.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/libipkg/pkg.h
+--- busybox-1.18.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -9545,9 +9545,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/lib
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/archival/libipkg/pkg_depends.c
---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_depends.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/archival/libipkg/pkg_depends.c
+--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_depends.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10581,9 +10581,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/archival/libipkg/pkg_depends.h
---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_depends.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/archival/libipkg/pkg_depends.h
+--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_depends.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10690,9 +10690,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archival/libipkg/pkg_dest.c
---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_dest.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archival/libipkg/pkg_dest.c
+--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_dest.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10786,9 +10786,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archival/libipkg/pkg_dest.h
---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_dest.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archival/libipkg/pkg_dest.h
+--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_dest.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10828,9 +10828,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/archival/libipkg/pkg_dest_list.c
---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.c	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10917,9 +10917,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/archival/libipkg/pkg_dest_list.h
---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.h	2010-12-01 22:25:23.000000000 +0100
+diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h	2010-12-25 22:38:07.000000000 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10971,9 +10971,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/ar