allconfig fixes for lemote yeelong

Config.in

@@ -105,24 +105,38 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_2_6_39_4
-	prompt "2.6.39.4"
+
+config ADK_KERNEL_VERSION_3_3
+	prompt "3.3"
 	boolean
 
-config ADK_KERNEL_VERSION_3_0_22
-	prompt "3.0.22"
+config ADK_KERNEL_VERSION_3_2_12
+	prompt "3.2.12"
 	boolean
 
 config ADK_KERNEL_VERSION_3_1_10
 	prompt "3.1.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_2_10
-	prompt "3.2.10"
+config ADK_KERNEL_VERSION_3_0_25
+	prompt "3.0.25"
+	boolean
+
+config ADK_KERNEL_VERSION_2_6_39_4
+	prompt "2.6.39.4"
 	boolean
 
 endchoice
 
+config ADK_KERNEL_VERSION
+	string
+	default "3.3" if ADK_KERNEL_VERSION_3_3
+	default "3.2.12" if ADK_KERNEL_VERSION_3_2_12
+	default "3.1.10" if ADK_KERNEL_VERSION_3_1_10
+	default "3.0.25" if ADK_KERNEL_VERSION_3_0_25
+	default "2.6.39.4" if ADK_KERNEL_VERSION_2_6_39_4
+	help
+
 choice
 prompt "Kernel Compression"
 config ADK_KERNEL_COMP_XZ

mk/build.mk

@@ -15,13 +15,20 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_LOCALES=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
+			ADK_LEAVE_ETC_ALONE=n \
+			ADK_SIMPLE_NETWORK_CONFIG=n \
 			ADK_USE_CCACHE=n \
 			ADK_TOOLCHAIN_GDB=n \
+			ADK_PACKAGE_LIBAU=n \
+			ADK_PACKAGE_AUFS2_UTIL=n \
+			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_CXXTOOLS_DEV=n \
 			ADK_PACKAGE_XORG_SERVER_DEV=n \
 			ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
+			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
+			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
 			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GPSD=n \
@@ -113,7 +120,7 @@ POSTCONFIG=		-@\
 			touch .rebuild.bkeymaps;\
 			rebuild=1;\
 		fi; \
-		if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \
+		if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \
 			make kernelclean;\
 		fi; \
 		if [ $$rebuild -eq 1 ];then \
@@ -139,6 +146,9 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
 world:
