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

35 files changed, 506 insertions, 177 deletions

diff --git a/Config.in b/Config.in
index de55e84c3..8103d27a3 100644
--- a/Config.in
+++ b/Config.in
@@ -39,9 +39,8 @@ config ADK_DEVELSYSTEM
 	select BUSYBOX_UNZIP
 	select BUSYBOX_TAC
 	select BUSYBOX_TEE
-	select BUSYBOX_WHOAMI
-	select ADK_PACKAGE_AUTOCONF
-	select ADK_PACKAGE_AUTOMAKE
+	select BUSYBOX_WGET
+	select BUSYBOX_YES
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_BZIP2
@@ -57,7 +56,6 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBNCURSES_DEV
-	select ADK_PACKAGE_LIBTOOL
 	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKSH
@@ -66,7 +64,6 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_MICROPERL
 	select ADK_PACKAGE_TAR
 	select ADK_PACKAGE_TSORT
-	select ADK_PACKAGE_WGET
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_ZLIB_DEV
 	select ADK_PACKAGE_XZ
diff --git a/mk/modules.mk b/mk/modules.mk
index d7383eef2..c7c81c7aa 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -777,6 +777,10 @@ $(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\
     $(MODULES_DIR)/kernel/crypto/chainiv \
 ,07))
 
+$(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\
+    $(MODULES_DIR)/kernel/crypto/authenc \
+,11))
+
 $(eval $(call KMOD_template,CRYPTO_HMAC,crypto-hmac,\
     $(MODULES_DIR)/kernel/crypto/hmac \
 ,11))
@@ -813,6 +817,18 @@ $(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tgr192,\
     $(MODULES_DIR)/kernel/crypto/tgr192 \
 ,11))
 
+$(eval $(call KMOD_template,CRYPTO_SEQIV,crypto-seqiv,\
+    $(MODULES_DIR)/kernel/crypto/seqiv \
+,5))
+
+$(eval $(call KMOD_template,CRYPTO_CTR,crypto-ctr,\
+    $(MODULES_DIR)/kernel/crypto/ctr \
+,10))
+
+$(eval $(call KMOD_template,CRYPTO_CCM,crypto-ccm,\
+    $(MODULES_DIR)/kernel/crypto/ccm \
+,10))
+
 $(eval $(call KMOD_template,CRYPTO_ECB,crypto-ecb,\
     $(MODULES_DIR)/kernel/crypto/ecb \
 ,10))
@@ -884,6 +900,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
+    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
 
@@ -1066,6 +1083,7 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
 
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
+	$(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
 ,65))
 
diff --git a/mk/vars.mk b/mk/vars.mk
index f26e07b6a..78b37fbbe 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -127,6 +127,6 @@ QUIET:=
 else
 QUIET:=			--quiet
 endif
-FETCH_CMD?=		wget -t1 --timeout=30 $(QUIET)
+FETCH_CMD?=		wget --tries=1 --timeout=30 $(QUIET)
 
 include $(TOPDIR)/mk/mirrors.mk
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8013ee5aa..e1668520c 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.22
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		f7180316188552ee1e6759a03f1fe98d
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		multimedia
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index bd4ff3be2..0c381ff14 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf amixer
-add_rcconf amixer_volume amixer_volume "75%"
-add_rcconf amixer_mixer amixer_mixer "Master"
+add_rcconf amixer_volume amixer_volume "80%"
+add_rcconf amixer_mixer amixer_mixer "Master PCM"
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index 7f5f37177..f5c21b8c3 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -10,11 +10,15 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	amixer set $amixer_mixer on
-	amixer set $amixer_mixer $amixer_volume
+	for mixer in $amixer_mixer; do
+		amixer set $mixer on
+		amixer set $mixer $amixer_volume
+	done
 	;;
 stop)
-	amixer set $amixer_mixer off
+	for mixer in $amixer_mixer; do
+		amixer set $mixer off
+	done
 	;;
 restart)
 	sh $0 stop
diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual
index d750ff3ef..a3180f4dc 100644
--- a/package/base-files/Config.in.manual
+++ b/package/base-files/Config.in.manual
@@ -1,5 +1,19 @@
+config ADK_COMPILE_BASE_FILES
+	tristate
+	depends on ADK_PACKAGE_BASE_FILES
+	default n
+
+config ADK_PACKAGE_BASE_FILES
+	prompt "base-files............. basic filesystem structure and scripts"
+	tristate
+	default y if !ADK_TOOLCHAIN_ONLY
+	select ADK_COMPILE_BASE_FILES
+	depends on !ADK_TOOLCHAIN_ONLY
+	help
+	  basic filesystem structure and scripts
+
 config ADK_PACKAGE_CONFIG_IN_ETC
-	prompt ".config in /etc.................. include buildsystem configuration in image"
+	prompt ".config in /etc...... include buildsystem configuration in image"
 	bool
 	depends on ADK_PACKAGE_BASE_FILES
 	default y if !ADK_TOOLCHAIN_ONLY
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 37f8cbc6c..db1162946 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:=		22
+PKG_RELEASE:=		23
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
-CFLINE_BASE_FILES:=	depends on !ADK_TOOLCHAIN_ONLY
-
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
@@ -77,6 +74,7 @@ endif
 	    echo $(ADK_TARGET) > $(IDIR_BASE_FILES)/etc/adktarget
 ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
+	chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz
 endif
 
 rebuild:
diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile
index 0d8a4f240..78cf2fe37 100644
--- a/package/base-files/src/etc/profile
+++ b/package/base-files/src/etc/profile
@@ -1,9 +1,9 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export TERM=vt220
 if [[ $(id -u) = 0 ]]; then
-	export PS1='\u@\h:\w\# '
+	export PS1='`whoami`@`hostname`:`pwd` # '
 else
-	export PS1='\u@\h:\w\$ '
+	export PS1='`whoami`@`hostname`:`pwd` $ '
 fi
 cat /etc/banner 2>&-
 [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 3478eaab5..2aaf7ee9f 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -119,7 +119,7 @@ config BUSYBOX_LOCALE_SUPPORT
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config BUSYBOX_FEATURE_ASSUME_UNICODE
+config BUSYBOX_UNICODE_SUPPORT
 	bool "Support Unicode"
 	default n
 	help
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 104fb861e..4bfba12c3 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -63,6 +63,13 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 	  It supports the GNU ar long filename method which moves multiple long
 	  filenames into a the data section of a new ar entry.
 
+config BUSYBOX_FEATURE_AR_CREATE
+	bool "Support archive creation"
+	default n
+	depends on BUSYBOX_AR
+	help
+	  This enables archive creation (-c and -r) with busybox ar.
+
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
 	depends on !ADK_PACKAGE_BZIP2
@@ -93,8 +100,8 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	default n
 	depends on !ADK_PACKAGE_CPIO
+	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
 	  extract contents from archives.
@@ -193,10 +200,8 @@ config BUSYBOX_LZOP_COMPR_HIGH
 
 config BUSYBOX_IPKG
 	bool "ipkg"
+	default y if ADK_TARGET_PACKAGE_IPKG
 	default n
-	select BUSYBOX_MD5SUM
-	depends on BUSYBOX_WGET || ADK_PACKAGE_WGET
-	depends on ADK_TARGET_PACKAGE_IPKG
 	help
 	  ipkg is the itsy package management system.
 
@@ -251,7 +256,7 @@ config BUSYBOX_FEATURE_TAR_FROM
 
 config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	bool "Support for old tar header format"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created in
@@ -260,7 +265,7 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 
 config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created by some old
@@ -311,6 +316,7 @@ config BUSYBOX_UNCOMPRESS
 
 config BUSYBOX_UNLZMA
 	bool "unlzma"
+	depends on !ADK_PACKAGE_XZ
 	default n
 	help
 	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -332,6 +338,29 @@ config BUSYBOX_FEATURE_LZMA_FAST
 	  This option reduces decompression time by about 25% at the cost of
 	  a 1K bigger binary.
 
+config BUSYBOX_LZMA
+	bool "Provide lzma alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNLZMA
+	help
+	  Enable this option if you want commands like "lzma -d" to work.
+	  IOW: you'll get lzma applet, but it will always require -d option.
+
+config BUSYBOX_UNXZ
+	bool "unxz"
+	depends on !ADK_PACKAGE_XZ
+	default n
+	help
+	  unxz is a unlzma successor.
+
+config BUSYBOX_XZ
+	bool "Provide xz alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNXZ
+	help
+	  Enable this option if you want commands like "xz -d" to work.
+	  IOW: you'll get xz applet, but it will always require -d option.
+
 config BUSYBOX_UNZIP
 	bool "unzip"
 	default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 015c2de5c..85d4342e5 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -823,7 +823,7 @@ config BUSYBOX_WHO
 
 config BUSYBOX_WHOAMI
 	bool "whoami"
-	default n
+	default y
 	help
 	  whoami is used to print the username of the current
 	  user id (same as id -un).
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index d755490c7..9049edd92 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -952,8 +952,8 @@ config BUSYBOX_VCONFIG
 
 config BUSYBOX_WGET
 	bool "wget"
-	default y
 	depends on !ADK_PACKAGE_WGET
+	default y
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
 	  HTTPS, and FTP servers.
@@ -961,21 +961,21 @@ config BUSYBOX_WGET
 config BUSYBOX_FEATURE_WGET_STATUSBAR
 	bool "Enable a nifty process meter (+2k)"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Enable the transfer progress bar for wget transfers.
 
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Support authenticated HTTP transfers.
 
 config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
-	default n
-	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS && !ADK_PACKAGE_WGET
+	default y
+	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
 	help
 	  Support long options for the wget applet.
 
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 80f3564db..507fd5d19 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,15 +1,13 @@
 diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config.src
 --- busybox-1.17.0.orig/archival/Config.src	2010-06-25 01:32:35.000000000 +0200
-+++ busybox-1.17.0/archival/Config.src	2010-07-08 12:04:28.571001869 +0200
-@@ -202,6 +202,14 @@
++++ busybox-1.17.0/archival/Config.src	2010-07-16 00:06:51.575859707 +0200
+@@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
  
 +config IPKG
 +	bool "ipkg"
 +	default n
-+	select MD5SUM
-+	select WGET
 +	help
 +	  ipkg is the itsy package management system.
 +
@@ -18,7 +16,7 @@ diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config
  	default y
 diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
 --- busybox-1.17.0.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/ipkg.c	2010-07-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/ipkg.c	2010-07-15 21:53:14.569608030 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -50,7 +48,7 @@ diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
 +}
 diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild.src
 --- busybox-1.17.0.orig/archival/Kbuild.src	2010-06-24 04:40:43.000000000 +0200
