update busybox to latest upstream

9 files changed, 321 insertions, 247 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 53fc4b08b..7941fff37 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.20.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e025414bc6cd79579cc7a32a45d3ae1c
-PKG_DESCR:=		Core utilities for embedded systems
+PKG_VERSION:=		1.21.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
+PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 6393c1c14..8c1eeb317 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -13,12 +13,14 @@ config BUSYBOX_BASENAME
 	  basename is used to strip the directory and suffix from filenames,
 	  leaving just the filename itself. Enable this option if you wish
 	  to enable the 'basename' utility.
+
 config BUSYBOX_CAT
 	bool "cat"
 	default y
 	help
 	  cat is used to concatenate files and print them to the standard
 	  output. Enable this option if you wish to enable the 'cat' utility.
+
 config BUSYBOX_DATE
 	bool "date"
 	default y
@@ -651,6 +653,12 @@ config BUSYBOX_SHA512SUM
 	help
 	  Compute and check SHA512 message digest
 
+config BUSYBOX_SHA3SUM
+       bool "sha3sum"
+       default y
+       help
+         Compute and check SHA3 (512-bit) message digest
+
 config BUSYBOX_SLEEP
 	bool "sleep"
 	default y
@@ -903,13 +911,13 @@ config BUSYBOX_FEATURE_HUMAN_READABLE
 	help
 	  Allow df, du, and ls to have human readable output.
 
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 
 config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
 	bool "Enable -c, -s and -w options"
 	default y
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 	help
 	  Enabling the -c options allows files to be checked
 	  against pre-calculated hash values.
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 21aaa090d..cb16bbe34 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -129,14 +129,6 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 
 	  This is not clean but helps a lot on serial lines and such.
 
-config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR
-	bool "Optimize cursor movement"
-	default y
-	depends on BUSYBOX_VI
-	help
-	  This will make the cursor movement faster, but requires more memory
-	  and it makes the applet a tiny bit larger.
-
 config BUSYBOX_AWK
 	bool "awk"
 	default y
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index ff06540cc..9205677e2 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -14,6 +14,7 @@ config BUSYBOX_FEATURE_SYSTEMD
 	  are controlled by systemd, enable this option.
 	  If you don't use systemd, it is still safe to enable it,
 	  but the downside is increased code size.
+
 config BUSYBOX_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default y
@@ -42,6 +43,16 @@ config BUSYBOX_MD5_SMALL
 	  2                   3.0                5088
 	  3 (smallest)        5.1                4912
 
+config BUSYBOX_SHA3_SMALL
+       int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+       default 1
+       range 0 1
+       help
+         Trade binary size versus speed for the sha3sum algorithm.
+         SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+         64-bit x86: +270 bytes of code, 45% faster
+         32-bit x86: +450 bytes of code, 75% faster
+
 config BUSYBOX_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default y
diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index 66d18a0f9..b63391bb3 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -11,48 +11,57 @@ config BUSYBOX_IOSTAT
 	default y
 	help
 	  Report CPU and I/O statistics
+
 config BUSYBOX_LSOF
 	bool "lsof"
 	default y
 	help
 	  Show open files in the format of:
 	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+
 config BUSYBOX_MPSTAT
 	bool "mpstat"
 	default n
 	help
 	  Per-processor statistics
+
 config BUSYBOX_NMETER
 	bool "nmeter"
 	default n
 	help
 	  Prints selected system stats continuously, one line per update.
+
 config BUSYBOX_PMAP
        bool "pmap"
        default y
        help
          Display processes' memory mappings.
+
 config BUSYBOX_POWERTOP
 	bool "powertop"
 	default n
 	help
 	  Analyze power consumption on Intel-based laptops
+
 config BUSYBOX_PSTREE
 	bool "pstree"
 	default y
 	help
 	  Display a tree of processes.
+
 config BUSYBOX_PWDX
 	bool "pwdx"
 	default n
 	help
 	  Report current working directory of a process
+
 config BUSYBOX_SMEMCAP
 	bool "smemcap"
 	default n
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+
 config BUSYBOX_UPTIME
 	bool "uptime"
 	default y
diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in
index 8d999c8e9..6df10efde 100644
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -92,6 +92,19 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	  This option sets the size of the circular buffer
 	  used to record system log messages.
 
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+       bool "Linux kernel printk buffer support"
+       default n
+       depends on BUSYBOX_SYSLOGD
+       select BUSYBOX_PLATFORM_LINUX
+       help
+         When you enable this feature, the syslogd utility will
+         write system log message to the Linux kernel's printk buffer.
+         This can be used as a smaller alternative to the syslogd IPC
+         support, as klogd and logread aren't needed.
+
+         NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
 config BUSYBOX_LOGREAD
 	bool "logread"
 	default y