+	echo $(KERNEL_BASE)
+	echo $(KERNEL_MAJ)
+	echo $(KERNEL_MIN)
 	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \
 		$(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh

mk/modules.mk

@@ -1,6 +1,10 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+KERNEL_BASE:=$(word 1,$(subst ., ,$(ADK_KERNEL_VERSION)))
+KERNEL_MAJ:=$(word 2,$(subst ., ,$(ADK_KERNEL_VERSION)))
+KERNEL_MIN:=$(word 3,$(subst ., ,$(ADK_KERNEL_VERSION)))
+
 #
 # Virtualization
 #
@@ -162,14 +166,30 @@ $(eval $(call KMOD_template,IPV6_SIT,ipv6-sit,\
 	$(MODULES_DIR)/kernel/net/ipv6/sit \
 ,25))
 
+ifeq ($(KERNEL_BASE),3)
+SLHC:=drivers/net/slip/slhc
+PPP:=drivers/net/ppp/ppp_generic
+PPP_ASYNC:=drivers/net/ppp/ppp_async
+MPPE:=drivers/net/ppp/ppp_mppe
+PPPOE:=drivers/net/ppp/pppox
+PPPOX:=drivers/net/ppp/pppoe
+else
+SLHC:=drivers/net/slhc
+PPP:=drivers/net/ppp_generic
+PPP_ASYNC:=drivers/net/ppp_async
+MPPE:=drivers/net/ppp_mppe
+PPPOE:=drivers/net/pppox
+PPPOX:=drivers/net/pppoe
+endif
+
 $(eval $(call KMOD_template,PPP,ppp,\
-	$(MODULES_DIR)/kernel/drivers/net/slhc \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_generic \
-	$(MODULES_DIR)/kernel/drivers/net/ppp_async \
+	$(MODULES_DIR)/kernel/$(SLHC) \
+	$(MODULES_DIR)/kernel/$(PPP) \
+	$(MODULES_DIR)/kernel/$(PPP_ASYNC) \
 ,50))
 
 $(eval $(call KMOD_template,PPP_MPPE,ppp-mppe,\
-	$(MODULES_DIR)/kernel/drivers/net/ppp_mppe \
+	$(MODULES_DIR)/kernel/$(MPPE) \
 ,55))
 
 $(eval $(call KMOD_template,PPPOATM,pppoatm,\
@@ -177,8 +197,8 @@ $(eval $(call KMOD_template,PPPOATM,pppoatm,\
 ,60))
 
 $(eval $(call KMOD_template,PPPOE,pppoe,\
-	$(MODULES_DIR)/kernel/drivers/net/pppox \
-	$(MODULES_DIR)/kernel/drivers/net/pppoe \
+	$(MODULES_DIR)/kernel/$(PPPOX) \
+	$(MODULES_DIR)/kernel/$(PPPOE) \
 ,60))
 
 $(eval $(call KMOD_template,TUN,tun,\
@@ -891,7 +911,8 @@ $(eval $(call KMOD_template,CRYPTO_DES,crypto-des,\
 ,10))
 
 $(eval $(call KMOD_template,CRYPTO_BLOWFISH,crypto-blowfish,\
-    $(MODULES_DIR)/kernel/crypto/blowfish \
+    $(MODULES_DIR)/kernel/crypto/blowfish_common \
+    $(MODULES_DIR)/kernel/crypto/blowfish_generic \
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_TWOFISH,crypto-twofish,\
@@ -904,7 +925,7 @@ $(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-586,\
 ,12))
 
 $(eval $(call KMOD_template,CRYPTO_SERPENT,crypto-serpent,\
-    $(MODULES_DIR)/kernel/crypto/serpent \
+    $(MODULES_DIR)/kernel/crypto/serpent_generic \
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_AES,crypto-aes,\
@@ -1148,14 +1169,14 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55))
 
-#V4L_COMPAT:=drivers/media/video/v4l1-compat
-#ifeq ($(ADK_LINUX_64),y)
-#V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
-#endif
+ifeq ($(ADK_LINUX_64),y)
+V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32
+endif
 
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
+	$(MODULES_DIR)/kernel/drivers/media/video/videobuf2-core \
 ,65))
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
@@ -1224,7 +1245,7 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 #
 
 USBMODULES:=
-ifeq ($(ADK_KERNEL_VERSION_3_2_10),y)
+ifeq ($(KERNEL_BASE),3)
 USBMODULES+=drivers/usb/usb-common
 endif
 USBMODULES+=drivers/usb/core/usbcore
@@ -1562,8 +1583,9 @@ $(eval $(call KMOD_template,ISDN_CAPI,isdn-capi, \
 	$(MODULES_DIR)/kernel/drivers/isdn/capi/capi \
 ,60))
 
+
 $(eval $(call KMOD_template,SLHC,slhc, \
-	$(MODULES_DIR)/kernel/drivers/net/slhc \
+	$(MODULES_DIR)/kernel/$(SLHC) \
 ,65))
 
 $(eval $(call KMOD_template,HISAX,hisax, \

package/busybox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.18.4
+PKG_VERSION:=		1.19.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b03c5b46ced732679e525a920a1a62f5
+PKG_MD5SUM:=		9c0cae5a0379228e7b55e5b29528df8e
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
 PKG_URL:=		http://www.busybox.net/

package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in

@@ -11,15 +11,15 @@ config BUSYBOX_CHATTR
 	help
 	  chattr changes the file attributes on a second extended file system.
 
-config BUSYBOX_E2FSCK
-	bool "e2fsck"
-	default n
-	help
-	  e2fsck is used to check Linux second extended file systems (ext2fs).
-	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
-	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
-	  provided.
-
+#config BUSYBOX_E2FSCK
+#	bool "e2fsck"
+#	default n
+#	help
+##	  e2fsck is used to check Linux second extended file systems (ext2fs).
+#	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+#	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+#	  provided.
+#
 config BUSYBOX_FSCK
 	bool "fsck"
 	default n
@@ -34,34 +34,34 @@ config BUSYBOX_LSATTR
 	help
 	  lsattr lists the file attributes on a second extended file system.
 
-config BUSYBOX_MKE2FS
-	bool "mke2fs"
-	default n
-	help
-	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
-	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+#config BUSYBOX_MKE2FS
+#	bool "mke2fs"
+#	default n
+#	help
+#	  mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+#	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
-config BUSYBOX_TUNE2FS
-	bool "tune2fs"
-	default n
-	help
-	  tune2fs allows the system administrator to adjust various tunable
-	  filesystem parameters on Linux ext2/ext3 filesystems.
+#config BUSYBOX_TUNE2FS
+#	bool "tune2fs"
+#	default n
+#	help
+##	  tune2fs allows the system administrator to adjust various tunable
+#	  filesystem parameters on Linux ext2/ext3 filesystems.
 
-config BUSYBOX_E2LABEL
-	bool "e2label"
-	default n
-	depends on BUSYBOX_TUNE2FS
-	help
-	  e2label will display or change the filesystem label on the ext2
-	  filesystem located on device.
+#config BUSYBOX_E2LABEL
+#	bool "e2label"
+#	default n
+#	depends on BUSYBOX_TUNE2FS
+#	help
+#	  e2label will display or change the filesystem label on the ext2
+#	  filesystem located on device.
 
-config BUSYBOX_FINDFS
-	bool "findfs"
-	default n
-	depends on BUSYBOX_TUNE2FS
-	help
-	  findfs will search the disks in the system looking for a filesystem
-	  which has a label matching label or a UUID equal to uuid.
+#config BUSYBOX_FINDFS
+#	bool "findfs"
+#	default n
+#	depends on BUSYBOX_TUNE2FS
+#	help
+#	  findfs will search the disks in the system looking for a filesystem
+#	  which has a label matching label or a UUID equal to uuid.
 
 endmenu

package/busybox/patches/0001-nameif-fix-parsing-proc-net-dev.patch

@@ -1,31 +0,0 @@
-From ea80044062500c7473cf214010576ea2681d8d2e Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil.sutter@viprinet.com>
-Date: Thu, 3 Mar 2011 15:13:57 +0100
-Subject: [PATCH 1/2] nameif: fix parsing /proc/net/dev
-
-The parser field lineno is initially zero and incremented upon each
-call to config_read(). So lineno is effectively a "real" line number,
-not an index. Fix the off-by-one bug here, which led to parsing for an
-interface named "face".
-
-Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
----
- networking/nameif.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/networking/nameif.c b/networking/nameif.c
-index 6cf1c50..8e325e7 100644
---- a/networking/nameif.c
-+++ b/networking/nameif.c
-@@ -174,7 +174,7 @@ int nameif_main(int argc, char **argv)
- #if  ENABLE_FEATURE_NAMEIF_EXTENDED
- 		struct ethtool_drvinfo drvinfo;
- #endif
--		if (parser->lineno < 2)
-+		if (parser->lineno < 3)
- 			continue; /* Skip the first two lines */
- 
- 		/* Find the current interface name and copy it to ifr.ifr_name */
--- 
-1.7.3.4
-

package/busybox/patches/0002-nameif-Added-matching-for-PhyAddresses.patch

@@ -1,103 +0,0 @@
-From eb65132adca3fe1e7c39fc6032266a8d04150561 Mon Sep 17 00:00:00 2001
-From: Nico Erfurth <ne@erfurth.eu>
-Date: Sun, 27 Feb 2011 17:57:30 +0100
-Subject: [PATCH 2/2] nameif: Added matching for PhyAddresses
-
-Very useful when trying to distinguish platform-devices served by the
-same driver, which is actually quite common in embedded-devices.
-
-Signed-off-by: Nico Erfurth <ne@erfurth.eu>
-Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
----
- networking/nameif.c |   33 +++++++++++++++++++++++++++++++++
- 1 files changed, 33 insertions(+), 0 deletions(-)
-
-diff --git a/networking/nameif.c b/networking/nameif.c
-index 8e325e7..8d64b37 100644
---- a/networking/nameif.c
-+++ b/networking/nameif.c
-@@ -38,6 +38,7 @@ typedef struct ethtable_s {
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
- 	char *bus_info;
- 	char *driver;
-+	int32_t phy_address;
- #endif
- } ethtable_t;
- 
-@@ -59,6 +60,25 @@ struct ethtool_drvinfo {
- 	uint32_t eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
- 	uint32_t regdump_len;  /* Size of data from ETHTOOL_GREGS (bytes) */
- };
-+
-+struct ethtool_cmd {
-+	__u32   cmd;
-+	__u32   supported;      /* Features this interface supports */
-+	__u32   advertising;    /* Features this interface advertises */
-+	__u16   speed;          /* The forced speed, 10Mb, 100Mb, gigabit */
-+	__u8    duplex;         /* Duplex, half or full */
-+	__u8    port;           /* Which connector port */
-+	__u8    phy_address;
-+	__u8    transceiver;    /* Which transceiver to use */
-+	__u8    autoneg;        /* Enable or disable autonegotiation */
-+	__u32   maxtxpkt;       /* Tx pkts before generating tx int */
-+	__u32   maxrxpkt;       /* Rx pkts before generating rx int */
-+	__u16   speed_hi;
-+	__u16   reserved2;
-+	__u32   reserved[3];
-+};
-+
-+#define ETHTOOL_GSET      0x00000001 /* Get settings. */
- #define ETHTOOL_GDRVINFO  0x00000003 /* Get driver info. */
- #endif
- 
-@@ -74,6 +94,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
- #endif
- 		selector = skip_whitespace(selector);
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
-+		ch->phy_address = -1;
- 		if (*selector == '\0')
- 			break;
- 		/* Search for the end .... */
-@@ -87,6 +108,9 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
- 		} else if (strncmp(selector, "driver=", 7) == 0) {
- 			ch->driver = xstrdup(selector + 7);
- 			found_selector++;
-+		} else if (strncmp(selector, "phyaddr=", 8) == 0) {
-+			ch->phy_address = atoi(selector + 8);
-+			found_selector++;
- 		} else {
- #endif
- 			lmac = xmalloc(ETH_ALEN);
-@@ -173,6 +197,7 @@ int nameif_main(int argc, char **argv)
- 		struct ifreq ifr;
- #if  ENABLE_FEATURE_NAMEIF_EXTENDED
- 		struct ethtool_drvinfo drvinfo;
-+		struct ethtool_cmd eth_settings;
- #endif
- 		if (parser->lineno < 3)
- 			continue; /* Skip the first two lines */
-@@ -182,6 +207,12 @@ int nameif_main(int argc, char **argv)
- 		strncpy_IFNAMSIZ(ifr.ifr_name, token[0]);
- 
- #if ENABLE_FEATURE_NAMEIF_EXTENDED
-+		/* Check for phy address */
-+		memset(&eth_settings, 0, sizeof(struct ethtool_cmd));
-+		eth_settings.cmd = ETHTOOL_GSET;
-+		ifr.ifr_data = (caddr_t) &eth_settings;
-+		ioctl(ctl_sk, SIOCETHTOOL, &ifr);
-+
- 		/* Check for driver etc. */
- 		memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo));
- 		drvinfo.cmd = ETHTOOL_GDRVINFO;
-@@ -198,6 +229,8 @@ int nameif_main(int argc, char **argv)
- 				continue;
- 			if (ch->driver && strcmp(ch->driver, drvinfo.driver) != 0)
- 				continue;
-+			if (ch->phy_address != -1 && ch->phy_address != eth_settings.phy_address)
-+				continue;
- #endif
- 			if (ch->mac && memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN) != 0)
- 				continue;
--- 
-1.7.3.4
-

package/busybox/patches/001-ipkg.patch

@@ -1,5 +1,6 @@
---- busybox-1.18.1.orig/Makefile
-+++ busybox-1.18.1/Makefile
+diff -Nur busybox-1.19.4.orig/Makefile busybox-1.19.4/Makefile
+--- busybox-1.19.4.orig/Makefile	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/Makefile	2012-03-17 00:58:08.189100677 +0100
 @@ -465,6 +465,7 @@
  libs-y		:= \
  		archival/ \
@@ -8,8 +9,9 @@
  		console-tools/ \
  		coreutils/ \
  		coreutils/libcoreutils/ \
---- busybox-1.18.1.orig/archival/Config.src
-+++ busybox-1.18.1/archival/Config.src
+diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config.src
+--- busybox-1.19.4.orig/archival/Config.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/archival/Config.src	2012-03-17 00:58:08.189100677 +0100
 @@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -23,8 +25,9 @@
  config RPM2CPIO
  	bool "rpm2cpio"
  	default y
---- busybox-1.18.1.orig/archival/Kbuild.src
-+++ busybox-1.18.1/archival/Kbuild.src
+diff -Nur busybox-1.19.4.orig/archival/Kbuild.src busybox-1.19.4/archival/Kbuild.src
+--- busybox-1.19.4.orig/archival/Kbuild.src	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/archival/Kbuild.src	2012-03-17 00:58:08.189100677 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -33,8 +36,9 @@
  
  lib-$(CONFIG_UNXZ)		+= bbunzip.o
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
---- /dev/null
-+++ busybox-1.18.1/archival/ipkg.c
+diff -Nur busybox-1.19.4.orig/archival/ipkg.c busybox-1.19.4/archival/ipkg.c
+--- busybox-1.19.4.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/ipkg.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -64,8 +68,9 @@
 +{
 +	return ipkg_op(argc, argv);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/Kbuild
+diff -Nur busybox-1.19.4.orig/archival/libipkg/Kbuild busybox-1.19.4/archival/libipkg/Kbuild
+--- busybox-1.19.4.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/Kbuild	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -127,8 +132,9 @@
 +IPKG_ARCH:=$(TARGET_ARCH)
 +endif
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/args.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/args.c busybox-1.19.4/archival/libipkg/args.c
+--- busybox-1.19.4.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/args.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -372,8 +378,9 @@
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/args.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/args.h busybox-1.19.4/archival/libipkg/args.h
+--- busybox-1.19.4.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/args.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -447,8 +454,9 @@
 +void args_usage(const char *complaint);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.c busybox-1.19.4/archival/libipkg/conffile.c
+--- busybox-1.19.4.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -515,8 +523,9 @@
 +
 +    return ret;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile.h busybox-1.19.4/archival/libipkg/conffile.h
+--- busybox-1.19.4.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -548,8 +557,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.c busybox-1.19.4/archival/libipkg/conffile_list.c
+--- busybox-1.19.4.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile_list.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -598,8 +608,9 @@
 +    return nv_pair_list_pop(list);
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/conffile_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/conffile_list.h busybox-1.19.4/archival/libipkg/conffile_list.h
+--- busybox-1.19.4.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/conffile_list.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -637,8 +648,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/file_util.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.c busybox-1.19.4/archival/libipkg/file_util.c
+--- busybox-1.19.4.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/file_util.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -826,8 +838,9 @@
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/file_util.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/file_util.h busybox-1.19.4/archival/libipkg/file_util.h
+--- busybox-1.19.4.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/file_util.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -858,8 +871,9 @@
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/hash_table.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.c busybox-1.19.4/archival/libipkg/hash_table.c
+--- busybox-1.19.4.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/hash_table.c	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1016,8 +1030,9 @@
 +    }
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/hash_table.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/hash_table.h busybox-1.19.4/archival/libipkg/hash_table.h
+--- busybox-1.19.4.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/hash_table.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1063,8 +1078,9 @@
 +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
 +
 +#endif /* _HASH_TABLE_H_ */
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg.h busybox-1.19.4/archival/libipkg/ipkg.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg.h	2012-03-17 00:58:08.189100677 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -1134,8 +1150,9 @@
 +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.19.4/archival/libipkg/ipkg_cmd.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_cmd.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2503,8 +2520,9 @@
 +}
 +
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.19.4/archival/libipkg/ipkg_cmd.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_cmd.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2547,8 +2565,9 @@
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c busybox-1.19.4/archival/libipkg/ipkg_conf.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_conf.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3261,8 +3280,9 @@
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_conf.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h busybox-1.19.4/archival/libipkg/ipkg_conf.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_conf.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3371,8 +3391,9 @@
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c busybox-1.19.4/archival/libipkg/ipkg_configure.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_configure.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3414,8 +3435,9 @@
 +    return 0;
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_configure.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h busybox-1.19.4/archival/libipkg/ipkg_configure.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_configure.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3442,8 +3464,9 @@
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.c busybox-1.19.4/archival/libipkg/ipkg_download.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_download.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3640,8 +3663,9 @@
 +     }
 +     return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_download.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_download.h busybox-1.19.4/archival/libipkg/ipkg_download.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_download.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3673,8 +3697,9 @@
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_includes.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_includes.h busybox-1.19.4/archival/libipkg/ipkg_includes.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_includes.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3758,8 +3783,9 @@
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_install.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.c busybox-1.19.4/archival/libipkg/ipkg_install.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_install.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5743,8 +5769,9 @@
 +}
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_install.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_install.h busybox-1.19.4/archival/libipkg/ipkg_install.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_install.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5781,8 +5808,9 @@
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_message.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.c busybox-1.19.4/archival/libipkg/ipkg_message.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_message.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5819,8 +5847,9 @@
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_message.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_message.h busybox-1.19.4/archival/libipkg/ipkg_message.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_message.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5854,8 +5883,9 @@
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_remove.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.c busybox-1.19.4/archival/libipkg/ipkg_remove.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_remove.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6242,8 +6272,9 @@
 +
 +    return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_remove.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_remove.h busybox-1.19.4/archival/libipkg/ipkg_remove.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_remove.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6278,8 +6309,9 @@
 +
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.c busybox-1.19.4/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_upgrade.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6360,8 +6392,9 @@
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.h busybox-1.19.4/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_upgrade.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6381,8 +6414,9 @@
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_utils.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.c busybox-1.19.4/archival/libipkg/ipkg_utils.c
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_utils.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6569,8 +6603,9 @@
 +}
 +
 +       
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/ipkg_utils.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/ipkg_utils.h busybox-1.19.4/archival/libipkg/ipkg_utils.h
+--- busybox-1.19.4.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/ipkg_utils.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6601,8 +6636,9 @@
 +int line_is_blank(const char *line);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/libipkg.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.c busybox-1.19.4/archival/libipkg/libipkg.c
