From 4f4158728fcb636699e428a4afcdcafdb8f06b36 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 14:05:43 +0100
Subject: create directory

---
 package/glibc/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 355595ffa..c6e57b460 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -49,6 +49,7 @@ else
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 	done
+	${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
 ifeq ($(ADK_LOCALES),y)
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin
-- 
cgit v1.2.3


From bb2385e3efd35d3d0f95677a1833fbfc6a314af8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 14:06:59 +0100
Subject: update to latest upstream

---
 package/zlib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 6cfa0580e..ffd298550 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		zlib
-PKG_VERSION:=		1.2.6
+PKG_VERSION:=		1.2.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dc2cfa0d2313ca77224b4d932b2911e9
+PKG_MD5SUM:=		2ab442d169156f34c379c968f3f482dd
 PKG_DESCR:=		implementation of the deflate compression method
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.zlib.net/
-- 
cgit v1.2.3


From 747d98ea03f7ba4181f0b9185d3d73d1734bb8d1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 14:37:35 +0100
Subject: fix build on x86_64

---
 package/openssl/Makefile                   | 12 +++++++++---
 package/openssl/patches/patch-Configure    | 11 ++++++-----
 package/openssl/patches/patch-Makefile_org | 10 +++++-----
 3 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'package')

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 411a79b15..d6dcd5ce0 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
 PKG_VERSION:=		1.0.1c
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		ae412727c8c15b67880aef7bd2999b2e
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
@@ -53,11 +53,17 @@ ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),)
 OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 endif
 
+ifeq ($(ADK_LINUX_X86_64),y)
+CONFIG:=	linux-embedded-x86_64
+else
+CONFIG:=	linux-embedded
+endif
+
 do-configure:
 	(cd $(WRKBUILD); \
 		PATH=$(TARGET_PATH) \
 		OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
-		./Configure linux-embedded \
+		./Configure $(CONFIG) \
 		  --prefix=/usr \
 		  --openssldir=/etc/ssl \
 		  -I$(STAGING_TARGET_DIR)/usr/include \
@@ -76,7 +82,7 @@ do-build:
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
+	${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
 	chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
 
 openssl-util-install:
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 9275cd530..d5ec7cc28 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -1,10 +1,11 @@
---- openssl-1.0.0.orig/Configure	2010-01-19 22:40:54.000000000 +0100
-+++ openssl-1.0.0/Configure	2010-05-29 15:58:43.561613735 +0200
-@@ -379,6 +379,7 @@ my %table=(
+--- openssl-1.0.1c.orig/Configure	2012-03-14 23:20:40.000000000 +0100
++++ openssl-1.0.1c/Configure	2013-01-31 14:32:14.000000000 +0100
+@@ -400,6 +400,8 @@ my %table=(
  "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 +"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-embedded-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
  
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # Android: linux-* but without -DTERMIO and pointers to headers and libs.
+ "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org
index f72030d14..f19124dbe 100644
--- a/package/openssl/patches/patch-Makefile_org
+++ b/package/openssl/patches/patch-Makefile_org
@@ -1,8 +1,8 @@
---- openssl-1.0.0d.orig/Makefile.org	2010-01-27 17:06:58.000000000 +0100
-+++ openssl-1.0.0d/Makefile.org	2011-10-12 06:07:40.993200000 +0200
-@@ -109,7 +109,7 @@ LIBKRB5=
- ZLIB_INCLUDE=
- LIBZLIB=
+--- openssl-1.0.1c.orig/Makefile.org	2012-04-22 15:25:19.000000000 +0200
++++ openssl-1.0.1c/Makefile.org	2013-01-31 14:28:34.000000000 +0100
+@@ -135,7 +135,7 @@ FIPSCANLIB=
+ 
+ BASEADDR=
  
 -DIRS=   crypto ssl engines apps test tools
 +DIRS=   crypto ssl engines apps tools
-- 
cgit v1.2.3


From c0b4e2a12521d7b4c44b52979ee3ebe63a34751b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 15:01:57 +0100
Subject: fix glib build on Linux with missing glib-compile-schema

---
 package/glib/Makefile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'package')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 3f1def14f..dded649aa 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -46,6 +46,19 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getgrgid_r=yes
 
 
+pre-configure:
+ifeq ($(OStype),Linux)
+	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
+		./configure --prefix=$(STAGING_HOST_DIR) \
+	)
+	${MAKE} -C ${WRKBUILD} V=1
+	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
+	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
+	$(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
+	${MAKE} -C ${WRKBUILD} clean
+endif
+
+
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib
-- 
cgit v1.2.3


From c7ff22ad101b24cb7b01c774d1d8fb160f0c35fe Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 15:48:53 +0100
Subject: update to latest upstream, fix link error

---
 package/git/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/git/Makefile b/package/git/Makefile
index 86f70a5ca..19a13b602 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.11.2
+PKG_VERSION:=		1.8.1.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		91e01a22032f5d0ca2941ae7fd49d587
+PKG_MD5SUM:=		9f912370a1831c851ff8df171e8a7218
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		openssl curl expat
@@ -18,12 +18,14 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 NO_INSTALL_HARDLINKS=1 \
+XAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
+			NO_INSTALL_HARDLINKS=1 \
 			CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
 			ac_cv_snprintf_returns_bogus=no
+TARGET_LDFLAGS+=	-lintl -liconv
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core
-- 
cgit v1.2.3


From 7dcda2d31fbda2b06ce38c1df1580194e9f83420 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 15:57:31 +0100
Subject: update to latest upstream version

---
 package/util-linux/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index ea2bf1820..cf01143d5 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,16 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.20.1
+PKG_VERSION:=		2.22.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		079b37517fd4e002a2e6e992e8b4e361
+PKG_MD5SUM:=		eeacbfdd2556acd899a2d0ffdb446185
 PKG_DESCR:=		Linux utilities
 PKG_SECTION:=		fs
 PKG_BUILDDEP:=		ncurses
-PKG_SITES:=		ftp://ftp.infradead.org/pub/util-linux/v2.20/
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.22/
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 PKG_SUBPKGS:=		FDISK SFDISK SWAP_UTILS LOSETUP MOUNT MCOOKIE
 PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBUUID_DEV
@@ -50,6 +50,8 @@ CONFIGURE_ENV+=		scanf_cv_type_modifier=yes
 CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
+			--disable-login \
+			--disable-su \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
-- 
cgit v1.2.3


From 6837e9078267288f14de6ed02e157358f59e9272 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 16:51:16 +0100
Subject: update to latest upstream

---
 package/e2fsprogs/Makefile                      |  4 ++--
 package/e2fsprogs/patches/patch-util_symlinks_c | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 package/e2fsprogs/patches/patch-util_symlinks_c

(limited to 'package')

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 0d88b11fc..b33175484 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
-PKG_VERSION:=		1.42.5
+PKG_VERSION:=		1.42.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		aca828bb4bcca20991a442deb950b670
+PKG_MD5SUM:=		a1ec22ef003688dae9f76c74881b22b9
 PKG_DESCR:=		Ext2/3/4 filesystem utilities
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		libcom-err libuuid libblkid libpthread
diff --git a/package/e2fsprogs/patches/patch-util_symlinks_c b/package/e2fsprogs/patches/patch-util_symlinks_c
deleted file mode 100644
index a8011f907..000000000
--- a/package/e2fsprogs/patches/patch-util_symlinks_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- e2fsprogs-1.42.4.orig/util/symlinks.c	2012-05-15 04:04:19.000000000 +0200
-+++ e2fsprogs-1.42.4/util/symlinks.c	2012-07-26 18:50:03.000000000 +0200
-@@ -8,7 +8,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
- #include <sys/param.h>
-- 
cgit v1.2.3


From 938a05ef73db96e8b814148352cab4ae1eedfa25 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Jan 2013 16:51:32 +0100
Subject: fix build error

---
 package/busybox/patches/001-ipkg.patch | 169 +++++++++++++++++----------------
 1 file changed, 89 insertions(+), 80 deletions(-)

(limited to 'package')

diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 552618af7..28ced4519 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
 diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src
 --- busybox-1.20.2.orig//archival/Config.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Config.src	2012-08-28 11:57:00.000000000 +0200
++++ busybox-1.20.2/archival/Config.src	2013-01-31 16:44:31.000000000 +0100
 @@ -214,6 +214,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -16,7 +16,7 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Confi
  	default y
 diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c
 --- busybox-1.20.2.orig//archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/ipkg.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/ipkg.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -48,7 +48,7 @@ diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c
 +}
 diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuild.src
 --- busybox-1.20.2.orig//archival/Kbuild.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Kbuild.src	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/Kbuild.src	2013-01-31 16:44:31.000000000 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -59,26 +59,27 @@ diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuil
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
 diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/archival/libarchive/Kbuild.src
 --- busybox-1.20.2.orig//archival/libarchive/Kbuild.src	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/libarchive/Kbuild.src	2012-08-28 15:10:38.000000000 +0200
-@@ -25,6 +25,7 @@
++++ busybox-1.20.2/archival/libarchive/Kbuild.src	2013-01-31 16:44:50.000000000 +0100
+@@ -25,14 +25,14 @@
  \
  	data_align.o \
  	find_list_entry.o \
++	get_header_tar.o \
 +	get_header_tar_gz.o \
  	init_handle.o
  
  DPKG_FILES:= \
-@@ -32,7 +33,6 @@
+ 	unpack_ar_archive.o \
  	filter_accept_list_reassign.o \
  	get_header_ar.o \
- 	get_header_tar.o \
+-	get_header_tar.o \
 -	get_header_tar_gz.o \
  	get_header_tar_bz2.o \
  	get_header_tar_lzma.o \
  
 diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/libipkg/args.c
 --- busybox-1.20.2.orig//archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/args.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/args.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -324,7 +325,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/l
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/libipkg/args.h
 --- busybox-1.20.2.orig//archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/args.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/args.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -400,7 +401,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/l
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archival/libipkg/conffile.c
 --- busybox-1.20.2.orig//archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/conffile.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -469,7 +470,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archiv
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archival/libipkg/conffile.h
 --- busybox-1.20.2.orig//archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/conffile.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -503,7 +504,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archiv
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/archival/libipkg/conffile_list.c
 --- busybox-1.20.2.orig//archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/conffile_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -554,7 +555,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/a
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/archival/libipkg/conffile_list.h
 --- busybox-1.20.2.orig//archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/conffile_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/conffile_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -594,7 +595,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/a
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archival/libipkg/file_util.c
 --- busybox-1.20.2.orig//archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/file_util.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/file_util.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -784,7 +785,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archi
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archival/libipkg/file_util.h
 --- busybox-1.20.2.orig//archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/file_util.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/file_util.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -817,7 +818,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archi
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/archival/libipkg/hash_table.c
 --- busybox-1.20.2.orig//archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/hash_table.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/hash_table.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -976,7 +977,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/arch
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/archival/libipkg/hash_table.h
 --- busybox-1.20.2.orig//archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/hash_table.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/hash_table.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1024,7 +1025,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/arch
 +#endif /* _HASH_TABLE_H_ */
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archival/libipkg/ipkg_cmd.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c	2012-08-28 12:15:11.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,1367 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2393,10 +2394,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archiv
 +}
 +
 +
-Binary files busybox-1.20.2.orig//archival/libipkg/.ipkg_cmd.c.swp and busybox-1.20.2/archival/libipkg/.ipkg_cmd.c.swp differ
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archival/libipkg/ipkg_cmd.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2441,7 +2441,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archiv
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archival/libipkg/ipkg_conf.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_conf.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_conf.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3156,7 +3156,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archi
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archival/libipkg/ipkg_conf.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_conf.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_conf.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3267,7 +3267,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archi
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/archival/libipkg/ipkg_configure.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_configure.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_configure.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3311,7 +3311,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/archival/libipkg/ipkg_configure.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_configure.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_configure.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3340,7 +3340,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/archival/libipkg/ipkg_download.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_download.c	2012-08-28 15:00:11.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_download.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3539,7 +3539,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/a
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/archival/libipkg/ipkg_download.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_download.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_download.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3573,7 +3573,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/a
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/libipkg/ipkg.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3645,7 +3645,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/l
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/archival/libipkg/ipkg_includes.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_includes.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_includes.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3731,7 +3731,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/a
 +#endif /* IPKG_INCLUDES_H */
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/archival/libipkg/ipkg_install.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_install.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_install.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5717,7 +5717,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/ar
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/archival/libipkg/ipkg_install.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_install.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_install.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5756,7 +5756,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/ar
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/archival/libipkg/ipkg_message.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_message.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_message.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5795,7 +5795,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/ar
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/archival/libipkg/ipkg_message.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_message.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_message.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5831,7 +5831,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/ar
 +#endif /* _IPKG_MESSAGE_H_ */
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/archival/libipkg/ipkg_remove.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_remove.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_remove.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6220,7 +6220,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/arc
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/archival/libipkg/ipkg_remove.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_remove.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_remove.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6257,7 +6257,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/arc
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/archival/libipkg/ipkg_upgrade.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6340,7 +6340,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/ar
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/archival/libipkg/ipkg_upgrade.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6362,7 +6362,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/ar
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/archival/libipkg/ipkg_utils.c
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_utils.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_utils.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6551,7 +6551,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/arch
 +       
 diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/archival/libipkg/ipkg_utils.h
 --- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/ipkg_utils.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/ipkg_utils.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6584,7 +6584,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/arch
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/libipkg/Kbuild
 --- busybox-1.20.2.orig//archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/Kbuild	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/Kbuild	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6648,7 +6648,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/l
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
 diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archival/libipkg/libipkg.c
 --- busybox-1.20.2.orig//archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/libipkg.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/libipkg.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7235,7 +7235,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archiva
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archival/libipkg/libipkg.h
 --- busybox-1.20.2.orig//archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/libipkg.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/libipkg.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7317,7 +7317,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archiva
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archival/libipkg/nv_pair.c
 --- busybox-1.20.2.orig//archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/nv_pair.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/nv_pair.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7361,7 +7361,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archiva
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archival/libipkg/nv_pair.h
 --- busybox-1.20.2.orig//archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/nv_pair.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/nv_pair.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7397,7 +7397,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archiva
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/archival/libipkg/nv_pair_list.c
 --- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/nv_pair_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/nv_pair_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7499,7 +7499,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/ar
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/archival/libipkg/nv_pair_list.h
 --- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/nv_pair_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/nv_pair_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7563,7 +7563,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/ar
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/libipkg/pkg.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9324,7 +9324,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/li
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/archival/libipkg/pkg_depends.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_depends.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_depends.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10360,7 +10360,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/arc
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/archival/libipkg/pkg_depends.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_depends.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_depends.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10469,7 +10469,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/arc
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archival/libipkg/pkg_dest.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_dest.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_dest.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10565,7 +10565,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archiv
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archival/libipkg/pkg_dest.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_dest.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_dest.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10607,7 +10607,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archiv
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/archival/libipkg/pkg_dest_list.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10696,7 +10696,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/a
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/archival/libipkg/pkg_dest_list.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10750,7 +10750,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/a
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/archival/libipkg/pkg_extract.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_extract.c	2012-08-28 11:58:04.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_extract.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11009,7 +11009,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/arc
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/archival/libipkg/pkg_extract.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_extract.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_extract.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11045,7 +11045,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/arc
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/libipkg/pkg.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11278,7 +11278,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/li
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archival/libipkg/pkg_hash.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_hash.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_hash.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11905,7 +11905,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archiv
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archival/libipkg/pkg_hash.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_hash.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_hash.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11970,7 +11970,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archiv
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archival/libipkg/pkg_parse.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_parse.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_parse.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12342,7 +12342,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archi
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archival/libipkg/pkg_parse.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_parse.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_parse.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12377,7 +12377,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archi
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archival/libipkg/pkg_src.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_src.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_src.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12424,7 +12424,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archiva
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archival/libipkg/pkg_src.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_src.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_src.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12462,7 +12462,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archiva
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/archival/libipkg/pkg_src_list.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_src_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_src_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12541,7 +12541,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/ar
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/archival/libipkg/pkg_src_list.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_src_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_src_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12602,7 +12602,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/ar
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archival/libipkg/pkg_vec.c
 --- busybox-1.20.2.orig//archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_vec.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_vec.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12837,7 +12837,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archiva
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archival/libipkg/pkg_vec.h
 --- busybox-1.20.2.orig//archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/pkg_vec.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/pkg_vec.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12903,7 +12903,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archiva
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/archival/libipkg/sprintf_alloc.h
 --- busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12932,7 +12932,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/a
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archival/libipkg/str_list.c
 --- busybox-1.20.2.orig//archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/str_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/str_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13012,7 +13012,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archiv
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archival/libipkg/str_list.h
 --- busybox-1.20.2.orig//archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/str_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/str_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13067,7 +13067,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archiv
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archival/libipkg/str_util.c
 --- busybox-1.20.2.orig//archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/str_util.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/str_util.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13140,7 +13140,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archiv
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archival/libipkg/str_util.h
 --- busybox-1.20.2.orig//archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/str_util.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/str_util.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13171,7 +13171,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archiv
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/libipkg/user.c
 --- busybox-1.20.2.orig//archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/user.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/user.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13224,7 +13224,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/l
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/libipkg/user.h
 --- busybox-1.20.2.orig//archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/user.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/user.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13251,7 +13251,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/l
 +
 diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archival/libipkg/void_list.c
 --- busybox-1.20.2.orig//archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/void_list.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/void_list.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13449,7 +13449,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archi
 +}
 diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archival/libipkg/void_list.h
 --- busybox-1.20.2.orig//archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/void_list.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/void_list.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13512,7 +13512,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archi
 +#endif
 diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archival/libipkg/xsystem.c
 --- busybox-1.20.2.orig//archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/xsystem.c	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/xsystem.c	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13580,7 +13580,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archiva
 +	 
 diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archival/libipkg/xsystem.h
 --- busybox-1.20.2.orig//archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.20.2/archival/libipkg/xsystem.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/archival/libipkg/xsystem.h	2013-01-31 16:44:31.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13618,7 +13618,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archiva
 +	 
 diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h
 --- busybox-1.20.2.orig//include/applets.src.h	2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/include/applets.src.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/include/applets.src.h	2013-01-31 16:44:31.000000000 +0100
 @@ -199,6 +199,7 @@
  IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -13629,7 +13629,16 @@ diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/appl
  IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP))
 diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_archive.h
 --- busybox-1.20.2.orig//include/bb_archive.h	2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/include/bb_archive.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/include/bb_archive.h	2013-01-31 16:49:28.000000000 +0100
+@@ -79,7 +79,7 @@
+ 	/* Archiver specific. Can make it a union if it ever gets big */
+ #define PAX_NEXT_FILE 0
+ #define PAX_GLOBAL    1
+-#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB
++#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG
+ 	smallint tar__end;
+ # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+ 	char* tar__longname;
 @@ -98,7 +98,7 @@
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
@@ -13641,7 +13650,7 @@ diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_ar
  	/* How to process any sub archive, e.g. get_header_tar_gz */
 diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.src.h
 --- busybox-1.20.2.orig//include/usage.src.h	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/include/usage.src.h	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/include/usage.src.h	2013-01-31 16:44:31.000000000 +0100
 @@ -19,4 +19,80 @@
  #define busybox_notes_usage \
         "Hello world!\n"
@@ -13725,7 +13734,7 @@ diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.
  #endif
 diff -Nur busybox-1.20.2.orig//Makefile busybox-1.20.2/Makefile
 --- busybox-1.20.2.orig//Makefile	2012-07-02 16:20:27.000000000 +0200
-+++ busybox-1.20.2/Makefile	2012-08-28 11:57:01.000000000 +0200
++++ busybox-1.20.2/Makefile	2013-01-31 16:44:31.000000000 +0100
 @@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
-- 
cgit v1.2.3