@@ -123,6 +136,9 @@ config BUSYBOX_KLOGD
 	  you wish to record the messages produced by the kernel,
 	  you should enable this option.
 
+comment "klogd should not be used together with syslog to kernel printk buffer"
+       depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
+
 config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index c3c297492..baf6beb26 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -806,6 +806,15 @@ config BUSYBOX_FEATURE_VOLUMEID_FAT
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_EXFAT
+       bool "exFAT filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         exFAT (extended FAT) is a proprietary file system designed especially
+         for flash drives. It has many features from NTFS, but with less
+         overhead. exFAT is used on most SDXC cards for consumer electronics.
+
 config BUSYBOX_FEATURE_VOLUMEID_HFS
 	bool "hfs filesystem"
 	default y
@@ -813,6 +822,13 @@ config BUSYBOX_FEATURE_VOLUMEID_HFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+       bool "nilfs filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         TODO
+
 config BUSYBOX_FEATURE_VOLUMEID_JFS
 	bool "jfs filesystem"
 	default y
@@ -897,6 +913,16 @@ config BUSYBOX_FEATURE_VOLUMEID_ROMFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
+       bool "SquashFS filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID && BUSYBOX_FEATURE_BLKID_TYPE
+       help
+         Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+         intended for general read-only filesystem use and in constrained block
+         device/memory systems (e.g. embedded systems) where low overhead is
+         needed.
+
 config BUSYBOX_FEATURE_VOLUMEID_SYSV
 	bool "sysv filesystem"
 	default y
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 28ced4519..07d31b802 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src
+--- busybox-1.21.1.orig/archival/Config.src	2013-05-12 01:30:43.000000000 +0200
++++ busybox-1.21.1/archival/Config.src	2013-11-02 15:26:12.000000000 +0100
 @@ -214,6 +214,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -14,9 +14,9 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Confi
  config RPM2CPIO
  	bool "rpm2cpio"
  	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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
+--- busybox-1.21.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/ipkg.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -46,9 +46,9 @@ diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src
+--- busybox-1.21.1.orig/archival/Kbuild.src	2013-05-12 01:30:43.000000000 +0200
++++ busybox-1.21.1/archival/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -57,9 +57,9 @@ diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuil
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  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	2013-01-31 16:44:50.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src
+--- busybox-1.21.1.orig/archival/libarchive/Kbuild.src	2013-06-29 16:58:06.000000000 +0200
++++ busybox-1.21.1/archival/libarchive/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
 @@ -25,14 +25,14 @@
  \
  	data_align.o \
@@ -77,9 +77,9 @@ diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/arc
  	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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c
+--- busybox-1.21.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -323,9 +323,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/l
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h
+--- busybox-1.21.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -399,9 +399,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/l
 +void args_usage(const char *complaint);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c
+--- busybox-1.21.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -468,9 +468,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archiv
 +
 +    return ret;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h
+--- busybox-1.21.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -502,9 +502,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archiv
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c
+--- busybox-1.21.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -553,9 +553,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/a
 +    return nv_pair_list_pop(list);
 +}
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h
+--- busybox-1.21.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -593,9 +593,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/a
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c
+--- busybox-1.21.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -783,9 +783,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archi
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h
+--- busybox-1.21.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -816,9 +816,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archi
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c
+--- busybox-1.21.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -975,9 +975,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h
+--- busybox-1.21.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1023,9 +1023,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/arch
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,1367 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2394,9 +2394,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archiv
 +}
 +
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2439,9 +2439,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archiv
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3154,9 +3154,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archi
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3265,9 +3265,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archi
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3309,9 +3309,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/
 +    return 0;
 +}
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3338,9 +3338,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3537,9 +3537,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/a
 +     }
 +     return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3571,9 +3571,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/a
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3643,9 +3643,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/l
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3729,9 +3729,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/a
 +#include <mntent.h>
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5715,9 +5715,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5754,9 +5754,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/ar
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5793,9 +5793,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/ar
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5829,9 +5829,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/ar
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6218,9 +6218,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/arc
 +
 +    return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6255,9 +6255,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6338,9 +6338,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/ar
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6360,9 +6360,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/ar
 +#include "ipkg.h"
 +
 +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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6549,9 +6549,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6582,9 +6582,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/arch
 +int line_is_blank(const char *line);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild
+--- busybox-1.21.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/Kbuild	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6646,9 +6646,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/l
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c
+--- busybox-1.21.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7233,9 +7233,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archiva
 +
 +	return err;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h
+--- busybox-1.21.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7315,9 +7315,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archiva
 +extern void free_error_list(struct errlist **errors);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c