+--- busybox-1.19.4.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/libipkg.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7187,8 +7223,9 @@
 +
 +	return err;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/libipkg.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/libipkg.h busybox-1.19.4/archival/libipkg/libipkg.h
+--- busybox-1.19.4.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/libipkg.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7268,8 +7305,9 @@
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/nv_pair.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.c busybox-1.19.4/archival/libipkg/nv_pair.c
+--- busybox-1.19.4.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/nv_pair.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7311,8 +7349,9 @@
 +}
 +
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/nv_pair.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair.h busybox-1.19.4/archival/libipkg/nv_pair.h
+--- busybox-1.19.4.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/nv_pair.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7346,8 +7385,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/nv_pair_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.c busybox-1.19.4/archival/libipkg/nv_pair_list.c
+--- busybox-1.19.4.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/nv_pair_list.c	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7447,8 +7487,9 @@
 +     }    
 +     return NULL;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/nv_pair_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/nv_pair_list.h busybox-1.19.4/archival/libipkg/nv_pair_list.h
+--- busybox-1.19.4.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/nv_pair_list.h	2012-03-17 00:58:08.193100680 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7510,8 +7551,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg.c busybox-1.19.4/archival/libipkg/pkg.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9270,8 +9312,9 @@
 +     }
 +     return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg.h busybox-1.19.4/archival/libipkg/pkg.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -9502,8 +9545,9 @@
 +int pkg_write_changed_filelists(ipkg_conf_t *conf);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_depends.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.c busybox-1.19.4/archival/libipkg/pkg_depends.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_depends.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10537,8 +10581,9 @@
 +
 +     return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_depends.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_depends.h busybox-1.19.4/archival/libipkg/pkg_depends.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_depends.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10645,8 +10690,9 @@
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_dest.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.c busybox-1.19.4/archival/libipkg/pkg_dest.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_dest.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10740,8 +10786,9 @@
 +
 +    dest->root_dir = NULL;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_dest.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest.h busybox-1.19.4/archival/libipkg/pkg_dest.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_dest.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10781,8 +10828,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.c busybox-1.19.4/archival/libipkg/pkg_dest_list.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_dest_list.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10869,8 +10917,9 @@
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.h busybox-1.19.4/archival/libipkg/pkg_dest_list.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_dest_list.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10922,8 +10971,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.c busybox-1.19.4/archival/libipkg/pkg_extract.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_extract.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11180,8 +11230,9 @@
 +	
 +	return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_extract.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_extract.h busybox-1.19.4/archival/libipkg/pkg_extract.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_extract.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11215,8 +11266,9 @@
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.c busybox-1.19.4/archival/libipkg/pkg_hash.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_hash.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11841,8 +11893,9 @@
 +}
 +
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_hash.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_hash.h busybox-1.19.4/archival/libipkg/pkg_hash.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_hash.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11905,8 +11958,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.c busybox-1.19.4/archival/libipkg/pkg_parse.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_parse.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12276,8 +12330,9 @@
 +
 +    return 0;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_parse.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_parse.h busybox-1.19.4/archival/libipkg/pkg_parse.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_parse.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12310,8 +12365,9 @@
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_src.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.c busybox-1.19.4/archival/libipkg/pkg_src.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_src.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12356,8 +12412,9 @@
 +}
 +
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_src.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src.h busybox-1.19.4/archival/libipkg/pkg_src.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_src.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12393,8 +12450,9 @@
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.c busybox-1.19.4/archival/libipkg/pkg_src_list.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_src_list.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12471,8 +12529,9 @@
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_src_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_src_list.h busybox-1.19.4/archival/libipkg/pkg_src_list.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_src_list.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12531,8 +12590,9 @@
 +
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.c busybox-1.19.4/archival/libipkg/pkg_vec.c
+--- busybox-1.19.4.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_vec.c	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12765,8 +12825,9 @@
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/pkg_vec.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/pkg_vec.h busybox-1.19.4/archival/libipkg/pkg_vec.h
+--- busybox-1.19.4.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/pkg_vec.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12830,8 +12891,9 @@
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/sprintf_alloc.h busybox-1.19.4/archival/libipkg/sprintf_alloc.h
+--- busybox-1.19.4.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/sprintf_alloc.h	2012-03-17 00:58:08.197100679 +0100
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12858,8 +12920,9 @@
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/str_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.c busybox-1.19.4/archival/libipkg/str_list.c
+--- busybox-1.19.4.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/str_list.c	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12937,8 +13000,9 @@
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/str_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/str_list.h busybox-1.19.4/archival/libipkg/str_list.h
+--- busybox-1.19.4.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/str_list.h	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -12991,8 +13055,9 @@
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/str_util.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.c busybox-1.19.4/archival/libipkg/str_util.c
+--- busybox-1.19.4.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/str_util.c	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13063,8 +13128,9 @@
 +    return str ? strdup(str) : NULL;
 +}
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/str_util.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/str_util.h busybox-1.19.4/archival/libipkg/str_util.h
+--- busybox-1.19.4.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/str_util.h	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13093,8 +13159,9 @@
 +char *str_dup_safe(const char *str);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/user.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/user.c busybox-1.19.4/archival/libipkg/user.c
+--- busybox-1.19.4.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/user.c	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13145,8 +13212,9 @@
 +
 +     return response;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/user.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/user.h busybox-1.19.4/archival/libipkg/user.h
+--- busybox-1.19.4.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/user.h	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13171,8 +13239,9 @@
 +
 +char *get_user_response(const char *format, ...);
 +
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/void_list.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.c busybox-1.19.4/archival/libipkg/void_list.c
+--- busybox-1.19.4.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/void_list.c	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13368,8 +13437,9 @@
 +     else
 +	  return NULL;
 +}
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/void_list.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/void_list.h busybox-1.19.4/archival/libipkg/void_list.h
+--- busybox-1.19.4.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/void_list.h	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13430,8 +13500,9 @@
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/xsystem.c
+diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.c busybox-1.19.4/archival/libipkg/xsystem.c
+--- busybox-1.19.4.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/xsystem.c	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13497,8 +13568,9 @@
 +    return -1;
 +}
 +	 
---- /dev/null
-+++ busybox-1.18.1/archival/libipkg/xsystem.h
+diff -Nur busybox-1.19.4.orig/archival/libipkg/xsystem.h busybox-1.19.4/archival/libipkg/xsystem.h
+--- busybox-1.19.4.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.19.4/archival/libipkg/xsystem.h	2012-03-17 00:58:08.201100676 +0100
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13534,19 +13606,21 @@
 +
 +#endif
 +	 
---- busybox-1.18.1.orig/include/applets.src.h
-+++ busybox-1.18.1/include/applets.src.h
-@@ -195,6 +195,7 @@
- IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP))
- IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
- IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-+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))
---- busybox-1.18.1.orig/include/archive.h
-+++ busybox-1.18.1/include/archive.h
-@@ -95,7 +95,7 @@
+diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/applets.src.h
+--- busybox-1.19.4.orig/include/applets.src.h	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/include/applets.src.h	2012-03-17 00:58:53.526834671 +0100
+@@ -200,6 +200,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.19.4.orig/include/archive.h busybox-1.19.4/include/archive.h
+--- busybox-1.19.4.orig/include/archive.h	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/include/archive.h	2012-03-17 00:58:08.201100676 +0100
+@@ -96,7 +96,7 @@
  	struct hardlinks_t *cpio__hardlinks_to_create;
  	struct hardlinks_t *cpio__created_hardlinks;
  #endif
@@ -13555,88 +13629,87 @@
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
---- busybox-1.18.1.orig/include/usage.src.h
-+++ busybox-1.18.1/include/usage.src.h
-@@ -1919,6 +1919,82 @@
-      "\n	-l	Limits" \
-      "\n	-u	Summary" \
+diff -Nur busybox-1.19.4.orig/include/usage.src.h busybox-1.19.4/include/usage.src.h
+--- busybox-1.19.4.orig/include/usage.src.h	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/include/usage.src.h	2012-03-17 01:01:02.169888238 +0100
+@@ -19,4 +19,80 @@
+ #define busybox_notes_usage \
+        "Hello world!\n"
  
 +#define ipkg_trivial_usage \
 +	"[options]... sub-command [arguments]..."
 +#define ipkg_full_usage \
-+	"ipkg is an utility to install, remove and manage .ipk packages.\n" \
-+	"\n" \
-+	"Sub-commands:\n" \
-+	"\nPackage Manipulation:\n" \
-+	"\tupdate  		Update list of available packages\n" \
-+	"\tupgrade			Upgrade all installed packages to latest version\n" \
-+	"\tinstall <pkg>		Download and install <pkg> (and dependencies)\n" \
-+	"\tinstall <file.ipk>	Install package <file.ipk>\n" \
-+	"\tconfigure [<pkg>]	Configure unpacked packages\n" \
-+	"\tremove <pkg|regexp>	Remove package <pkg|packages following regexp>\n" \
-+	"\tflag <flag> <pkg> ...	Flag package(s) <pkg>\n" \
-+	"\t <flag>=hold|noprune|user|ok|installed|unpacked (one per invocation)	\n" \
-+	"\n" \
-+	"Informational Commands:\n" \
-+	"\tlist    		List available packages and descriptions\n" \
-+	"\tlist_installed		List all and only the installed packages and description \n" \
-+	"\tfiles <pkg>		List all files belonging to <pkg>\n" \
-+	"\tsearch <file|regexp>		Search for a package providing <file>\n" \
-+	"\tinfo [pkg|regexp [<field>]]	Display all/some info fields for <pkg> or all\n" \
-+	"\tstatus [pkg|regexp [<field>]]	Display all/some status fields for <pkg> or all\n" \
-+	"\tdownload <pkg>		Download <pkg> to current directory.\n" \
-+	"\tcompare_versions <v1> <op> <v2>\n" \
-+	"\t                          compare versions using <= < > >= = << >>\n" \
-+	"\tprint_architecture      prints the architecture.\n" \
-+	"\tprint_installation_architecture\n" \
-+	"\twhatdepends [-A] [pkgname|pat]+\n" \
-+	"\twhatdependsrec [-A] [pkgname|pat]+\n" \
-+	"\twhatprovides [-A] [pkgname|pat]+\n" \
-+	"\twhatconflicts [-A] [pkgname|pat]+\n" \
-+	"\twhatreplaces [-A] [pkgname|pat]+\n" \
-+	"\t                        prints the installation architecture.\n" \
-+	"\n" \
-+	"\nOptions:\n" \
-+	"\t-A                      Query all packages with whatdepends, whatprovides, whatreplaces, whatconflicts\n" \
-+	"\t-V <level>               Set verbosity level to <level>. If no value is\n" \
-+	"\t--verbosity <level>      provided increase verbosity by one. Verbosity levels:\n" \
-+	"\t                         0 errors only\n" \
-+	"\t                         1 normal messages (default)\n" \
-+	"\t                         2 informative messages\n" \
-+	"\t                         3 debug output\n" \
-+	"\t-f <conf_file>		Use <conf_file> as the ipkg configuration file\n" \
-+	"\t-conf <conf_file>	Default configuration file location\n" \
-+	"				is /etc/ipkg.conf\n" \
-+	"\t-d <dest_name>		Use <dest_name> as the the root directory for\n" \
-+	"\t-dest <dest_name>	package installation, removal, upgrading.\n" \
-+	"				<dest_name> should be a defined dest name from\n" \
-+	"				the configuration file, (but can also be a\n" \
-+	"				directory name in a pinch).\n" \
-+	"\t-o <offline_root>	Use <offline_root> as the root directory for\n" \
-+	"\t-offline <offline_root>	offline installation of packages.\n" \
-+	"\t-verbose_wget		more wget messages\n" \
-+	"\n" \
-+	"Force Options (use when ipkg is too smart for its own good):\n" \
-+	"\t-force-depends		Make dependency checks warnings instead of errors\n" \
-+	"\t				Install/remove package in spite of failed dependences\n" \
-+	"\t-force-defaults		Use default options for questions asked by ipkg.\n" \
-+	"				(no prompts). Note that this will not prevent\n" \
-+	"				package installation scripts from prompting.\n" \
-+	"\t-force-reinstall 	Allow ipkg to reinstall a package.\n" \
-+	"\t-force-overwrite 	Allow ipkg to overwrite files from another package during an install.\n" \
-+	"\t-force-downgrade 	Allow ipkg to downgrade packages.\n" \
-+	"\t-force_space            Install even if there does not seem to be enough space.\n" \
-+	"\t-noaction               No action -- test only\n" \
-+	"\t-nodeps                 Do not follow dependences\n" \
-+	"\t-force-removal-of-dependent-packages\n" \
-+	"\t-recursive	 	Allow ipkg to remove package and all that depend on it.\n" \
-+	"\t-test                   No action -- test only\n" \
-+	"\t-t	 	        Specify tmp-dir.\n" \
-+	"\t--tmp-dir 	        Specify tmp-dir.\n" \
-+	"\n" \
-+	"\tregexp could be something like 'pkgname*' '*file*' or similar\n" \
-+	"\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
-+
- #define iplink_trivial_usage \
-        "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
- #define iplink_full_usage "\n\n" \
++ 	"ipkg is an utility to install, remove and manage .ipk packages.\n" \
++ 	"\n" \
++ 	"Sub-commands:\n" \
++ 	"\nPackage Manipulation:\n" \
++ 	"\tupdate  		Update list of available packages\n" \
++ 	"\tupgrade			Upgrade all installed packages to latest version\n" \
++ 	"\tinstall <pkg>		Download and install <pkg> (and dependencies)\n" \
++ 	"\tinstall <file.ipk>	Install package <file.ipk>\n" \
++ 	"\tconfigure [<pkg>]	Configure unpacked packages\n" \
++ 	"\tremove <pkg|regexp>	Remove package <pkg|packages following regexp>\n" \
++ 	"\tflag <flag> <pkg> ...	Flag package(s) <pkg>\n" \
++ 	"\t <flag>=hold|noprune|user|ok|installed|unpacked (one per invocation)	\n" \
++ 	"\n" \
++ 	"Informational Commands:\n" \
++ 	"\tlist    		List available packages and descriptions\n" \
++ 	"\tlist_installed		List all and only the installed packages and description \n" \
++ 	"\tfiles <pkg>		List all files belonging to <pkg>\n" \
++ 	"\tsearch <file|regexp>		Search for a package providing <file>\n" \
++ 	"\tinfo [pkg|regexp [<field>]]	Display all/some info fields for <pkg> or all\n" \
++ 	"\tstatus [pkg|regexp [<field>]]	Display all/some status fields for <pkg> or all\n" \
++ 	"\tdownload <pkg>		Download <pkg> to current directory.\n" \
++ 	"\tcompare_versions <v1> <op> <v2>\n" \
++ 	"\t                          compare versions using <= < > >= = << >>\n" \
++ 	"\tprint_architecture      prints the architecture.\n" \
++ 	"\tprint_installation_architecture\n" \
++ 	"\twhatdepends [-A] [pkgname|pat]+\n" \
++ 	"\twhatdependsrec [-A] [pkgname|pat]+\n" \
++ 	"\twhatprovides [-A] [pkgname|pat]+\n" \
++ 	"\twhatconflicts [-A] [pkgname|pat]+\n" \
++ 	"\twhatreplaces [-A] [pkgname|pat]+\n" \
++ 	"\t                        prints the installation architecture.\n" \
++ 	"\n" \
++ 	"\nOptions:\n" \
++ 	"\t-A                      Query all packages with whatdepends, whatprovides, whatreplaces, whatconflicts\n" \
++ 	"\t-V <level>               Set verbosity level to <level>. If no value is\n" \
++ 	"\t--verbosity <level>      provided increase verbosity by one. Verbosity levels:\n" \
++ 	"\t                         0 errors only\n" \
++ 	"\t                         1 normal messages (default)\n" \
++ 	"\t                         2 informative messages\n" \
++ 	"\t                         3 debug output\n" \
++ 	"\t-f <conf_file>		Use <conf_file> as the ipkg configuration file\n" \
++ 	"\t-conf <conf_file>	Default configuration file location\n" \
++ 	"				is /etc/ipkg.conf\n" \
++ 	"\t-d <dest_name>		Use <dest_name> as the the root directory for\n" \
++ 	"\t-dest <dest_name>	package installation, removal, upgrading.\n" \
++ 	"				<dest_name> should be a defined dest name from\n" \
++ 	"				the configuration file, (but can also be a\n" \
++ 	"				directory name in a pinch).\n" \
++ 	"\t-o <offline_root>	Use <offline_root> as the root directory for\n" \
++ 	"\t-offline <offline_root>	offline installation of packages.\n" \
++ 	"\t-verbose_wget		more wget messages\n" \
++ 	"\n" \
++ 	"Force Options (use when ipkg is too smart for its own good):\n" \
++ 	"\t-force-depends		Make dependency checks warnings instead of errors\n" \
++ 	"\t				Install/remove package in spite of failed dependences\n" \
++ 	"\t-force-defaults		Use default options for questions asked by ipkg.\n" \
++ 	"				(no prompts). Note that this will not prevent\n" \
++ 	"				package installation scripts from prompting.\n" \
++ 	"\t-force-reinstall 	Allow ipkg to reinstall a package.\n" \
++ 	"\t-force-overwrite 	Allow ipkg to overwrite files from another package during an install.\n" \
++ 	"\t-force-downgrade 	Allow ipkg to downgrade packages.\n" \
++ 	"\t-force_space            Install even if there does not seem to be enough space.\n" \
++ 	"\t-noaction               No action -- test only\n" \
++ 	"\t-nodeps                 Do not follow dependences\n" \
++ 	"\t-force-removal-of-dependent-packages\n" \
++ 	"\t-recursive	 	Allow ipkg to remove package and all that depend on it.\n" \
++ 	"\t-test                   No action -- test only\n" \
++ 	"\t-t	 	        Specify tmp-dir.\n" \
++ 	"\t--tmp-dir 	        Specify tmp-dir.\n" \
++ 	"\n" \
++ 	"\tregexp could be something like 'pkgname*' '*file*' or similar\n" \
++ 	"\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
++ 
+ #endif

package/busybox/patches/003-defaults.patch

@@ -1,7 +1,7 @@
-diff -Naurp busybox-1.18.4/Config.in busybox-1.18.4.patched/Config.in
---- busybox-1.18.4/Config.in	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/Config.in	2011-04-12 17:11:37.904996819 +0200
-@@ -15,7 +15,7 @@ menu "General Configuration"
+diff -Nur busybox-1.19.4.orig/Config.in busybox-1.19.4/Config.in
+--- busybox-1.19.4.orig/Config.in	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/Config.in	2012-03-20 16:07:34.206229130 +0100
+@@ -15,7 +15,7 @@
  
  config DESKTOP
  	bool "Enable options for full-blown desktop systems"
@@ -10,7 +10,7 @@ diff -Naurp busybox-1.18.4/Config.in busybox-1.18.4.patched/Config.in
  	help
  	  Enable options and features which are not essential.
  	  Select this only if you plan to use busybox on full-blown
-@@ -32,7 +32,7 @@ config EXTRA_COMPAT
+@@ -32,7 +32,7 @@
  
  config INCLUDE_SUSv2
  	bool "Enable obsolete features removed before SUSv3"
@@ -19,10 +19,10 @@ diff -Naurp busybox-1.18.4/Config.in busybox-1.18.4.patched/Config.in
  	help
  	  This option will enable backwards compatibility with SuSv2,
  	  specifically, old-style numeric options ('command -1 <file>')
-diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/Config.src
---- busybox-1.18.4/archival/Config.src	2011-04-12 17:11:13.204993284 +0200
-+++ busybox-1.18.4.patched/archival/Config.src	2011-04-12 17:11:37.905996921 +0200
-@@ -79,7 +79,7 @@ config FEATURE_AR_CREATE
+diff -Nur busybox-1.19.4.orig/archival/Config.src busybox-1.19.4/archival/Config.src
+--- busybox-1.19.4.orig/archival/Config.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/archival/Config.src	2012-03-20 16:07:34.206229130 +0100
+@@ -79,7 +79,7 @@
  
  config BUNZIP2
  	bool "bunzip2"
@@ -31,7 +31,7 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  bunzip2 is a compression utility using the Burrows-Wheeler block
  	  sorting text compression algorithm, and Huffman coding. Compression
-@@ -92,7 +92,7 @@ config BUNZIP2
+@@ -92,7 +92,7 @@
  
  config BZIP2
  	bool "bzip2"
@@ -40,7 +40,7 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  bzip2 is a compression utility using the Burrows-Wheeler block
  	  sorting text compression algorithm, and Huffman coding. Compression
-@@ -105,7 +105,7 @@ config BZIP2
+@@ -105,7 +105,7 @@
  
  config CPIO
  	bool "cpio"
@@ -49,7 +49,7 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  cpio is an archival utility program used to create, modify, and
  	  extract contents from archives.
-@@ -210,19 +210,19 @@ config IPKG
+@@ -204,19 +204,19 @@
  
  config RPM2CPIO
  	bool "rpm2cpio"
@@ -72,7 +72,7 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  tar is an archiving program. It's commonly used with gzip to
  	  create compressed archives. It's probably the most widely used
-@@ -329,7 +329,7 @@ config UNCOMPRESS
+@@ -323,7 +323,7 @@
  
  config UNLZMA
  	bool "unlzma"
@@ -81,7 +81,7 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
  	  compression algorithm, and range coding. Compression
-@@ -360,7 +360,7 @@ config LZMA
+@@ -354,7 +354,7 @@
  
  config UNXZ
  	bool "unxz"
@@ -90,10 +90,10 @@ diff -Naurp busybox-1.18.4/archival/Config.src busybox-1.18.4.patched/archival/C
  	help
  	  unxz is a unlzma successor.
  
-diff -Naurp busybox-1.18.4/editors/Config.src busybox-1.18.4.patched/editors/Config.src
---- busybox-1.18.4/editors/Config.src	2011-03-13 02:45:06.000000000 +0100
-+++ busybox-1.18.4.patched/editors/Config.src	2011-04-12 17:11:37.905996921 +0200
-@@ -31,7 +31,7 @@ config CMP
+diff -Nur busybox-1.19.4.orig/editors/Config.src busybox-1.19.4/editors/Config.src
+--- busybox-1.19.4.orig/editors/Config.src	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/editors/Config.src	2012-03-20 16:07:34.206229130 +0100
+@@ -31,7 +31,7 @@
  
  config DIFF
  	bool "diff"
@@ -102,7 +102,7 @@ diff -Naurp busybox-1.18.4/editors/Config.src busybox-1.18.4.patched/editors/Con
  	help
  	  diff compares two files or directories and outputs the
  	  differences between them in a form that can be given to
-@@ -62,7 +62,7 @@ config ED
+@@ -62,7 +62,7 @@
  
  config SED
  	bool "sed"
@@ -111,10 +111,10 @@ diff -Naurp busybox-1.18.4/editors/Config.src busybox-1.18.4.patched/editors/Con
  	help
  	  sed is used to perform text transformations on a file
  	  or input from a pipeline.
