Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 174 insertions, 244 deletions

diff --git a/mk/vars.mk b/mk/vars.mk
index 300e41aae..39c35e52a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -57,6 +57,12 @@ TARGET_LDFLAGS:=	-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
 			-L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib
 
+ifneq ($(ADK_NATIVE),)
+TARGET_CPPFLAGS:=
+TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
+TARGET_LDFLAGS:=
+endif
+
 ifneq ($(ADK_STATIC),)
 TARGET_CFLAGS+=		-static
 TARGET_CXXFLAGS+=	-static
@@ -81,11 +87,6 @@ else
 TARGET_CFLAGS+=		-fomit-frame-pointer $(TARGET_OPTIMIZATION)
 endif
 
-ifneq ($(ADK_NATIVE),)
-TARGET_CPPFLAGS:=
-TARGET_CFLAGS:=		$(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_LDFLAGS:=
-endif
 
 # A nifty macro to make testing gcc features easier (from uClibc project)
 check_gcc=$(shell \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index dee9fd9a4..3744ceb53 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		43
+PKG_RELEASE:=		44
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile
index ff808b707..c326f87c2 100644
--- a/package/base-files/src/etc/profile
+++ b/package/base-files/src/etc/profile
@@ -1,5 +1,6 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export TERM=linux
+export EDITOR=/bin/vi
 if [[ $(id -u) = 0 ]]; then
 	export PS1='`whoami`@`hostname`:`pwd` # '
 else
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 93098145a..9d85302d0 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.18.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		f15fe752d8b7012aa5e59f83b88ccb1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 8269c0718..9b5f9a739 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,5 @@
-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
+--- busybox-1.18.1.orig/Makefile
++++ busybox-1.18.1/Makefile
 @@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
@@ -9,9 +8,8 @@ diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile
  		console-tools/ \
  		coreutils/ \
  		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
+--- busybox-1.18.1.orig/archival/Config.src
++++ busybox-1.18.1/archival/Config.src
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -25,9 +23,8 @@ diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
-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
+--- busybox-1.18.1.orig/archival/Kbuild.src
++++ busybox-1.18.1/archival/Kbuild.src
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -36,9 +33,8 @@ diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
-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
+--- /dev/null
++++ busybox-1.18.1/archival/ipkg.c
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -68,9 +64,8 @@ diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/Kbuild
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -132,9 +127,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/li
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/args.c
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -378,9 +372,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/args.h
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -454,9 +447,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile.c
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -523,9 +515,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archiva
 +
 +    return ret;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile.h
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -557,9 +548,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archiva
 +
 +#endif
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile_list.c
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -608,9 +598,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/conffile_list.h
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -648,9 +637,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/ar
 +
 +#endif
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/file_util.c
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -797,7 +785,7 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +	} context;
 +	uint8_t *hash_value = NULL;
 +	RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-+	void FAST_FUNC (*update)(const void*, size_t, void*);
++	void FAST_FUNC (*update)(void*, const void*, size_t);
 +	void FAST_FUNC (*final)(void*, void*);
 +
 +	src_fd = open_or_warn_stdin(filename);
@@ -815,12 +803,12 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +		bb_error_msg_and_die("algorithm not supported");
 +	}
 +
-+	while (0 < (count = safe_read(src_fd, in_buf, 4096))) {
-+		update(in_buf, count, &context);
++	while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
++		update(&context, in_buf, count);
 +	}
 +
 +	if (count == 0) {
-+		final(in_buf, &context);
++		final(&context, in_buf);
 +		hash_value = hash_bin_to_hex(in_buf, hash_len);
 +	}
 +