+--- busybox-1.21.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7359,9 +7359,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h
+--- busybox-1.21.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7395,9 +7395,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archiva
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7497,9 +7497,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/ar
 +     }    
 +     return NULL;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7561,9 +7561,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/ar
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9322,9 +9322,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/li
 +     }
 +     return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10358,9 +10358,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/arc
 +
 +     return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10467,9 +10467,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/arc
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10563,9 +10563,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archiv
 +
 +    dest->root_dir = NULL;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10605,9 +10605,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archiv
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10694,9 +10694,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/a
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10748,9 +10748,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/a
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11007,9 +11007,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/arc
 +	
 +	return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11043,9 +11043,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/arc
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11276,9 +11276,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/li
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11903,9 +11903,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11968,9 +11968,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archiv
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12340,9 +12340,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archi
 +
 +    return 0;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12375,9 +12375,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archi
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12422,9 +12422,9 @@ 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12460,9 +12460,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archiva
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12539,9 +12539,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/ar
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12600,9 +12600,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/ar
 +
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c
+--- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12835,9 +12835,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archiva
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h
+--- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12901,9 +12901,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archiva
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h
+--- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12930,9 +12930,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/a
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c
+--- busybox-1.21.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13010,9 +13010,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archiv
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h
+--- busybox-1.21.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13065,9 +13065,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archiv
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c
+--- busybox-1.21.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13138,9 +13138,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archiv
 +    return str ? strdup(str) : NULL;
 +}
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h
+--- busybox-1.21.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13169,9 +13169,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archiv
 +char *str_dup_safe(const char *str);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c
+--- busybox-1.21.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/user.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13222,9 +13222,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/l
 +
 +     return response;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h
+--- busybox-1.21.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/user.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13249,9 +13249,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/l
 +
 +char *get_user_response(const char *format, ...);
 +
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c
+--- busybox-1.21.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13447,9 +13447,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archi
 +     else
 +	  return NULL;
 +}
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h
+--- busybox-1.21.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13510,9 +13510,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archi
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c
+--- busybox-1.21.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.c	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13578,9 +13578,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archiva
 +    return -1;
 +}
 +	 
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h
+--- busybox-1.21.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.h	2013-11-02 15:26:12.000000000 +0100
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13616,20 +13616,20 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archiva
 +
 +#endif
 +	 
-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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h
+--- busybox-1.21.1.orig/include/applets.src.h	2013-06-29 16:58:06.000000000 +0200
++++ busybox-1.21.1/include/applets.src.h	2013-11-02 15:27:08.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))
  IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
 +IF_IPKG(APPLET(ipkg, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_IPLINK(APPLET(iplink, BB_DIR_BIN, BB_SUID_DROP))
- IF_IPROUTE(APPLET(iproute, BB_DIR_BIN, BB_SUID_DROP))
- IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP))
-diff -Nur busybox-1.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	2013-01-31 16:49:28.000000000 +0100
+ IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP))
+ IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP))
+ IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
+diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h
+--- busybox-1.21.1.orig/include/bb_archive.h	2013-06-29 16:58:06.000000000 +0200
++++ busybox-1.21.1/include/bb_archive.h	2013-11-02 15:26:12.000000000 +0100
 @@ -79,7 +79,7 @@
  	/* Archiver specific. Can make it a union if it ever gets big */
  #define PAX_NEXT_FILE 0
@@ -13648,9 +13648,9 @@ diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_ar
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* 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	2013-01-31 16:44:31.000000000 +0100
+diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h
+--- busybox-1.21.1.orig/include/usage.src.h	2013-05-12 01:30:43.000000000 +0200
++++ busybox-1.21.1/include/usage.src.h	2013-11-02 15:26:12.000000000 +0100
 @@ -19,4 +19,80 @@
  #define busybox_notes_usage \
         "Hello world!\n"
@@ -13732,10 +13732,10 @@ diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.
 + 	"\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
 + 
  #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	2013-01-31 16:44:31.000000000 +0100
-@@ -465,6 +465,7 @@
+diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile
+--- busybox-1.21.1.orig/Makefile	2013-06-29 17:00:18.000000000 +0200
++++ busybox-1.21.1/Makefile	2013-11-02 15:26:12.000000000 +0100
+@@ -466,6 +466,7 @@
  libs-y		:= \
  		archival/ \
  		archival/libarchive/ \
diff --git a/package/busybox/patches/016-fix-musl-warning.patch b/package/busybox/patches/016-fix-musl-warning.patch
new file mode 100644
index 000000000..3f05e8726
--- /dev/null
+++ b/package/busybox/patches/016-fix-musl-warning.patch
@@ -0,0 +1,12 @@
+diff -Nur busybox-1.21.1.orig/include/libbb.h busybox-1.21.1/include/libbb.h
+--- busybox-1.21.1.orig/include/libbb.h	2013-06-29 16:58:06.000000000 +0200
++++ busybox-1.21.1/include/libbb.h	2013-11-02 16:55:04.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include <libgen.h> /* dirname,basename */
+ #undef basename
+ #define basename dont_use_basename
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/socket.h>