Merge branch 'master' of git://www.openadk.org/git/openadk

33 files changed, 435 insertions, 453 deletions

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
 +
@@ -1