-diff -Naurp busybox-1.18.4/editors/patch.c busybox-1.18.4.patched/editors/patch.c
---- busybox-1.18.4/editors/patch.c	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/editors/patch.c	2011-04-12 17:11:37.905996921 +0200
-@@ -27,7 +27,7 @@
+diff -Nur busybox-1.19.4.orig/editors/patch.c busybox-1.19.4/editors/patch.c
+--- busybox-1.19.4.orig/editors/patch.c	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/editors/patch.c	2012-03-20 16:07:34.206229130 +0100
+@@ -24,7 +24,7 @@
  
  //config:config PATCH
  //config:	bool "patch"
@@ -123,10 +123,10 @@ diff -Naurp busybox-1.18.4/editors/patch.c busybox-1.18.4.patched/editors/patch.
  //config:	help
  //config:	  Apply a unified diff formatted patch.
  
-diff -Naurp busybox-1.18.4/findutils/find.c busybox-1.18.4.patched/findutils/find.c
---- busybox-1.18.4/findutils/find.c	2011-04-12 17:11:22.887000207 +0200
-+++ busybox-1.18.4.patched/findutils/find.c	2011-04-12 17:21:04.441000928 +0200
-@@ -59,7 +59,7 @@
+diff -Nur busybox-1.19.4.orig/findutils/find.c busybox-1.19.4/findutils/find.c
+--- busybox-1.19.4.orig/findutils/find.c	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/findutils/find.c	2012-03-20 16:07:34.206229130 +0100
+@@ -55,7 +55,7 @@
  
  //config:config FIND
  //config:	bool "find"
@@ -135,9 +135,9 @@ diff -Naurp busybox-1.18.4/findutils/find.c busybox-1.18.4.patched/findutils/fin
  //config:	help
  //config:	  find is used to search your system to find specified files.
  //config:
-diff -Naurp busybox-1.18.4/findutils/grep.c busybox-1.18.4.patched/findutils/grep.c
---- busybox-1.18.4/findutils/grep.c	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/findutils/grep.c	2011-04-12 17:21:09.828998153 +0200
+diff -Nur busybox-1.19.4.orig/findutils/grep.c busybox-1.19.4/findutils/grep.c
+--- busybox-1.19.4.orig/findutils/grep.c	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/findutils/grep.c	2012-03-20 16:07:34.206229130 +0100
 @@ -26,7 +26,7 @@
  
  //config:config GREP
@@ -147,67 +147,73 @@ diff -Naurp busybox-1.18.4/findutils/grep.c busybox-1.18.4.patched/findutils/gre
  //config:	help
  //config:	  grep is used to search files for a specified pattern.
  //config:
-diff -Naurp busybox-1.18.4/miscutils/Config.src busybox-1.18.4.patched/miscutils/Config.src
---- busybox-1.18.4/miscutils/Config.src	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/miscutils/Config.src	2011-04-12 17:19:11.872999667 +0200
-@@ -362,7 +362,7 @@ endchoice
- 
- config LESS
- 	bool "less"
--	default y
-+	default n
- 	help
- 	  'less' is a pager, meaning that it displays text files. It possesses
- 	  a wide array of features, and is an improvement over 'more'.
-@@ -428,7 +428,7 @@ config FEATURE_LESS_LINENUMS
+diff -Nur busybox-1.19.4.orig/include/applets.src.h busybox-1.19.4/include/applets.src.h
+--- busybox-1.19.4.orig/include/applets.src.h	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/include/applets.src.h	2012-03-20 16:12:28.806228451 +0100
+@@ -244,9 +244,9 @@
+ IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
+ IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
+ IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
+-IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
++//IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
+ IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
+-IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
++//IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
+ //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3))
+ IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix))
+ IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser))
+diff -Nur busybox-1.19.4.orig/miscutils/Config.src busybox-1.19.4/miscutils/Config.src
+--- busybox-1.19.4.orig/miscutils/Config.src	2012-02-04 20:24:55.000000000 +0100
++++ busybox-1.19.4/miscutils/Config.src	2012-03-20 16:07:34.206229130 +0100
+@@ -362,7 +362,7 @@
  
  config HDPARM
  	bool "hdparm"
 -	default y
 +	default n
- 	depends on PLATFORM_LINUX
+ 	select PLATFORM_LINUX
  	help
  	  Get/Set hard drive parameters. Primarily intended for ATA
-@@ -663,7 +663,7 @@ config WALL
+@@ -600,7 +600,7 @@
  
  config WATCHDOG
  	bool "watchdog"
 -	default y
 +	default n
- 	depends on PLATFORM_LINUX
+ 	select PLATFORM_LINUX
  	help
  	  The watchdog utility is used with hardware or software watchdog
-diff -Naurp busybox-1.18.4/networking/Config.src busybox-1.18.4.patched/networking/Config.src
---- busybox-1.18.4/networking/Config.src	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/networking/Config.src	2011-04-12 17:16:48.182999877 +0200
-@@ -64,7 +64,7 @@ config ARPING
+diff -Nur busybox-1.19.4.orig/networking/Config.src busybox-1.19.4/networking/Config.src
+--- busybox-1.19.4.orig/networking/Config.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/networking/Config.src	2012-03-20 16:07:34.206229130 +0100
+@@ -64,7 +64,7 @@
  
  config BRCTL
  	bool "brctl"
 -	default y
 +	default n
- 	depends on PLATFORM_LINUX
+ 	select PLATFORM_LINUX
  	help
  	  Manage ethernet bridges.
-@@ -97,7 +97,7 @@ config DNSD
+@@ -97,7 +97,7 @@
  
  config ETHER_WAKE
  	bool "ether-wake"
 -	default y
 +	default n
- 	depends on PLATFORM_LINUX
+ 	select PLATFORM_LINUX
  	help
  	  Send a magic packet to wake up sleeping machines.
-@@ -497,7 +497,7 @@ config FEATURE_INETD_RPC
+@@ -498,7 +498,7 @@
  
  config IP
  	bool "ip"
 -	default y
 +	default n
- 	depends on PLATFORM_LINUX
+ 	select PLATFORM_LINUX
  	help
  	  The "ip" applet is a TCP/IP interface configuration and routing
-@@ -986,7 +986,7 @@ config VCONFIG
+@@ -935,7 +935,7 @@
  
  config WGET
  	bool "wget"
@@ -216,24 +222,49 @@ diff -Naurp busybox-1.18.4/networking/Config.src busybox-1.18.4.patched/networki
  	help
  	  wget is a utility for non-interactive download of files from HTTP,
  	  HTTPS, and FTP servers.
-diff -Naurp busybox-1.18.4/util-linux/Config.src busybox-1.18.4.patched/util-linux/Config.src
---- busybox-1.18.4/util-linux/Config.src	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4.patched/util-linux/Config.src	2011-04-12 17:18:25.998990985 +0200
-@@ -378,7 +378,7 @@ config LOSETUP
+diff -Nur busybox-1.19.4.orig/util-linux/Config.src busybox-1.19.4/util-linux/Config.src
+--- busybox-1.19.4.orig/util-linux/Config.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/util-linux/Config.src	2012-03-20 16:09:26.662228452 +0100
+@@ -246,13 +246,6 @@
+ 	  check for and attempt to repair any corruption that occurs to a minix
+ 	  filesystem.
+ 
+-config MKFS_EXT2
+-	bool "mkfs_ext2"
+-	default y
+-	select PLATFORM_LINUX
+-	help
+-	  Utility to create EXT2 filesystems.
+-
+ config MKFS_MINIX
+ 	bool "mkfs_minix"
+ 	default y
+@@ -386,7 +379,7 @@
  
  config LSPCI
  	bool "lspci"
 -	default y
 +	default n
- 	#depends on PLATFORM_LINUX
+ 	#select PLATFORM_LINUX
  	help
  	  lspci is a utility for displaying information about PCI buses in the
-@@ -388,7 +388,7 @@ config LSPCI
+@@ -396,7 +389,7 @@
  
  config LSUSB
  	bool "lsusb"
 -	default y
 +	default n
- 	#depends on PLATFORM_LINUX
+ 	#select PLATFORM_LINUX
  	help
  	  lsusb is a utility for displaying information about USB buses in the
+diff -Nur busybox-1.19.4.orig/util-linux/Kbuild.src busybox-1.19.4/util-linux/Kbuild.src
+--- busybox-1.19.4.orig/util-linux/Kbuild.src	2012-02-04 20:34:24.000000000 +0100
++++ busybox-1.19.4/util-linux/Kbuild.src	2012-03-20 16:10:21.682228369 +0100
+@@ -27,7 +27,6 @@
+ lib-$(CONFIG_LSPCI)             += lspci.o
+ lib-$(CONFIG_LSUSB)             += lsusb.o
+ lib-$(CONFIG_MDEV)              += mdev.o
+-lib-$(CONFIG_MKFS_EXT2)         += mkfs_ext2.o
+ lib-$(CONFIG_MKFS_MINIX)        += mkfs_minix.o
+ lib-$(CONFIG_MKFS_REISER)       += mkfs_reiser.o
+ lib-$(CONFIG_MKFS_VFAT)         += mkfs_vfat.o

package/busybox/patches/004-remove-cflags.patch

@@ -1,22 +0,0 @@
-diff -Nur busybox-1.18.1.orig/Makefile.flags busybox-1.18.1/Makefile.flags
---- busybox-1.18.1.orig/Makefile.flags	2010-12-20 01:41:26.000000000 +0100
-+++ busybox-1.18.1/Makefile.flags	2011-01-27 21:24:51.000000000 +0100
-@@ -57,18 +57,6 @@
- # be fixed..
- #CFLAGS += $(call cc-option,-Wconversion,)
- 
--ifneq ($(CONFIG_DEBUG),y)
--CFLAGS += $(call cc-option,-Os,)
--else
--CFLAGS += $(call cc-option,-g,)
--#CFLAGS += "-D_FORTIFY_SOURCE=2"
--ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
--CFLAGS += $(call cc-option,-O0,)
--else
--CFLAGS += $(call cc-option,-Os,)
--endif
--endif
--
- # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
- ARCH_FPIC ?= -fpic
- ARCH_FPIE ?= -fpie

package/busybox/patches/008-ps.patch

@@ -1,110 +0,0 @@
---- busybox-1.17.2.orig/procps/ps.c	2010-08-23 02:44:35.000000000 +0200
-+++ busybox-1.17.2/procps/ps.c	2010-11-27 23:47:59.000000000 +0100
-@@ -14,8 +14,6 @@
- /* Absolute maximum on output line length */
- enum { MAX_WIDTH = 2*1024 };
- 
--#if ENABLE_DESKTOP
--
- #include <sys/times.h> /* for times() */
- #ifndef AT_CLKTCK
- #define AT_CLKTCK 17
-@@ -544,98 +542,3 @@ int ps_main(int argc UNUSED_PARAM, char 
- 
- 	return EXIT_SUCCESS;
- }
--
--
--#else /* !ENABLE_DESKTOP */
--
--
--int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
--int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
--{
--	procps_status_t *p;
--	int psscan_flags = PSSCAN_PID | PSSCAN_UIDGID
--			| PSSCAN_STATE | PSSCAN_VSZ | PSSCAN_COMM;
--	unsigned terminal_width IF_NOT_FEATURE_PS_WIDE(= 79);
--	enum {
--		OPT_Z = (1 << 0) * ENABLE_SELINUX,
--		OPT_T = (1 << ENABLE_SELINUX) * ENABLE_FEATURE_SHOW_THREADS,
--	};
--	int opts = 0;
--	/* If we support any options, parse argv */
--#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE
--# if ENABLE_FEATURE_PS_WIDE
--	/* -w is a bit complicated */
--	int w_count = 0;
--	opt_complementary = "-:ww";
--	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count);
--	/* if w is given once, GNU ps sets the width to 132,
--	 * if w is given more than once, it is "unlimited"
--	 */
--	if (w_count) {
--		terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
--	} else {
--		get_terminal_width_height(0, &terminal_width, NULL);
--		/* Go one less... */
--		if (--terminal_width > MAX_WIDTH)
--			terminal_width = MAX_WIDTH;
--	}
--# else
--	/* -w is not supported, only -Z and/or -T */
--	opt_complementary = "-";
--	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T"));
--# endif
--#endif
--
--#if ENABLE_SELINUX
--	if ((opts & OPT_Z) && is_selinux_enabled()) {
--		psscan_flags = PSSCAN_PID | PSSCAN_CONTEXT
--				| PSSCAN_STATE | PSSCAN_COMM;
--		puts("  PID CONTEXT                          STAT COMMAND");
--	} else
--#endif
--	{
--		puts("  PID USER       VSZ STAT COMMAND");
--	}
--	if (opts & OPT_T) {
--		psscan_flags |= PSSCAN_TASKS;
--	}
--
--	p = NULL;
--	while ((p = procps_scan(p, psscan_flags)) != NULL) {
--		int len;
--#if ENABLE_SELINUX
--		if (psscan_flags & PSSCAN_CONTEXT) {
--			len = printf("%5u %-32.32s %s  ",
--					p->pid,
--					p->context ? p->context : "unknown",
--					p->state);
--		} else
--#endif
--		{
--			const char *user = get_cached_username(p->uid);
--			//if (p->vsz == 0)
--			//	len = printf("%5u %-8.8s        %s ",
--			//		p->pid, user, p->state);
--			//else
--			{
--				char buf6[6];
--				smart_ulltoa5(p->vsz, buf6, " mgtpezy");
--				buf6[5] = '\0';
--				len = printf("%5u %-8.8s %s %s  ",
--					p->pid, user, buf6, p->state);
--			}
--		}
--
--		{
--			int sz = terminal_width - len;
--			char buf[sz + 1];
--			read_cmdline(buf, sz, p->pid, p->comm);
--			puts(buf);
--		}
--	}
--	if (ENABLE_FEATURE_CLEAN_UP)
--		clear_username_cache();
--	return EXIT_SUCCESS;
--}
--
--#endif /* !ENABLE_DESKTOP */

package/busybox/patches/009-nfs-remount.patch

@@ -1,13 +0,0 @@
-diff -Nur busybox-1.18.4.orig/util-linux/mount.c busybox-1.18.4/util-linux/mount.c
---- busybox-1.18.4.orig/util-linux/mount.c	2011-03-13 02:45:40.000000000 +0100
-+++ busybox-1.18.4/util-linux/mount.c	2011-05-15 03:12:40.000000000 +0200
-@@ -1129,6 +1129,9 @@
- 				continue;
- 			case 20: // "addr" - ignore
- 				continue;
-+                        case -1: // unknown
-+                                if (vfsflags & MS_REMOUNT)
-+                                 continue;
- 			}
- 
- 			val = xatoi_positive(opteq);

package/cluster-glue/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- cluster-glue-1.0.7.orig/Makefile.in	2011-05-24 14:40:31.000000000 +0200
++++ cluster-glue-1.0.7/Makefile.in	2012-03-17 01:31:46.039012581 +0100
+@@ -319,7 +319,7 @@ top_srcdir = @top_srcdir@
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
+ 			  DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+ 
+-SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd hb_report doc
++SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd hb_report
+ all: all-recursive
+ 
+ .SUFFIXES:

package/ebtables/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ebtables
 PKG_VERSION:=		2.0.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6df055d6476d3ce6bd7eed302a39c40c
+PKG_MD5SUM:=		506742a3d44b9925955425a659c1a8d0
 PKG_DESCR:=		ethernet bridging firewall tool
 PKG_SECTION:=		firewall
 PKG_URL:=		http://ebtables.sourceforge.net
@@ -14,8 +14,8 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ebtables/}
 
 PKG_ARCH_DEPENDS:=	!avr32
 
-DISTFILES:=		${PKG_NAME}-v${PKG_VERSION}-3.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-3
+DISTFILES:=		${PKG_NAME}-v${PKG_VERSION}-4.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
 
 include ${TOPDIR}/mk/package.mk
 

package/firefox/Makefile

@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-elf-hack
 
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
+XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3"
 
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin

package/iptables/patches/patch-extensions_libxt_pkttype_c

@@ -0,0 +1,14 @@
+--- iptables-1.4.12.2.orig/extensions/libxt_pkttype.c	2012-01-02 18:19:09.000000000 +0100
++++ iptables-1.4.12.2/extensions/libxt_pkttype.c	2012-03-17 13:49:29.651581491 +0100
+@@ -4,6 +4,11 @@
+  *
+  * Michal Ludvig <michal@logix.cz>
+  */
++
++#define __aligned_u64 __u64 __attribute__((aligned(8)))
++#define __aligned_be64 __be64 __attribute__((aligned(8)))
++#define __aligned_le64 __le64 __attribute__((aligned(8)))
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <xtables.h>

package/kexec-tools/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kexec-tools
-PKG_VERSION:=		2.0.2
+PKG_VERSION:=		2.0.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		bc401cf3262b25ff7c9a51fc76c8ab91
+PKG_MD5SUM:=		1b362abd2e8669171a5ba50a9cc26183
 PKG_DESCR:=		kexec tools
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		zlib
@@ -14,7 +14,7 @@ PKG_BUILDEP:=		zlib
 PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32 !mips
 PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC
 
 include $(TOPDIR)/mk/package.mk

package/llvm/Makefile

@@ -32,7 +32,7 @@ INSTALL_STYLE:=		manual
 
 do-configure:
 	mkdir -p $(WRKBUILD)/BuildTools
-	(cd $(WRKBUILD)/BuildTools; env ac_cv_build_exeext="" ../configure ${CONFIGURE_TRIPLE} --prefix=/usr)
+	(cd $(WRKBUILD)/BuildTools; env ac_cv_build_exeext="" ../configure ${CONFIGURE_TRIPLE} --prefix=/usr --disable-docs)
 
 do-build:
 	env GCC_HONOUR_COPTS=s ${MAKE} -C ${WRKBUILD}/BuildTools

package/mtd/Makefile

@@ -10,6 +10,7 @@ PKG_DESCR:=		MTD utility
 PKG_SECTION:=		fs
 
 PKG_DFLT_MTD:=		y if ADK_TARGET_WITH_MTD
+PKG_CFLINE_MTD:=	depends on ADK_TARGET_WITH_MTD
 
 NO_DISTFILES:=		1
 

package/mysql/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.1.48
+PKG_VERSION:=		5.1.61
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d04c54d1cfbd8c6c8650c8d078f885b2
+PKG_MD5SUM:=		4efd10c69c4c99dbdb8fae3834a6d7b8
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		db
 PKG_DEPENDS:=		libncurses zlib

package/mysql/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- mysql-5.1.48.orig/Makefile.in	2010-06-03 17:54:43.000000000 +0200
-+++ mysql-5.1.48/Makefile.in	2010-07-13 12:29:09.025919648 +0200
-@@ -1134,7 +1134,7 @@ abi_check_all:	$(TEST_PREPROCESSOR_HEADE
- do_abi_check:
- 	set -ex; \
- 	for file in $(abi_headers); do \
--	         @CC@ -E -nostdinc -dI \
-+	         @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
- 	                  -I$(top_srcdir)/include \
- 	                  -I$(top_srcdir)/include/mysql \
- 	                  -I$(top_srcdir)/sql \

package/mysql/patches/patch-include_mysql_h

@@ -1,12 +0,0 @@
---- mysql-5.1.48.orig/include/mysql.h	2010-06-03 17:50:21.000000000 +0200
-+++ mysql-5.1.48/include/mysql.h	2010-07-13 12:29:46.006089563 +0200
-@@ -44,7 +44,9 @@ extern "C" {
- #endif
- 
- #ifndef _global_h				/* If not standard header */
-+#ifndef MYSQL_ABI_CHECK
- #include <sys/types.h>
-+#endif
- #ifdef __LCC__
- #include <winsock2.h>				/* For windows */
- #endif

package/mysql/patches/patch-include_mysql_h_pp

@@ -1,7 +0,0 @@
---- mysql-5.1.48.orig/include/mysql.h.pp	2010-06-03 17:50:12.000000000 +0200
-+++ mysql-5.1.48/include/mysql.h.pp	2010-07-13 12:30:01.375881071 +0200
-@@ -1,4 +1,3 @@
--#include <sys/types.h>
- typedef char my_bool;
- typedef int my_socket;
- #include "mysql_version.h"

package/nand/Makefile

@@ -10,6 +10,7 @@ PKG_DESCR:=		NAND utility
 PKG_SECTION:=		fs
 
 PKG_DFLT_NAND:=		y if ADK_TARGET_WITH_NAND
+PKG_CFLINE_NAND:=	depends on ADK_TARGET_WITH_NAND
 
 NO_DISTFILES:=		1
 

package/nand/src/nand.c

@@ -95,7 +95,7 @@ int nand_info(const char *nand) {
 
 	int fd, ret;
 	mtd_info_t nandinfo;
-	struct nand_oobinfo oobinfo;
+	//struct nand_oobinfo oobinfo;
 	loff_t offset;
 
 	if ((fd = nand_open(nand, O_RDONLY)) < 0) {
@@ -133,6 +133,7 @@ int nand_info(const char *nand) {
 		}
 	}
 	
+	/*
 	if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) {
 		fprintf(stderr, "Unable to get NAND oobinfo\n");
 		return 1;
@@ -141,6 +142,7 @@ int nand_info(const char *nand) {
 	if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) {
 		fprintf(stdout, "NAND device/driver supports autoplacement of OOB\n");
 	}
+	*/
 
 	return 0;
 }
@@ -263,6 +265,7 @@ int nand_write(const char *img, const char *nand, int quiet) {
 		}
 
 		// autoplace ECC ?
+		/*
 		if (autoplace && (old_oobinfo.useecc != MTD_NANDECC_AUTOPLACE)) {
 
 			if (ioctl (fd, MEMSETOOBSEL, &autoplace_oobinfo) != 0) {
@@ -272,6 +275,7 @@ int nand_write(const char *img, const char *nand, int quiet) {
 			}
 			oobinfochanged = 1;
 		}
+		*/
 	}
 
 	oob.length = meminfo.oobsize;
@@ -462,6 +466,7 @@ closeall:
 	close(ifd);
 
 restoreoob:
+	/*
 	if (oobinfochanged == 1) {
 		if (ioctl (fd, MEMSETOOBSEL, &old_oobinfo) != 0) {
 			perror ("MEMSETOOBSEL");
@@ -471,6 +476,7 @@ restoreoob:
 	}
 
 	close(fd);
+	/*
 
 	if ((ifd != STDIN_FILENO) && (imglen > 0)) {
 		perror ("Data was only partially written due to error\n");

package/net-tools/Makefile

@@ -23,7 +23,9 @@ $(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 TARGET_LDFLAGS+=	-lssp
+endif
 
 do-configure:
 	$(CP) ./files/config.* $(WRKBUILD)/

package/nss/Makefile

@@ -4,17 +4,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.12.9
+PKG_VERSION:=		3.13.3
 PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	12
-PKG_PATCH_VERSION:=	9
-PKG_MD5SUM:=		bd32f183ca28440c1744650be31a9ccc
+PKG_MIN_VERSION:=	13
+PKG_PATCH_VERSION:=	3
+PKG_MD5SUM:=		006cb82fa900e9e664b4b14a9b7810ca
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		nspr zlib
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/
+PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!cygwin

package/pciutils/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pciutils
-PKG_VERSION:=		3.1.7
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		f3e349d22a3714b4272b171649ad5235
+PKG_VERSION:=		3.1.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8362de952d95835d8bf5e5d27f723d66
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		zlib

package/sqlite/Makefile

@@ -4,17 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sqlite
-PKG_VERSION:=		3.7.5
+PKG_VERSION:=		3.7.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a9604a82613ade2e7f4c303f233e477f
+PKG_MD5SUM:=		9ed2ca93577b58cfa0d01f64b9312ab9
 PKG_DESCR:=		embeddable SQL database (cli)
 PKG_SECTION:=		db
 PKG_BUILDDEP:=		ncurses readline
 PKG_URL:=		http://www.sqlite.org/
 PKG_SITES:=		http://www.sqlite.org/
 
-DISTFILES:=		sqlite-autoconf-3070500.tar.gz
-WRKDIST=		${WRKDIR}/sqlite-autoconf-3070500
+DISTFILES:=		sqlite-autoconf-3071000.tar.gz
+WRKDIST=		${WRKDIR}/sqlite-autoconf-3071000
 
 PKG_SUBPKGS:=		SQLITE_CLI LIBSQLITE LIBSQLITE_DEV
 PKGSD_LIBSQLITE:=	sqlite library

package/tinycdb/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		tinycdb
 PKG_VERSION:=		0.77
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c00e5fb96c30356ac3b67b2ab5d5641b
+PKG_MD5SUM:=		501ac8a2461eb00393e814155f3750eb
 PKG_DESCR:=		CDB implementation
 PKG_SECTION:=		db
 PKG_URL:=		http://www.corpit.ru/mjt/tinycdb/

package/traceroute/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		traceroute
-PKG_VERSION:=		2.0.16
+PKG_VERSION:=		2.0.18
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3e84c525cdb4184d64aacaf9225e6503
+PKG_MD5SUM:=		b7254149b7f081cce07f4b9e065ba5ef
 PKG_DESCR:=		Utility to trace the route of IP packets
 PKG_SECTION:=		net
 PKG_URL:=		http://traceroute.sourceforge.net/

package/wdfs/Makefile

@@ -15,6 +15,8 @@ PKG_SITES:=		http://noedler.de/projekte/wdfs/
 
 include ${TOPDIR}/mk/package.mk
 
+TARGET_LDFLAGS+=	-lpthread
+
 $(eval $(call PKG_template,WDFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:

rules.mk

@@ -42,6 +42,7 @@ ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SER
 ADK_HOST:=		$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=		$(strip $(subst ",, $(ADK_VENDOR)))
 ADK_TOOLS_ADDPATTERN_ARGS:=	$(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS)))
+ADK_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
 
 ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y)
 ifneq ($(strip $(wildcard $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk)),)

target/linux/config/Config.in.fs

@@ -60,13 +60,13 @@ config ADK_KPACKAGE_KMOD_EXT2_FS
 	prompt "kmod-fs-ext2...................... EXT2 filesystem support"
 	tristate
 	default n
-	depends on !ADK_TARGET_ROOTFS_EXT2_BLOCK
 	depends on !ADK_KERNEL_EXT2_FS
 	help
 	  Ext2 is a standard Linux file system for hard disks.
 
 config ADK_KPACKAGE_KMOD_FS_MBCACHE
 	tristate
+	depends on !ADK_KERNEL_EXT4_FS
 	default n
 
 config ADK_KERNEL_EXT3_FS
@@ -76,7 +76,7 @@ config ADK_KERNEL_EXT3_FS
 config ADK_KPACKAGE_KMOD_EXT3_FS
 	prompt "kmod-fs-ext3...................... EXT3 filesystem support"
 	tristate
-	select ADK_KPACKAGE_KMOD_FS_MBCACHE
+	select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS
 	depends on !ADK_KERNEL_EXT3_FS
 	default n
 	help

target/linux/config/Config.in.netdevice

@@ -411,6 +411,7 @@ config ADK_KPACKAGE_KMOD_HOSTAP
 	select ADK_KPACKAGE_KMOD_MAC80211
 	default n
 	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
+	depends on ADK_TARGET_WITH_PCMCIA
 	help
 	  HostAP Driver for wireless chips.