From 858a50f6b5b13f2c7b20a5729b610c3b5c9fccc2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Feb 2013 09:52:23 +0100
Subject: update to latest upstream, fix compile error

---
 package/tar/Makefile                     |  4 ++--
 package/tar/patches/patch-gnu_stdio_in_h | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 package/tar/patches/patch-gnu_stdio_in_h

(limited to 'package')

diff --git a/package/tar/Makefile b/package/tar/Makefile
index 8c16627d1..d8b6df756 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tar
-PKG_VERSION:=		1.25
+PKG_VERSION:=		1.26
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0e48e9e473a72f135d0ebbc8af2762cc
+PKG_MD5SUM:=		00d1e769c6af702c542cca54b728920d
 PKG_DESCR:=		GNU archiving application
 PKG_SECTION:=		archive
 PKG_URL:=		http://mirrors.kernel.org/gnu/tar/
diff --git a/package/tar/patches/patch-gnu_stdio_in_h b/package/tar/patches/patch-gnu_stdio_in_h
new file mode 100644
index 000000000..413ba928e
--- /dev/null
+++ b/package/tar/patches/patch-gnu_stdio_in_h
@@ -0,0 +1,13 @@
+--- tar-1.26.orig/gnu/stdio.in.h	2011-03-12 10:14:33.000000000 +0100
++++ tar-1.26/gnu/stdio.in.h	2013-01-31 17:05:49.000000000 +0100
+@@ -163,8 +163,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
++/*
+ #undef gets
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++*/
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
-- 
cgit v1.2.3