-+++ busybox-1.17.0/archival/Kbuild.src	2010-07-08 12:02:53.135001644 +0200
++++ busybox-1.17.0/archival/Kbuild.src	2010-07-15 21:53:14.636101678 +0200
 @@ -23,6 +23,7 @@
  lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -61,7 +59,7 @@ diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
 diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/libipkg/args.c
 --- busybox-1.17.0.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/args.c	2010-07-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/args.c	2010-07-15 21:53:14.717767584 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -307,7 +305,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/li
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/libipkg/args.h
 --- busybox-1.17.0.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/args.h	2010-07-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/args.h	2010-07-15 21:53:14.778358426 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -383,7 +381,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/li
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archival/libipkg/conffile.c
 --- busybox-1.17.0.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile.c	2010-07-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/conffile.c	2010-07-15 21:53:14.827854501 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -452,7 +450,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archiva
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archival/libipkg/conffile.h
 --- busybox-1.17.0.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile.h	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile.h	2010-07-15 21:53:14.868358189 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -486,7 +484,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archiva
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/archival/libipkg/conffile_list.c
 --- busybox-1.17.0.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile_list.c	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile_list.c	2010-07-15 21:53:14.908357825 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -537,7 +535,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/ar
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/archival/libipkg/conffile_list.h
 --- busybox-1.17.0.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile_list.h	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile_list.h	2010-07-15 21:53:14.967045150 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -577,7 +575,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/ar
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archival/libipkg/file_util.c
 --- busybox-1.17.0.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/file_util.c	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/file_util.c	2010-07-15 21:53:15.086069590 +0200
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -767,7 +765,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archiv
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archival/libipkg/file_util.h
 --- busybox-1.17.0.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/file_util.h	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/file_util.h	2010-07-15 21:53:15.795859120 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -800,7 +798,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archiv
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archival/libipkg/hash_table.c
 --- busybox-1.17.0.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/hash_table.c	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/hash_table.c	2010-07-15 21:53:15.845858632 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -959,7 +957,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archi
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archival/libipkg/hash_table.h
 --- busybox-1.17.0.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/hash_table.h	2010-07-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/hash_table.h	2010-07-15 21:53:15.905858755 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1007,7 +1005,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archi
 +#endif /* _HASH_TABLE_H_ */
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archival/libipkg/ipkg_cmd.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c	2010-07-08 12:01:56.206999641 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c	2010-07-15 21:53:15.965858850 +0200
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2377,7 +2375,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archiva
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archival/libipkg/ipkg_cmd.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h	2010-07-08 12:01:56.206999641 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h	2010-07-15 21:53:16.045859465 +0200
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2422,7 +2420,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archiva
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archival/libipkg/ipkg_conf.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_conf.c	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.c	2010-07-15 21:53:16.105858435 +0200
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3137,7 +3135,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archiv
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archival/libipkg/ipkg_conf.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_conf.h	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.h	2010-07-15 21:53:16.175858692 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3248,7 +3246,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archiv
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/archival/libipkg/ipkg_configure.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_configure.c	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.c	2010-07-15 21:53:16.225858869 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3292,7 +3290,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/a
 +
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/archival/libipkg/ipkg_configure.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_configure.h	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.h	2010-07-15 21:53:16.275858348 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3321,7 +3319,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/a
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/archival/libipkg/ipkg_download.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_download.c	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_download.c	2010-07-15 21:53:16.345858594 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3520,7 +3518,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/ar
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/archival/libipkg/ipkg_download.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_download.h	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_download.h	2010-07-15 21:53:16.406244872 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3554,7 +3552,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/ar
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/libipkg/ipkg.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg.h	2010-07-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg.h	2010-07-15 21:53:16.506386988 +0200
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3626,7 +3624,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/li
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/archival/libipkg/ipkg_includes.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_includes.h	2010-07-08 12:01:56.214999822 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_includes.h	2010-07-15 21:53:16.575858691 +0200
 @@ -0,0 +1,81 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3711,7 +3709,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/ar
 +#endif /* IPKG_INCLUDES_H */
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/archival/libipkg/ipkg_install.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_install.c	2010-07-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_install.c	2010-07-15 21:53:16.645858623 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5697,7 +5695,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/arc
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/archival/libipkg/ipkg_install.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_install.h	2010-07-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_install.h	2010-07-15 21:53:16.705858734 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5736,7 +5734,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/arc
 +#endif
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/archival/libipkg/ipkg_message.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_message.c	2010-07-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_message.c	2010-07-15 21:53:16.765858774 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5775,7 +5773,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/arc
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/archival/libipkg/ipkg_message.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_message.h	2010-07-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_message.h	2010-07-15 21:53:16.815858747 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5811,7 +5809,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/arc
 +#endif /* _IPKG_MESSAGE_H_ */
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/archival/libipkg/ipkg_remove.c
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_remove.c	2010-07-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.c	2010-07-15 21:53:16.865858801 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6200,7 +6198,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/arch
 +}
 diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h busybox-1.17.0/archival/libipkg/ipkg_remove.h
 --- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_remove.h	2010-07-08 12:01:56.223000282 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.h	2010-07-15 21:53:16.915858471 +0200
 @@ -0,0 +1,33 @@