@@ -838,9 +826,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/file_util.h
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -871,9 +858,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/hash_table.c
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1030,9 +1016,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archi
 +    }
 +}
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/hash_table.h
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1078,9 +1063,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/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.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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg.h
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -1150,9 +1134,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/li
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2520,9 +2503,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archiva
 +}
 +
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2565,9 +2547,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3280,9 +3261,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3391,9 +3371,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3435,9 +3414,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/a
 +    return 0;
 +}
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3464,9 +3442,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_download.c
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3663,9 +3640,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/ar
 +     }
 +     return 0;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_download.h
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3697,9 +3673,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3783,9 +3758,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/ar
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_install.c
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5769,9 +5743,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/arc
 +}
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_install.h
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5808,9 +5781,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/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.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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_message.c
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5847,9 +5819,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_message.h
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5883,9 +5854,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/arc
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6272,9 +6242,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/arch
 +
 +    return 0;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_remove.h
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6309,9 +6278,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/arch
 +
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6392,9 +6360,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6414,9 +6381,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.c
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6603,9 +6569,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archi
 +}
 +
 +       
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/ipkg_utils.h
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6636,9 +6601,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/libipkg.c
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7223,9 +7187,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival
 +
 +	return err;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/libipkg.h
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7305,9 +7268,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair.c
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7349,9 +7311,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival
 +}
 +
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair.h
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7385,9 +7346,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival
 +
 +#endif
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.c
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7487,9 +7447,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/arc
 +     }    
 +     return NULL;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/nv_pair_list.h
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7551,9 +7510,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/arc
 +
 +#endif
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg.c
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9312,9 +9270,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/lib
 +     }
 +     return 0;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg.h
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -9545,9 +9502,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/lib
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_depends.c
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10581,9 +10537,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/arch
 +
 +     return 0;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_depends.h
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10690,9 +10645,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest.c
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10786,9 +10740,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archiva
 +
 +    dest->root_dir = NULL;
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest.h
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10828,9 +10781,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archiva
 +
 +#endif
 +
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10917,9 +10869,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-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
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10971,9 +10922,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/archival/libipkg/pkg_extract.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.c	2010-12-25 22:48:39.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_extract.c
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11230,9 +11180,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/archival/libipkg/pkg_extract.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_extract.h
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11266,9 +11215,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archival/libipkg/pkg_hash.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_hash.c
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11893,9 +11841,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archival/libipkg/pkg_hash.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_hash.h
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11958,9 +11905,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archival/libipkg/pkg_parse.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_parse.c
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12330,9 +12276,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archival/libipkg/pkg_parse.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_parse.h
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12365,9 +12310,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival/libipkg/pkg_src.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src.c
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12412,9 +12356,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival
 +}
 +
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival/libipkg/pkg_src.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src.h
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12450,9 +12393,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/archival/libipkg/pkg_src_list.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src_list.c
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12529,9 +12471,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/archival/libipkg/pkg_src_list.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_src_list.h
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12590,9 +12531,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival/libipkg/pkg_vec.c
---- busybox-1.18.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_vec.c
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12825,9 +12765,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival/libipkg/pkg_vec.h
---- busybox-1.18.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/pkg_vec.h
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12891,9 +12830,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12920,9 +12858,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archival/libipkg/str_list.c
---- busybox-1.18.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_list.c
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13000,9 +12937,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archival/libipkg/str_list.h
---- busybox-1.18.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_list.h
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13055,9 +12991,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archival/libipkg/str_util.c
---- busybox-1.18.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_util.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_util.c
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13128,9 +13063,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archival/libipkg/str_util.h
---- busybox-1.18.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/str_util.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/str_util.h
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13159,9 +13093,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/libipkg/user.c
---- busybox-1.18.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/user.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/user.c
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13212,9 +13145,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/libipkg/user.h
---- busybox-1.18.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/user.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/user.h
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13239,9 +13171,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archival/libipkg/void_list.c
---- busybox-1.18.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/void_list.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/void_list.c
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13437,9 +13368,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.1/archival/libipkg/void_list.h
---- busybox-1.18.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/void_list.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/void_list.h
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13500,9 +13430,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.1/archiv
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
-diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival/libipkg/xsystem.c
---- busybox-1.18.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/xsystem.c	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/xsystem.c
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13568,9 +13497,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival/libipkg/xsystem.h
---- busybox-1.18.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.18.1/archival/libipkg/xsystem.h	2010-12-25 22:38:07.000000000 +0100
+--- /dev/null
++++ busybox-1.18.1/archival/libipkg/xsystem.h
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13606,9 +13534,8 @@ diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.1/include/applets.src.h
---- busybox-1.18.1.orig/include/applets.src.h	2010-12-21 05:31:04.000000000 +0100
-+++ busybox-1.18.1/include/applets.src.h	2010-12-25 22:38:09.000000000 +0100
+--- busybox-1.18.1.orig/include/applets.src.h
++++ busybox-1.18.1/include/applets.src.h
 @@ -195,6 +195,7 @@
  IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
@@ -13617,9 +13544,8 @@ diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.1/include/apple
  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.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h
---- busybox-1.18.1.orig/include/archive.h	2010-12-20 01:41:27.000000000 +0100
-+++ busybox-1.18.1/include/archive.h	2010-12-25 22:51:31.000000000 +0100
+--- busybox-1.18.1.orig/include/archive.h
++++ busybox-1.18.1/include/archive.h
 @@ -95,7 +95,7 @@
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
@@ -13629,9 +13555,8 @@ diff -Nur busybox-1.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.18.1.orig/include/usage.src.h busybox-1.18.1/include/usage.src.h
---- busybox-1.18.1.orig/include/usage.src.h	2010-12-21 05:29:45.000000000 +0100
-+++ busybox-1.18.1/include/usage.src.h	2010-12-25 22:45:09.000000000 +0100
+--- busybox-1.18.1.orig/include/usage.src.h
++++ busybox-1.18.1/include/usage.src.h
 @@ -1919,6 +1919,82 @@
       "\n	-l	Limits" \
       "\n	-u	Summary" \
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 0b83d3192..2d824e1bb 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.8
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
@@ -14,7 +14,6 @@ PKG_CFLINE_CFGFS:=	select BUSYBOX_COMM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
-PKG_CFLINE_CFGFS+=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
 PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_HARDWARE_QEMU)
 
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index aa37c78b1..394830998 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
-else
+endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
 include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-else
-include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
 
 PKG_NAME:=		libthread-db
@@ -28,7 +28,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
+ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
 	${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 20f37ecac..cbd9bf858 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
 PKG_VERSION:=		5.7
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		cce05daf61a64501ef6cd8da1f727ec6
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
@@ -60,6 +60,7 @@ pre-configure:
 	);
 	${MAKE} -C ${WRKBUILD}/include
 	${MAKE} -C ${WRKBUILD}/progs
+	${CP} ${WRKBUILD}/progs/tic ${STAGING_HOST_DIR}/bin
 	find ${WRKBUILD} -name *.o -exec rm {} \;
 	find ${WRKBUILD} -name *.a -exec rm {} \;
 
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 4e031c871..2dc7ecdb9 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		sudo
 PKG_VERSION:=		1.7.4p4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		55d9906535d70a1de347cd3d3550ee87
 PKG_DESCR:=		su do
-PKG_SECTION:=		misc
+PKG_SECTION:=		admin
 PKG_URL:=		http://www.courtesan.com/sudo/
 PKG_SITES:=		http://www.courtesan.com/sudo/dist/
 
@@ -17,6 +17,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,SUDO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--without-pam \
+			--with-env-editor \
 			--with-timedir=/var/run
 
 post-install: