resolve conflict

42 files changed, 365 insertions, 355 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 6e752a8da..74b9cb474 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-dri-drivers=${DRI_DRIVERS},swrast \
 			--with-demos=xdemos
 
-XAKE_FLAGS+=		HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
+XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
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 bcd582179..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
@@ -35,30 +35,34 @@ ifeq ($(ADK_NATIVE),y)
 	yes '' | \
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 endif
 
 do-build:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 endif
 
 do-install:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 ifeq ($(ADK_DEBUG),y)
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 5462ee98a..8e78e2e27 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP
 
 config BUSYBOX_LSPCI
 	bool "lspci"
-	default y
+	default n
 	depends on !ADK_PACKAGE_PCIUTILS
 	help
 	  lspci is a utility for displaying information about PCI buses in the
@@ -368,7 +368,7 @@ config BUSYBOX_LSPCI
 
 config BUSYBOX_LSUSB
 	bool "lsusb"
-	default y
+	default n
 	depends on !ADK_PACKAGE_LSUSB
 	help
 	  lsusb is a utility for displaying information about USB buses in the
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
 +}
 +