From 541ed08700fdaeaf442c5a7eb514b1e040019664 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Feb 2013 11:23:47 +0100
Subject: libgcc required

---
 package/vim/Makefile         | 2 +-
 package/xauth/Makefile       | 2 +-
 package/xorg-server/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/vim/Makefile b/package/vim/Makefile
index 206c43dc8..da2cd3d3b 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		5b9510a17074e2b37d8bb38ae09edbf2
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		editor
-PKG_DEPENDS:=		libncurses
+PKG_DEPENDS:=		libncurses libgcc
 PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.vim.org/
 PKG_SITES:=		ftp://ftp.vim.org/pub/vim/unix/
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index 150f2e813..8d9aab007 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2eb3cc3e4421e1b747c4ac16aac20cda
 PKG_DESCR:=		X authority file utility
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libx11 libxext libxmu
+PKG_DEPENDS:=		libx11 libxext libxmu libgcc
 PKG_BUILDDEP:=		libX11 libXext libXmu
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 730d5c093..a4df670d3 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/server
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile
 PKG_DEPENDS+=		libfontenc xkeyboard-config xkbcomp libxau libxaw
 PKG_DEPENDS+=		libxmu libxpm libxrender libxt libxxf86dga libxext
-PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb
+PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb libgcc
 PKG_BUILDDEP:=		libX11 randrproto renderproto fixesproto damageproto
 PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman
-- 
cgit v1.2.3


From 00cd5a80e05783922cc62dd670ad2046edf51fc3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Feb 2013 11:24:03 +0100
Subject: allow firefox for tarox-pc

---
 package/firefox/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index aafccfa4a..21233ec9c 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -21,7 +21,7 @@ PKG_NEED_CXX:=		1
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 native mips
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
-PKG_SYSTEM_DEPENDS:=	ibm-x40 lemote-yeelong qemu-i686
+PKG_SYSTEM_DEPENDS:=	tarox-pc ibm-x40 lemote-yeelong qemu-i686
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 WRKDIST=		${WRKDIR}/mozilla-release
-- 
cgit v1.2.3


From d7e1e568a608b4dcafe06b9361284f9df38ac261 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Feb 2013 18:21:33 +0100
Subject: update nss to latest upstream

---
 package/nss/Makefile                               |  10 +-
 .../nss/patches/001-lfs-nss-config+nss_pc.patch    | 252 ++-------------------
 2 files changed, 30 insertions(+), 232 deletions(-)

(limited to 'package')

diff --git a/package/nss/Makefile b/package/nss/Makefile
index 858eb24cf..d3fd62b08 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.13.6
-PKG_RELEASE:=		2
+PKG_VERSION:=		3.14.1
+PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	13
-PKG_PATCH_VERSION:=	6
-PKG_MD5SUM:=		15ea0e3b63cd0d18b5b75619afc46c3e
+PKG_MIN_VERSION:=	14
+PKG_PATCH_VERSION:=	1
+PKG_MD5SUM:=		f6f3a942d1eba3e26aa0382a5b5461d9
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		nspr zlib
diff --git a/package/nss/patches/001-lfs-nss-config+nss_pc.patch b/package/nss/patches/001-lfs-nss-config+nss_pc.patch
index 9907548cc..25784a052 100644
--- a/package/nss/patches/001-lfs-nss-config+nss_pc.patch
+++ b/package/nss/patches/001-lfs-nss-config+nss_pc.patch
@@ -1,220 +1,6 @@
-diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile nss-3.13.6/mozilla/security/nss/Makefile
---- nss-3.13.6.orig/mozilla/security/nss/Makefile	2011-11-05 23:59:15.000000000 +0100
-+++ nss-3.13.6/mozilla/security/nss/Makefile	2012-10-01 12:37:24.000000000 +0200
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
- 
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
- 
-@@ -140,12 +140,6 @@
- 	--with-dist-prefix='$(NSPR_PREFIX)' \
- 	--with-dist-includedir='$(NSPR_PREFIX)/include'
- 
--build_nspr: $(NSPR_CONFIG_STATUS)
--	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
--	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
--
- build_dbm:
- ifdef NSS_DISABLE_DBM
- 	@echo "skipping the build of DBM"
-diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile.orig nss-3.13.6/mozilla/security/nss/Makefile.orig
---- nss-3.13.6.orig/mozilla/security/nss/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.13.6/mozilla/security/nss/Makefile.orig	2011-11-05 23:59:15.000000000 +0100
-@@ -0,0 +1,185 @@
-+#! gmake
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape security libraries.
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 1994-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+#######################################################################
-+# (1) Include initial platform-independent assignments (MANDATORY).   #
-+#######################################################################
-+
-+include manifest.mn
-+
-+#######################################################################
-+# (2) Include "global" configuration information. (OPTIONAL)          #
-+#######################################################################
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+#######################################################################
-+# (3) Include "component" configuration information. (OPTIONAL)       #
-+#######################################################################
-+
-+
-+
-+#######################################################################
-+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-+#######################################################################
-+
-+ifeq ($(OS_TARGET),WINCE)
-+DIRS	= lib	# omit cmd since wince has no command line shell
-+endif
-+
-+#######################################################################
-+# (5) Execute "global" rules. (OPTIONAL)                              #
-+###############################