update busybox to 2.23.0

add upstream patches.
Fix the busybox disable mechanism. When you choose less or
lsusb full blown version, be sure busybox applet is disabled.

17 files changed, 1418 insertions, 1804 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 05d9eea31..271ceb5b7 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.22.1
-PKG_RELEASE:=		2
-PKG_HASH:=		ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b
+PKG_VERSION:=		1.23.0
+PKG_RELEASE:=		1
+PKG_HASH:=		483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		bzip2-host
@@ -32,20 +32,20 @@ BB_MAKE_FLAGS:=		V=1 \
 
 do-configure:
 	# get all symbols from top level config
-	grep BUSYBOX_ $(ADK_TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
+	grep "^BUSYBOX_\|# BUSYBOX" $(ADK_TOPDIR)/.config|grep -v BUSYBOX_DISABLE|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${WRKBUILD}/.config
-	# remove all disabled symbols
-	for i in $$(grep "BUSYBOX_DISABLE" $(ADK_TOPDIR)/.config);do \
-		test -s "$$i" || continue; \
-		grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \
-		${WRKBUILD}/.config.tmp; \
-		cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \
+	cp ${WRKBUILD}/.config ${WRKBUILD}/.config.step1
+	# convert all disabled symbols
+	for i in $$(grep ^BUSYBOX_DISABLE $(ADK_TOPDIR)/.config);do \
+		echo "$$i"; \
+		sym=$${i#BUSYBOX_DISABLE_}; \
+		symbol=$$(echo $$sym|sed -e "s#=y##"); \
+		printf "# CONFIG_$${symbol} is not set\n" >> ${WRKBUILD}/.config; \
 	done
 ifeq ($(ADK_TARGET_UCLINUX),y)
-	echo 'BUSYBOX_NOMMU=y' >> ${WRKBUILD}/.config
+	echo 'CONFIG_NOMMU=y' >> ${WRKBUILD}/.config
 endif
 	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
-	yes '' | PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} oldconfig $(MAKE_TRACE)
 
 do-build:
 	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} busybox
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index eaf7fc1c4..f743bd59f 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -47,6 +47,14 @@ config BUSYBOX_USE_PORTABLE_CODE
 	  compiler other than gcc.
 	  If you do use gcc, this option may needlessly increase code size.
 
+config BUSYBOX_INSTALL_NO_USR
+        bool "Don't use /usr"
+        default n
+        help
+          Disable use of /usr. busybox --install and "make install"
+          will install applets only to /bin and /sbin,
+          never to /usr/bin or /usr/sbin.
+
 config BUSYBOX_PLATFORM_LINUX
 	bool "Enable Linux-specific applets and features"
 	default y
@@ -248,6 +256,26 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	  at shell prompt will list file named 0xff (single char name
 	  with char value 255), not file named '?'.
 
+config BUSYBOX_PAM
+	bool "Support for PAM (Pluggable Authentication Modules)"
+	default n
+	help
+	  Use PAM in some busybox applets (currently login and httpd) instead
+	  of direct access to password database.
+
+config BUSYBOX_FEATURE_USE_SENDFILE
+	bool "Use sendfile system call"
+	default y
+	select PLATFORM_LINUX
+	help
+	  When enabled, busybox will use the kernel sendfile() function
+	  instead of read/write loops to copy data between file descriptors
+	  (for example, cp command does this a lot).
+	  If sendfile() doesn't work, copying code falls back to read/write
+	  loop. sendfile() was originally implemented for faster I/O
+	  from files to sockets, but since Linux 2.6.33 it was extended
+	  to work for many more file types.
+
 config BUSYBOX_LONG_OPTS
 	bool "Support for --long-options"
 	default y
@@ -304,6 +332,16 @@ config BUSYBOX_FEATURE_PIDFILE
 	  This option makes some applets (e.g. crond, syslogd, inetd) write
 	  a pidfile in /var/run. Some applications rely on them.
 
+config BUSYBOX_PID_FILE_PATH
+        string "Path to directory for pidfile"
+        default "/var/run"
+        depends on BUSYBOX_FEATURE_PIDFILE
+        help
+          This is the default path where pidfiles are created.  Applets which
+          allow you to set the pidfile path on the command line will override
+          this value.  The option has no effect on applets that require you to
+          specify a pidfile path.
+
 config BUSYBOX_FEATURE_SUID
 	bool "Support for SUID/SGID handling"
 	default y
@@ -653,6 +691,14 @@ config BUSYBOX_DEBUG_PESSIMIZE
 	  in a much bigger executable that more closely matches the source
 	  code.
 
+config BUSYBOX_UNIT_TEST
+	bool "Build unit tests"
+	default n
+	help
+	  Say Y here if you want to build unit tests (both the framework and
+	  test cases) as a Busybox applet. This results in bigger code, so you
+	  probably don't want this option in production builds.
+
 config BUSYBOX_WERROR
 	bool "Abort compilation on any warning"
 	default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 923e7cb73..46eccd4f1 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -79,6 +79,13 @@ config BUSYBOX_GROUPS
 	default y
 	help
 	  Print the group names associated with current user id.
+
+config BUSYBOX_SHUF
+	bool "shuf"
+	default n
+	help
+	  Generate random permutations
+
 config BUSYBOX_TEST
 	bool "test"
 	default y
@@ -93,6 +100,7 @@ config BUSYBOX_FEATURE_TEST_64
 	depends on BUSYBOX_TEST || BUSYBOX_ASH_BUILTIN_TEST || BUSYBOX_HUSH
 	help
 	  Enable 64-bit support in test.
+
 config BUSYBOX_TOUCH
 	bool "touch"
 	default y
@@ -100,6 +108,14 @@ config BUSYBOX_TOUCH
 	  touch is used to create or change the access and/or
 	  modification timestamp of specified files.
 
+config BUSYBOX_FEATURE_TOUCH_NODEREF
+	bool "Add support for -h"
+	default y
+	depends on BUSYBOX_TOUCH
+	help
+	  Enable touch to have the -h option.
+	  This requires libc support for lutimes() function.
+
 config BUSYBOX_FEATURE_TOUCH_SUSV3
 	bool "Add support for SUSV3 features (-d -t -r)"
 	default y
@@ -132,6 +148,12 @@ config BUSYBOX_FEATURE_TR_EQUIV
 	  useful for cases when no other way of expressing a character
 	  is possible.
 
+config BUSYBOX_UNLINK
+	bool "unlink"
+	default y
+	help
+	  unlink deletes a file by calling unlink()
+
 config BUSYBOX_BASE64
 	bool "base64"
 	default y
@@ -883,6 +905,16 @@ config BUSYBOX_YES
 	  yes is used to repeatedly output a specific string, or
 	  the default string `y'.
 
+comment "Common options"
+
+config BUSYBOX_FEATURE_VERBOSE
+	bool "Support verbose options (usually -v) for various applets"
+	default y
+	help
+	  Enable cp -v, rm -v and similar messages.
+	  Also enables long option (--verbose) if it exists.
+	  Without this option, -v is accepted but ignored.
+
 comment "Common options for cp and mv"
 	depends on BUSYBOX_CP || BUSYBOX_MV
 
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index cb16bbe34..1c761387c 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -129,6 +129,39 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 
 	  This is not clean but helps a lot on serial lines and such.
 
+config BUSYBOX_FEATURE_VI_UNDO
+	bool "Support undo command 'u'"
+	default y
+	depends on BUSYBOX_VI
+	help
+	  Support the 'u' command to undo insertion, deletion, and replacement
+	  of text.
+
+config BUSYBOX_FEATURE_VI_UNDO_QUEUE
+	bool "Enable undo operation queuing"
+	default y
+	depends on BUSYBOX_FEATURE_VI_UNDO
+	help
+	  The vi undo functions can use an intermediate queue to greatly lower
+	  malloc() calls and overhead. When the maximum size of this queue is
+	  reached, the contents of the queue are committed to the undo stack.
+	  This increases the size of the undo code and allows some undo
+	  operations (especially un-typing/backspacing) to be far more useful.
+
+config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
+	int "Maximum undo character queue size"
+	default 256
+	range 32 65536
+	depends on BUSYBOX_FEATURE_VI_UNDO_QUEUE
+	help
+	  This option sets the number of bytes used at runtime for the queue.
+	  Smaller values will create more undo objects and reduce the amount
+	  of typed or backspaced characters that are grouped into one undo
+	  operation; larger values increase the potential size of each undo
+	  and will generally malloc() larger objects and less frequently.
+	  Unless you want more (or less) frequent "undo points" while typing,
+	  you should probably leave this unchanged.
+
 config BUSYBOX_AWK
 	bool "awk"
 	default y
@@ -144,6 +177,17 @@ config BUSYBOX_FEATURE_AWK_LIBM
 	  Enable math functions of the Awk programming language.
 	  NOTE: This will require libm to be present for linking.
 
+config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS
+	bool "Enable a few GNU extensions"
+	default y
+	depends on BUSYBOX_AWK
+	help
+	  Enable a few features from gawk:
+	  * command line option -e AWK_PROGRAM
+	  * simultaneous use of -f and -e on the command line.
+	    This enables the use of awk library files.
+	    Ex: awk -f mylib.awk -e '{print myfunction($1);}' ...
+
 config BUSYBOX_CMP
 	bool "cmp"
 	default y
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 25d925288..d499d13ee 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -99,6 +99,16 @@ config BUSYBOX_FEATURE_FIND_EXEC
 	  Support the 'find -exec' option for executing commands based upon
 	  the files matched.
 
+config BUSYBOX_FEATURE_FIND_EXEC_PLUS
+	bool "Enable -exec ... {} +"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_EXEC
+	help
+	  Support the 'find -exec ... {} +' option for executing commands
+	  for all matched files at once.
+	  Without this option, -exec + is a synonym for -exec ;
+	  (IOW: it works correctly, but without expected speedup)
+
 config BUSYBOX_FEATURE_FIND_USER
 	bool "Enable -user: username/uid matching"
 	default y
@@ -221,6 +231,7 @@ config BUSYBOX_FEATURE_GREP_CONTEXT
 	  Print the specified number of leading (-B) and/or trailing (-A)
 	  context surrounding our matching lines.
 	  Print the specified number of context lines (-C).
+
 config BUSYBOX_XARGS
 	bool "xargs"
 	default y
@@ -260,4 +271,11 @@ config BUSYBOX_FEATURE_XARGS_SUPPORT_ZERO_TERM
 	  instead of whitespace, and the quotes and backslash
 	  are not special.
 
+config BUSYBOX_FEATURE_XARGS_SUPPORT_REPL_STR
+	bool "Enable -I STR: string to replace"
+	default y
+	depends on BUSYBOX_XARGS
+	help
+	  Support -I STR and -i[STR] options.
+
 endmenu
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 5538f0139..d58e910b8 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -129,6 +129,13 @@ config BUSYBOX_FEATURE_CHECK_NAMES
 	  For compatibility with Samba machine accounts "$" is also supported
 	  at the end of the user or group name.
 
+config BUSYBOX_LAST_ID
+	int "Last valid uid or gid for adduser and addgroup"
+	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
+	default 60000
+	help
+	  Last valid uid or gid for adduser and addgroup
+
 config BUSYBOX_FIRST_SYSTEM_ID
 	int "First valid system uid or gid for adduser and addgroup"
 	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index a2475a161..6e68fc786 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -767,6 +767,14 @@ config BUSYBOX_FEATURE_NTPD_SERVER
 	  Make ntpd usable as a NTP server. If you disable this option
 	  ntpd will be usable only as a NTP client.
 
+config BUSYBOX_FEATURE_NTPD_CONF
+	bool "Make ntpd understand /etc/ntp.conf"
+	default n
+	depends on BUSYBOX_NTPD
+	help
+	  Make ntpd look in /etc/ntp.conf for peers. Only "server address"
+	  is supported.
+
 config BUSYBOX_PSCAN
 	bool "pscan"
 	default n
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index e0f20fc49..35e5ce538 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -89,6 +89,17 @@ config BUSYBOX_FEATURE_UDHCPC_ARPING
 	  will DHCPDECLINE the offer if the address is in use,
 	  and restart the discover process.
 
+config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT
+	bool "Do not pass malformed host and domain names"
+	default y
+	depends on BUSYBOX_UDHCPC
+	help
+	  If selected, udhcpc will check some options (such as option 12 -
+	  hostname) and if they don't look like valid hostnames
+	  (for example, if they start with dash or contain spaces),
+	  they will be replaced with string "bad" when exporting
+	  to the environment.
+
 config BUSYBOX_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
 	default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index a82abc8b2..b710555fa 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -12,6 +12,20 @@ config BUSYBOX_BLOCKDEV
 	help
 	  Performs some ioctls with block devices.
 
+config BUSYBOX_FATATTR
+	bool "fatattr"
+	default n
+	select PLATFORM_LINUX
+	help
+	  fatattr lists or changes the file attributes on a fat file system.
+
+config BUSYBOX_FSTRIM
+	bool "fstrim"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Discard unused blocks on a mounted filesystem.
+
 config BUSYBOX_MDEV
 	bool "mdev"
 	default y
@@ -153,7 +167,6 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
 config BUSYBOX_FBSET
 	bool "fbset"
 	depends on !BUSYBOX_DISABLE_FBSET
-	default y if ADK_TARGET_WITH_VGA
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -317,6 +330,13 @@ config BUSYBOX_FSCK_MINIX
 	  check for and attempt to repair any corruption that occurs to a minix
 	  filesystem.
 
+config BUSYBOX_MKFS_EXT2
+	bool "mkfs_ext2"
+	default n
+	select PLATFORM_LINUX
+	help
+	  Utility to create EXT2 filesystems.
+
 config BUSYBOX_MKFS_MINIX
 	bool "mkfs_minix"
 	default n
@@ -345,7 +365,6 @@ config BUSYBOX_MKFS_REISER
 
 config BUSYBOX_MKFS_VFAT
 	bool "mkfs_vfat"
-	default y if ADK_TARGET_WITH_MMC
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -427,7 +446,7 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
 
 config BUSYBOX_IPCRM
 	bool "ipcrm"
-	default y
+	default n
 	help
 	  The ipcrm utility allows the removal of System V interprocess
 	  communication (IPC) objects and the associated data structures
@@ -435,7 +454,7 @@ config BUSYBOX_IPCRM
 
 config BUSYBOX_IPCS
 	bool "ipcs"
-	default y
+	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The ipcs utility is used to provide information on the currently
@@ -453,8 +472,6 @@ config BUSYBOX_LOSETUP
 config BUSYBOX_LSPCI
 	bool "lspci"
 	depends on !BUSYBOX_DISABLE_LSPCI
-	default y if ADK_TARGET_WITH_PCI
-	default y if ADK_TARGET_WITH_MINIPCI
 	default n
 	#select PLATFORM_LINUX
 	help
@@ -466,7 +483,6 @@ config BUSYBOX_LSPCI
 config BUSYBOX_LSUSB
 	bool "lsusb"
 	depends on !BUSYBOX_DISABLE_LSUSB
-	default y if ADK_TARGET_WITH_USB
 	default n
 	#select PLATFORM_LINUX
 	help
@@ -477,7 +493,7 @@ config BUSYBOX_LSUSB
 
 config BUSYBOX_MKSWAP
 	bool "mkswap"
-	default y
+	default n
 	help
 	  The mkswap utility is used to configure a file or disk partition as
 	  Linux swap space. This allows Linux to use the entire file or
@@ -609,6 +625,7 @@ config BUSYBOX_PIVOT_ROOT
 
 config BUSYBOX_RDATE
 	bool "rdate"
+	depends on !BUSYBOX_DISABLE_RDATE
 	default n
 	help
 	  The rdate utility allows you to synchronize the date and time of your
@@ -661,7 +678,7 @@ config BUSYBOX_SETARCH
 
 config BUSYBOX_SWAPONOFF
 	bool "swaponoff"
-	default y
+	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  This option enables both the 'swapon' and the 'swapoff' utilities.
@@ -671,6 +688,15 @@ config BUSYBOX_SWAPONOFF
 	  space. If you are not using any swap space, you can leave this
 	  option disabled.
 
+config BUSYBOX_FEATURE_SWAPON_DISCARD
+	bool "Support discard option -d"
+	default n
+	depends on BUSYBOX_SWAPONOFF
+	help
+	  Enable support for discarding swap area blocks at swapon and/or as
+	  the kernel frees them. This option enables both the -d option on
+	  'swapon' and the 'discard' option for swap entries in /etc/fstab.
+
 config BUSYBOX_FEATURE_SWAPON_PRI
 	bool "Support priority option -p"
 	default y
@@ -800,6 +826,16 @@ config BUSYBOX_FEATURE_VOLUMEID_REISERFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_F2FS
+	bool "f2fs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  F2FS (aka Flash-Friendly File System) is a log-structured file system,
+	  which is adapted to newer forms of storage. F2FS also remedies some
+	  known issues of the older log structured file systems, such as high
+	  cleaning overhead.
+
 config BUSYBOX_FEATURE_VOLUMEID_FAT
 	bool "fat filesystem"
 	default y
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 3925d1e1b..5e8e8b346 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,17 +1,6 @@
-diff -Nur busybox-1.22.1.orig/Makefile busybox-1.22.1/Makefile
---- busybox-1.22.1.orig/Makefile	2014-01-20 03:39:28.000000000 +0100
-+++ busybox-1.22.1/Makefile	2014-05-23 21:12:06.000000000 +0200
-@@ -466,6 +466,7 @@
- libs-y		:= \
- 		archival/ \
- 		archival/libarchive/ \
-+		archival/libipkg/ \
- 		console-tools/ \
- 		coreutils/ \
- 		coreutils/libcoreutils/ \
-diff -Nur busybox-1.22.1.orig/archival/ipkg.c busybox-1.22.1/archival/ipkg.c
---- busybox-1.22.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/ipkg.c	2014-05-23 21:19:24.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/ipkg.c busybox-1.23.0/archival/ipkg.c
+--- busybox-1.23.0.orig/archival/ipkg.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/ipkg.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,39 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -52,9 +41,9 @@ diff -Nur busybox-1.22.1.orig/archival/ipkg.c busybox-1.22.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libarchive/Kbuild.src busybox-1.22.1/archival/libarchive/Kbuild.src
---- busybox-1.22.1.orig/archival/libarchive/Kbuild.src	2014-01-09 19:15:44.000000000 +0100
-+++ busybox-1.22.1/archival/libarchive/Kbuild.src	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libarchive/Kbuild.src busybox-1.23.0/archival/libarchive/Kbuild.src
+--- busybox-1.23.0.orig/archival/libarchive/Kbuild.src	2014-10-04 15:35:57.000000000 -0500
++++ busybox-1.23.0/archival/libarchive/Kbuild.src	2015-01-09 11:18:22.424197243 -0600
 @@ -25,14 +25,14 @@
  \
  	data_align.o \
@@ -72,73 +61,9 @@ diff -Nur busybox-1.22.1.orig/archival/libarchive/Kbuild.src busybox-1.22.1/arch
  	get_header_tar_bz2.o \
  	get_header_tar_lzma.o \
  
-diff -Nur busybox-1.22.1.orig/archival/libipkg/Kbuild busybox-1.22.1/archival/libipkg/Kbuild
---- busybox-1.22.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/Kbuild	2014-05-23 21:12:06.000000000 +0200
-@@ -0,0 +1,60 @@
-+# Makefile for busybox
-+#
-+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
-+# Copyright (C) 2006 OpenWrt.org
-+#
-+# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
-+
-+LIBIPKG_CORE_OBJS:= \
-+	args.o \
-+	libipkg.o \
-+	user.o \
-+
-+LIBIPKG_CMD_OBJS:= \
-+	ipkg_cmd.o \
-+	ipkg_configure.o \
-+	ipkg_download.o \
-+	ipkg_install.o \
-+	ipkg_remove.o \
-+	ipkg_upgrade.o \
-+
-+LIBIPKG_DB_OBJS:= \
-+	hash_table.o \
-+	ipkg_conf.o \
-+	ipkg_utils.o \
-+	pkg.o \
-+	pkg_depends.o \
-+	pkg_extract.o \
-+	pkg_hash.o \
-+	pkg_parse.o \
-+	pkg_vec.o \
-+
-+LIBIPKG_LIST_OBJS:= \
-+	conffile.o \
-+	conffile_list.o \
-+	nv_pair.o \
-+	nv_pair_list.o \
-+	pkg_dest.o \
-+	pkg_dest_list.o \
-+	pkg_src.o \
-+	pkg_src_list.o \
-+	str_list.o \
-+	void_list.o \
-+
-+LIBIPKG_UTIL_OBJS:= \
-+	file_util.o \
-+	ipkg_message.o \
-+	str_util.o \
-+	xsystem.o \
-+
-+lib-y :=
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
-+
-+ifeq ($(strip $(IPKG_ARCH)),)
-+IPKG_ARCH:=$(TARGET_ARCH)
-+endif
-+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.22.1.orig/archival/libipkg/args.c busybox-1.22.1/archival/libipkg/args.c
---- busybox-1.22.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/args.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/args.c busybox-1.23.0/archival/libipkg/args.c
+--- busybox-1.23.0.orig/archival/libipkg/args.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/args.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -382,9 +307,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/args.c busybox-1.22.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/args.h busybox-1.22.1/archival/libipkg/args.h
---- busybox-1.22.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/args.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/args.h busybox-1.23.0/archival/libipkg/args.h
+--- busybox-1.23.0.orig/archival/libipkg/args.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/args.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -458,9 +383,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/args.h busybox-1.22.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.c busybox-1.22.1/archival/libipkg/conffile.c
---- busybox-1.22.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/conffile.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile.c busybox-1.23.0/archival/libipkg/conffile.c
+--- busybox-1.23.0.orig/archival/libipkg/conffile.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/conffile.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -527,9 +452,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.c busybox-1.22.1/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.h busybox-1.22.1/archival/libipkg/conffile.h
---- busybox-1.22.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/conffile.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile.h busybox-1.23.0/archival/libipkg/conffile.h
+--- busybox-1.23.0.orig/archival/libipkg/conffile.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/conffile.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -561,9 +486,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.h busybox-1.22.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.c busybox-1.22.1/archival/libipkg/conffile_list.c
---- busybox-1.22.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/conffile_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile_list.c busybox-1.23.0/archival/libipkg/conffile_list.c
+--- busybox-1.23.0.orig/archival/libipkg/conffile_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/conffile_list.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -612,9 +537,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.c busybox-1.22.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.h busybox-1.22.1/archival/libipkg/conffile_list.h
---- busybox-1.22.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/conffile_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile_list.h busybox-1.23.0/archival/libipkg/conffile_list.h
+--- busybox-1.23.0.orig/archival/libipkg/conffile_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/conffile_list.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -652,9 +577,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.h busybox-1.22.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.c busybox-1.22.1/archival/libipkg/file_util.c
---- busybox-1.22.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/file_util.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/file_util.c busybox-1.23.0/archival/libipkg/file_util.c
+--- busybox-1.23.0.orig/archival/libipkg/file_util.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/file_util.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -842,9 +767,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.c busybox-1.22.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.h busybox-1.22.1/archival/libipkg/file_util.h
---- busybox-1.22.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/file_util.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/file_util.h busybox-1.23.0/archival/libipkg/file_util.h
+--- busybox-1.23.0.orig/archival/libipkg/file_util.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/file_util.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -875,9 +800,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.h busybox-1.22.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.c busybox-1.22.1/archival/libipkg/hash_table.c
---- busybox-1.22.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/hash_table.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/hash_table.c busybox-1.23.0/archival/libipkg/hash_table.c
+--- busybox-1.23.0.orig/archival/libipkg/hash_table.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/hash_table.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -1034,9 +959,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.c busybox-1.22.1/archi
 +    }
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.h busybox-1.22.1/archival/libipkg/hash_table.h
---- busybox-1.22.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/hash_table.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/hash_table.h busybox-1.23.0/archival/libipkg/hash_table.h
+--- busybox-1.23.0.orig/archival/libipkg/hash_table.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/hash_table.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1082,81 +1007,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.h busybox-1.22.1/archi
 +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.22.1.orig/archival/libipkg/ipkg.h busybox-1.22.1/archival/libipkg/ipkg.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg.h	2014-05-23 21:12:06.000000000 +0200
-@@ -0,0 +1,68 @@
-+/* ipkg.h - the itsy package management system
-+
-+   Carl D. Worth
-+
-+   Copyright (C) 2001 University of Southern California
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+*/
-+
-+#ifndef IPKG_H
-+#define IPKG_H
-+
-+#include "libbb.h"
-+
-+#include "ipkg_includes.h"
-+#include "ipkg_conf.h"
-+#include "ipkg_message.h"
-+
-+#define IPKG_PKG_EXTENSION ".ipk"
-+#define DPKG_PKG_EXTENSION ".deb"
-+
-+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-+#define IPKG_PKG_VERSION_SEP_CHAR '_'
-+
-+#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-+#define IPKG_LISTS_DIR_SUFFIX "lists"
-+#define IPKG_INFO_DIR_SUFFIX "info"
-+#define IPKG_STATUS_FILE_SUFFIX "status"
-+
-+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-+
-+#define IPKG_LIST_DESCRIPTION_LENGTH 128
-+
-+#define IPKG_VERSION "1.00"
-+
-+
-+enum ipkg_error {
-+    IPKG_SUCCESS = 0,
-+    IPKG_PKG_DEPS_UNSATISFIED,
-+    IPKG_PKG_IS_ESSENTIAL,
-+    IPKG_PKG_HAS_DEPENDENTS,
-+    IPKG_PKG_HAS_NO_CANDIDATE
-+};
-+typedef enum ipkg_error ipkg_error_t;
-+
-+extern int ipkg_state_changed;
-+
-+
-+struct errlist {
-+    char * errmsg;
-+    struct errlist * next;
-+} ;
-+
-+extern struct errlist* error_list;
-+
-+extern ipkg_conf_t *global_conf;
-+
-+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
-+
-+#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.22.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_cmd.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.23.0/archival/libipkg/ipkg_cmd.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_cmd.c	2015-01-09 11:30:09.308190771 -0600
 @@ -0,0 +1,1367 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -1396,9 +1249,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.22.1/archiva
 +		   in = fopen (tmp_file_name, "r");
 +		   out = fopen (list_file_name, "w");
 +		   if (in && out) {
-+			transformer_aux_data_t aux;
-+			init_transformer_aux_data(&aux);
-+			inflate_unzip (&aux, fileno(in), fileno(out));
++			transformer_state_t xstate;
++			init_transformer_state(&xstate);
++			inflate_unzip (&xstate);
 +		   } else
 +			err = 1;
 +		   if (in)
@@ -2525,9 +2378,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.22.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.22.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_cmd.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.23.0/archival/libipkg/ipkg_cmd.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_cmd.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2570,9 +2423,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.22.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.c busybox-1.22.1/archival/libipkg/ipkg_conf.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_conf.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_conf.c busybox-1.23.0/archival/libipkg/ipkg_conf.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_conf.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_conf.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,739 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3313,9 +3166,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.c busybox-1.22.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.h busybox-1.22.1/archival/libipkg/ipkg_conf.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_conf.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_conf.h busybox-1.23.0/archival/libipkg/ipkg_conf.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_conf.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_conf.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3424,9 +3277,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.h busybox-1.22.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.c busybox-1.22.1/archival/libipkg/ipkg_configure.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_configure.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_configure.c busybox-1.23.0/archival/libipkg/ipkg_configure.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_configure.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_configure.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3468,9 +3321,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.c busybox-1.22.1/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.h busybox-1.22.1/archival/libipkg/ipkg_configure.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_configure.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_configure.h busybox-1.23.0/archival/libipkg/ipkg_configure.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_configure.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_configure.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3497,9 +3350,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.h busybox-1.22.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.c busybox-1.22.1/archival/libipkg/ipkg_download.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_download.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_download.c busybox-1.23.0/archival/libipkg/ipkg_download.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_download.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_download.c	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3696,9 +3549,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.c busybox-1.22.1/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.h busybox-1.22.1/archival/libipkg/ipkg_download.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_download.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_download.h busybox-1.23.0/archival/libipkg/ipkg_download.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_download.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_download.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3730,9 +3583,81 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.h busybox-1.22.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_includes.h busybox-1.22.1/archival/libipkg/ipkg_includes.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_includes.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg.h busybox-1.23.0/archival/libipkg/ipkg.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg.h	2015-01-09 11:18:22.424197243 -0600
+@@ -0,0 +1,68 @@
++/* ipkg.h - the itsy package management system
++
++   Carl D. Worth
++
++   Copyright (C) 2001 University of Southern California
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++*/
++
++#ifndef IPKG_H
++#define IPKG_H
++
++#include "libbb.h"
++
++#include "ipkg_includes.h"
++#include "ipkg_conf.h"
++#include "ipkg_message.h"
++
++#define IPKG_PKG_EXTENSION ".ipk"
++#define DPKG_PKG_EXTENSION ".deb"
++
++#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
++#define IPKG_PKG_VERSION_SEP_CHAR '_'
++
++#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
++#define IPKG_LISTS_DIR_SUFFIX "lists"
++#define IPKG_INFO_DIR_SUFFIX "info"
++#define IPKG_STATUS_FILE_SUFFIX "status"
++
++#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
++
++#define IPKG_LIST_DESCRIPTION_LENGTH 128
++
++#define IPKG_VERSION "1.00"
++
++
++enum ipkg_error {
++    IPKG_SUCCESS = 0,
++    IPKG_PKG_DEPS_UNSATISFIED,
++    IPKG_PKG_IS_ESSENTIAL,
++    IPKG_PKG_HAS_DEPENDENTS,
++    IPKG_PKG_HAS_NO_CANDIDATE
++};
++typedef enum ipkg_error ipkg_error_t;
++
++extern int ipkg_state_changed;
++
++
++struct errlist {
++    char * errmsg;
++    struct errlist * next;
++} ;
++
++extern struct errlist* error_list;
++
++extern ipkg_conf_t *global_conf;
++
++typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
++
++#endif
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_includes.h busybox-1.23.0/archival/libipkg/ipkg_includes.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_includes.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_includes.h	2015-01-09 11:18:22.424197243 -0600
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3816,9 +3741,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_includes.h busybox-1.22.1/ar
 +#include <mntent.h>
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.c busybox-1.22.1/archival/libipkg/ipkg_install.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_install.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_install.c busybox-1.23.0/archival/libipkg/ipkg_install.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_install.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_install.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5802,9 +5727,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.c busybox-1.22.1/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.h busybox-1.22.1/archival/libipkg/ipkg_install.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_install.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_install.h busybox-1.23.0/archival/libipkg/ipkg_install.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_install.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_install.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5841,9 +5766,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.h busybox-1.22.1/arc
 +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.c busybox-1.22.1/archival/libipkg/ipkg_message.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_message.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_message.c busybox-1.23.0/archival/libipkg/ipkg_message.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_message.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_message.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5880,9 +5805,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.c busybox-1.22.1/arc
 +		ipkg_cb_message(conf,level,ts);
 +	}
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.h busybox-1.22.1/archival/libipkg/ipkg_message.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_message.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_message.h busybox-1.23.0/archival/libipkg/ipkg_message.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_message.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_message.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5916,9 +5841,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.h busybox-1.22.1/arc
 +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
 +
 +#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.c busybox-1.22.1/archival/libipkg/ipkg_remove.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_remove.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_remove.c busybox-1.23.0/archival/libipkg/ipkg_remove.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_remove.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_remove.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6305,9 +6230,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.c busybox-1.22.1/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.h busybox-1.22.1/archival/libipkg/ipkg_remove.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_remove.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_remove.h busybox-1.23.0/archival/libipkg/ipkg_remove.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_remove.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_remove.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6342,9 +6267,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.h busybox-1.22.1/arch
 +
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.22.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_upgrade.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.23.0/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_upgrade.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6425,9 +6350,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.22.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.22.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_upgrade.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.23.0/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_upgrade.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6447,9 +6372,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.22.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.c busybox-1.22.1/archival/libipkg/ipkg_utils.c
---- busybox-1.22.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_utils.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_utils.c busybox-1.23.0/archival/libipkg/ipkg_utils.c
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_utils.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_utils.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6636,9 +6561,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.c busybox-1.22.1/archi
 +}
 +
 +       
-diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.h busybox-1.22.1/archival/libipkg/ipkg_utils.h
---- busybox-1.22.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/ipkg_utils.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_utils.h busybox-1.23.0/archival/libipkg/ipkg_utils.h
+--- busybox-1.23.0.orig/archival/libipkg/ipkg_utils.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/ipkg_utils.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6669,9 +6594,73 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.h busybox-1.22.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.c busybox-1.22.1/archival/libipkg/libipkg.c
---- busybox-1.22.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/libipkg.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/Kbuild busybox-1.23.0/archival/libipkg/Kbuild
+--- busybox-1.23.0.orig/archival/libipkg/Kbuild	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/Kbuild	2015-01-09 11:18:22.424197243 -0600
+@@ -0,0 +1,60 @@
++# Makefile for busybox
++#
++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
++# Copyright (C) 2006 OpenWrt.org
++#
++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
++
++LIBIPKG_CORE_OBJS:= \
++	args.o \
++	libipkg.o \
++	user.o \
++
++LIBIPKG_CMD_OBJS:= \
++	ipkg_cmd.o \
++	ipkg_configure.o \
++	ipkg_download.o \
++	ipkg_install.o \
++	ipkg_remove.o \
++	ipkg_upgrade.o \
++
++LIBIPKG_DB_OBJS:= \
++	hash_table.o \
++	ipkg_conf.o \
++	ipkg_utils.o \
++	pkg.o \
++	pkg_depends.o \
++	pkg_extract.o \
++	pkg_hash.o \
++	pkg_parse.o \
++	pkg_vec.o \
++
++LIBIPKG_LIST_OBJS:= \
++	conffile.o \
++	conffile_list.o \
++	nv_pair.o \
++	nv_pair_list.o \
++	pkg_dest.o \
++	pkg_dest_list.o \
++	pkg_src.o \
++	pkg_src_list.o \
++	str_list.o \
++	void_list.o \
++
++LIBIPKG_UTIL_OBJS:= \
++	file_util.o \
++	ipkg_message.o \
++	str_util.o \
++	xsystem.o \
++
++lib-y :=
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
++
++ifeq ($(strip $(IPKG_ARCH)),)
++IPKG_ARCH:=$(TARGET_ARCH)
++endif
++CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
+diff -Nur busybox-1.23.0.orig/archival/libipkg/libipkg.c busybox-1.23.0/archival/libipkg/libipkg.c
+--- busybox-1.23.0.orig/archival/libipkg/libipkg.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/libipkg.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7256,9 +7245,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.c busybox-1.22.1/archival
 +
 +	return err;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.h busybox-1.22.1/archival/libipkg/libipkg.h
---- busybox-1.22.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/libipkg.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/libipkg.h busybox-1.23.0/archival/libipkg/libipkg.h
+--- busybox-1.23.0.orig/archival/libipkg/libipkg.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/libipkg.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7338,9 +7327,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.h busybox-1.22.1/archival
 +extern void free_error_list(struct errlist **errors);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.c busybox-1.22.1/archival/libipkg/nv_pair.c
---- busybox-1.22.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/nv_pair.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair.c busybox-1.23.0/archival/libipkg/nv_pair.c
+--- busybox-1.23.0.orig/archival/libipkg/nv_pair.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/nv_pair.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7382,9 +7371,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.c busybox-1.22.1/archival
 +}
 +
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.h busybox-1.22.1/archival/libipkg/nv_pair.h
---- busybox-1.22.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/nv_pair.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair.h busybox-1.23.0/archival/libipkg/nv_pair.h
+--- busybox-1.23.0.orig/archival/libipkg/nv_pair.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/nv_pair.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7418,9 +7407,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.h busybox-1.22.1/archival
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.c busybox-1.22.1/archival/libipkg/nv_pair_list.c
---- busybox-1.22.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/nv_pair_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair_list.c busybox-1.23.0/archival/libipkg/nv_pair_list.c
+--- busybox-1.23.0.orig/archival/libipkg/nv_pair_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/nv_pair_list.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7520,9 +7509,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.c busybox-1.22.1/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.h busybox-1.22.1/archival/libipkg/nv_pair_list.h
---- busybox-1.22.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/nv_pair_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair_list.h busybox-1.23.0/archival/libipkg/nv_pair_list.h
+--- busybox-1.23.0.orig/archival/libipkg/nv_pair_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/nv_pair_list.h	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7584,9 +7573,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.h busybox-1.22.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg.c busybox-1.22.1/archival/libipkg/pkg.c
---- busybox-1.22.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg.c busybox-1.23.0/archival/libipkg/pkg.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9345,242 +9334,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg.c busybox-1.22.1/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg.h busybox-1.22.1/archival/libipkg/pkg.h
---- busybox-1.22.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg.h	2014-05-23 21:12:06.000000000 +0200
-@@ -0,0 +1,229 @@
-+/* pkg.h - the itsy package management system
-+
-+   Carl D. Worth
-+
-+   Copyright (C) 2001 University of Southern California
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2, or (at
-+   your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+*/
-+
-+#ifndef PKG_H
-+#define PKG_H
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+
-+#include "pkg_vec.h"
-+#include "str_list.h"
-+#include "pkg_src.h"
-+#include "pkg_dest.h"
-+#include "ipkg_conf.h"
-+#include "conffile_list.h"
-+
-+struct ipkg_conf;
-+
-+/* I think "Size" is currently the shortest field name */
-+#define PKG_MINIMUM_FIELD_NAME_LEN 4
-+
-+enum pkg_state_want
-+{
-+    SW_UNKNOWN = 1,
-+    SW_INSTALL,
-+    SW_DEINSTALL,
-+    SW_PURGE,
-+    SW_LAST_STATE_WANT
-+};
-+typedef enum pkg_state_want pkg_state_want_t;
-+
-+enum pkg_state_flag
-+{
-+    SF_OK        = 0,
-+    SF_REINSTREQ = 1,
-+    SF_HOLD      = 2,  /* do not upgrade version */
-+    SF_REPLACE   = 4,  /* replace this package */
-+    SF_NOPRUNE   = 8,  /* do not remove obsolete files */
-+    SF_PREFER    = 16, /* prefer this version */
-+    SF_OBSOLETE  = 32, /* old package in upgrade pair */
-+    SF_MARKED    = 64, /* temporary mark */
-+    SF_FILELIST_CHANGED = 128, /* needs filelist written */
-+    SF_USER      = 256,
-+    SF_LAST_STATE_FLAG
-+};
-+typedef enum pkg_state_flag pkg_state_flag_t;
-+#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
-+
-+enum pkg_state_status
-+{
-+    SS_NOT_INSTALLED = 1,
-+    SS_UNPACKED,
-+    SS_HALF_CONFIGURED,
-+    SS_INSTALLED,
-+    SS_HALF_INSTALLED,
-+    SS_CONFIG_FILES,
-+    SS_POST_INST_FAILED,
-+    SS_REMOVAL_FAILED,
-+    SS_LAST_STATE_STATUS
-+};
-+typedef enum pkg_state_status pkg_state_status_t;
-+
-+struct abstract_pkg{
-+    char * name;
-+    int dependencies_checked;
-+    pkg_vec_t * pkgs;
-+    pkg_state_status_t state_status;
-+    pkg_state_flag_t state_flag;
-+    struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
-+    abstract_pkg_vec_t * provided_by;
-+    abstract_pkg_vec_t * replaced_by;
-+};
-+
-+#include "pkg_depends.h"
-+
-+/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
-+
-+   The 3 version fields should go into a single version struct. (This
-+   is especially important since, currently, pkg->version can easily
-+   be mistaken for pkg_verson_str_alloc(pkg) although they are very
-+   distinct. This has been the source of multiple bugs.
-+
-+   The 3 state fields could possibly also go into their own struct.
-+
-+   All fields which deal with lists of packages, (Depends,
-+   Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
-+   be handled by a single struct in pkg_t
-+
-+   All string fields for which there is a small set of possible
-+   values, (section, maintainer, architecture, maybe version?), that
-+   are reused among different packages -- for all such packages we
-+   should move from "char *"s to some atom datatype to share data
-+   storage and use less memory. We might even do reference counting,
-+   but probably not since most often we only create new pkg_t structs,
-+   we don't often free them.  */
-+struct pkg
-+{
-+     char *name;
-+     unsigned long epoch;
-+     char *version;
-+     char *revision;
-+     char *familiar_revision;
-+     pkg_src_t *src;
-+     pkg_dest_t *dest;
-+     char *architecture;
-+     char *section;
-+     char *maintainer;
-+     char *description;
-+     pkg_state_want_t state_want;
-+     pkg_state_flag_t state_flag;
-+     pkg_state_status_t state_status;
-+     char **depends_str;
-+     int depends_count;
-+     char **pre_depends_str;
-+     int pre_depends_count;
-+     char **recommends_str;
-+     int recommends_count;
-+     char **suggests_str;
-+     int suggests_count;
-+     compound_depend_t * depends;
-+
-+     /* Abhaya: new conflicts */
-+     char **conflicts_str;
-+     compound_depend_t * conflicts;
-+     int conflicts_count;
-+	
-+     char **replaces_str;
-+     int replaces_count;
-+     abstract_pkg_t ** replaces;
-+
-+     char **provides_str;
-+     int provides_count;
-+     abstract_pkg_t ** provides;
-+
-+     abstract_pkg_t *parent;
-+
-+     pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
-+
-+     char *filename;
-+     char *local_filename;
-+     char *url;
-+     char *tmp_unpack_dir;
-+     char *md5sum;
-+     char *size;
-+     char *installed_size;
-+     char *priority;
-+     char *source;
-+     conffile_list_t conffiles;
-+     time_t installed_time;
-+     /* As pointer for lazy evaluation */
-+     str_list_t *installed_files;
-+     /* XXX: CLEANUP: I'd like to perhaps come up with a better
-+	mechanism to avoid the problem here, (which is that the
-+	installed_files list was being freed from an inner loop while
-+	still being used within an outer loop. */
-+     int installed_files_ref_cnt;
-+     int essential;
-+     int arch_priority;
-+/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
-+     int provided_by_hand;
-+};
-+
-+pkg_t *pkg_new(void);
-+int pkg_init(pkg_t *pkg);
-+void pkg_deinit(pkg_t *pkg);
-+int pkg_init_from_file(pkg_t *pkg, const char *filename);
-+abstract_pkg_t *abstract_pkg_new(void);
-+int abstract_pkg_init(abstract_pkg_t *ab_pkg);
-+
-+/* 
-+ * merges fields from newpkg into oldpkg.
-+ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero 
-+ */
-+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
-+
-+char *pkg_version_str_alloc(pkg_t *pkg);
-+
-+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
-+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
-+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
-+
-+char * pkg_formatted_info(pkg_t *pkg );
-+char * pkg_formatted_field(pkg_t *pkg, const char *field );
-+
-+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
-+
-+void pkg_print_info(pkg_t *pkg, FILE *file);
-+void pkg_print_status(pkg_t * pkg, FILE * file);
-+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
-+str_list_t *pkg_get_installed_files(pkg_t *pkg);
-+int pkg_free_installed_files(pkg_t *pkg);
-+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
-+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
-+int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
-+		   const char *script, const char *args);
-+
-+/* enum mappings */
-+char *pkg_state_want_to_str(pkg_state_want_t sw);
-+pkg_state_want_t pkg_state_want_from_str(char *str);
-+char *pkg_state_flag_to_str(pkg_state_flag_t sf);
-+pkg_state_flag_t pkg_state_flag_from_str(char *str);
-+char *pkg_state_status_to_str(pkg_state_status_t ss);
-+pkg_state_status_t pkg_state_status_from_str(char *str);
-+
-+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
-+
-+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_info_preinstall_check(ipkg_conf_t *conf);
-+int pkg_free_installed_files(pkg_t *pkg);
-+
-+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_write_changed_filelists(ipkg_conf_t *conf);
-+
-+#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.c busybox-1.22.1/archival/libipkg/pkg_depends.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_depends.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_depends.c busybox-1.23.0/archival/libipkg/pkg_depends.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_depends.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_depends.c	2015-01-09 11:18:22.428197243 -0600
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10614,9 +10370,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.c busybox-1.22.1/arch
 +
 +     return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.h busybox-1.22.1/archival/libipkg/pkg_depends.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_depends.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_depends.h busybox-1.23.0/archival/libipkg/pkg_depends.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_depends.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_depends.h	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10723,9 +10479,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.h busybox-1.22.1/arch
 +int pkg_dependence_satisfied(depend_t *depend);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.c busybox-1.22.1/archival/libipkg/pkg_dest.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_dest.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest.c busybox-1.23.0/archival/libipkg/pkg_dest.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_dest.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_dest.c	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10819,9 +10575,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.c busybox-1.22.1/archiva
 +
 +    dest->root_dir = NULL;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.h busybox-1.22.1/archival/libipkg/pkg_dest.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_dest.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest.h busybox-1.23.0/archival/libipkg/pkg_dest.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_dest.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_dest.h	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10861,9 +10617,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.h busybox-1.22.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.22.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_dest_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.23.0/archival/libipkg/pkg_dest_list.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_dest_list.c	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10950,9 +10706,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.22.1/ar
 +{
 +    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.22.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_dest_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.23.0/archival/libipkg/pkg_dest_list.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_dest_list.h	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -11004,9 +10760,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.22.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.c busybox-1.22.1/archival/libipkg/pkg_extract.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_extract.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_extract.c busybox-1.23.0/archival/libipkg/pkg_extract.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_extract.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_extract.c	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11263,9 +11019,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.c busybox-1.22.1/arch
 +	
 +	return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.h busybox-1.22.1/archival/libipkg/pkg_extract.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_extract.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_extract.h busybox-1.23.0/archival/libipkg/pkg_extract.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_extract.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_extract.h	2015-01-09 11:18:22.432197244 -0600
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11299,9 +11055,242 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.h busybox-1.22.1/arch
 +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.c busybox-1.22.1/archival/libipkg/pkg_hash.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_hash.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg.h busybox-1.23.0/archival/libipkg/pkg.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg.h	2015-01-09 11:18:22.428197243 -0600
+@@ -0,0 +1,229 @@
++/* pkg.h - the itsy package management system
++
++   Carl D. Worth
++
++   Copyright (C) 2001 University of Southern California
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++*/
++
++#ifndef PKG_H
++#define PKG_H
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include "pkg_vec.h"
++#include "str_list.h"
++#include "pkg_src.h"
++#include "pkg_dest.h"
++#include "ipkg_conf.h"
++#include "conffile_list.h"
++
++struct ipkg_conf;
++
++/* I think "Size" is currently the shortest field name */
++#define PKG_MINIMUM_FIELD_NAME_LEN 4
++
++enum pkg_state_want
++{
++    SW_UNKNOWN = 1,
++    SW_INSTALL,
++    SW_DEINSTALL,
++    SW_PURGE,
++    SW_LAST_STATE_WANT
++};
++typedef enum pkg_state_want pkg_state_want_t;
++
++enum pkg_state_flag
++{
++    SF_OK        = 0,
++    SF_REINSTREQ = 1,
++    SF_HOLD      = 2,  /* do not upgrade version */
++    SF_REPLACE   = 4,  /* replace this package */
++    SF_NOPRUNE   = 8,  /* do not remove obsolete files */
++    SF_PREFER    = 16, /* prefer this version */
++    SF_OBSOLETE  = 32, /* old package in upgrade pair */
++    SF_MARKED    = 64, /* temporary mark */
++    SF_FILELIST_CHANGED = 128, /* needs filelist written */
++    SF_USER      = 256,
++    SF_LAST_STATE_FLAG
++};
++typedef enum pkg_state_flag pkg_state_flag_t;
++#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
++
++enum pkg_state_status
++{
++    SS_NOT_INSTALLED = 1,
++    SS_UNPACKED,
++    SS_HALF_CONFIGURED,
++    SS_INSTALLED,
++    SS_HALF_INSTALLED,
++    SS_CONFIG_FILES,
++    SS_POST_INST_FAILED,
++    SS_REMOVAL_FAILED,
++    SS_LAST_STATE_STATUS
++};
++typedef enum pkg_state_status pkg_state_status_t;
++
++struct abstract_pkg{
++    char * name;
++    int dependencies_checked;
++    pkg_vec_t * pkgs;
++    pkg_state_status_t state_status;
++    pkg_state_flag_t state_flag;
++    struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
++    abstract_pkg_vec_t * provided_by;
++    abstract_pkg_vec_t * replaced_by;
++};
++
++#include "pkg_depends.h"
++
++/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
++
++   The 3 version fields should go into a single version struct. (This
++   is especially important since, currently, pkg->version can easily
++   be mistaken for pkg_verson_str_alloc(pkg) although they are very
++   distinct. This has been the source of multiple bugs.
++
++   The 3 state fields could possibly also go into their own struct.
++
++   All fields which deal with lists of packages, (Depends,
++   Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
++   be handled by a single struct in pkg_t
++
++   All string fields for which there is a small set of possible
++   values, (section, maintainer, architecture, maybe version?), that
++   are reused among different packages -- for all such packages we
++   should move from "char *"s to some atom datatype to share data
++   storage and use less memory. We might even do reference counting,
++   but probably not since most often we only create new pkg_t structs,
++   we don't often free them.  */
++struct pkg
++{
++     char *name;
++     unsigned long epoch;
++     char *version;
++     char *revision;
++     char *familiar_revision;
++     pkg_src_t *src;
++     pkg_dest_t *dest;
++     char *architecture;
++     char *section;
++     char *maintainer;
++     char *description;
++     pkg_state_want_t state_want;
++     pkg_state_flag_t state_flag;
++     pkg_state_status_t state_status;
++     char **depends_str;
++     int depends_count;
++     char **pre_depends_str;
++     int pre_depends_count;
++     char **recommends_str;
++     int recommends_count;
++     char **suggests_str;
++     int suggests_count;
++     compound_depend_t * depends;
++
++     /* Abhaya: new conflicts */
++     char **conflicts_str;
++     compound_depend_t * conflicts;
++     int conflicts_count;
++	
++     char **replaces_str;
++     int replaces_count;
++     abstract_pkg_t ** replaces;
++
++     char **provides_str;
++     int provides_count;
++     abstract_pkg_t ** provides;
++
++     abstract_pkg_t *parent;
++
++     pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
++
++     char *filename;
++     char *local_filename;
++     char *url;
++     char *tmp_unpack_dir;
++     char *md5sum;
++     char *size;
++     char *installed_size;
++     char *priority;
++     char *source;
++     conffile_list_t conffiles;
++     time_t installed_time;
++     /* As pointer for lazy evaluation */
++     str_list_t *installed_files;
++     /* XXX: CLEANUP: I'd like to perhaps come up with a better
++	mechanism to avoid the problem here, (which is that the
++	installed_files list was being freed from an inner loop while
++	still being used within an outer loop. */
++     int installed_files_ref_cnt;
++     int essential;
++     int arch_priority;
++/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
++     int provided_by_hand;
++};
++
++pkg_t *pkg_new(void);
++int pkg_init(pkg_t *pkg);
++void pkg_deinit(pkg_t *pkg);
++int pkg_init_from_file(pkg_t *pkg, const char *filename);
++abstract_pkg_t *abstract_pkg_new(void);
++int abstract_pkg_init(abstract_pkg_t *ab_pkg);
++
++/* 
++ * merges fields from newpkg into oldpkg.
++ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero 
++ */
++int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
++
++char *pkg_version_str_alloc(pkg_t *pkg);
++
++int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
++int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
++int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
++
++char * pkg_formatted_info(pkg_t *pkg );
++char * pkg_formatted_field(pkg_t *pkg, const char *field );
++
++void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
++
++void pkg_print_info(pkg_t *pkg, FILE *file);
++void pkg_print_status(pkg_t * pkg, FILE * file);
++void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
++str_list_t *pkg_get_installed_files(pkg_t *pkg);
++int pkg_free_installed_files(pkg_t *pkg);
++int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
++conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
++int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
++		   const char *script, const char *args);
++
++/* enum mappings */
++char *pkg_state_want_to_str(pkg_state_want_t sw);
++pkg_state_want_t pkg_state_want_from_str(char *str);
++char *pkg_state_flag_to_str(pkg_state_flag_t sf);
++pkg_state_flag_t pkg_state_flag_from_str(char *str);
++char *pkg_state_status_to_str(pkg_state_status_t ss);
++pkg_state_status_t pkg_state_status_from_str(char *str);
++
++int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
++
++int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_info_preinstall_check(ipkg_conf_t *conf);
++int pkg_free_installed_files(pkg_t *pkg);
++
++int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_write_changed_filelists(ipkg_conf_t *conf);
++
++#endif
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_hash.c busybox-1.23.0/archival/libipkg/pkg_hash.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_hash.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_hash.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11926,9 +11915,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.c busybox-1.22.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.h busybox-1.22.1/archival/libipkg/pkg_hash.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_hash.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_hash.h busybox-1.23.0/archival/libipkg/pkg_hash.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_hash.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_hash.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11991,9 +11980,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.h busybox-1.22.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.c busybox-1.22.1/archival/libipkg/pkg_parse.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_parse.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_parse.c busybox-1.23.0/archival/libipkg/pkg_parse.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_parse.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_parse.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12363,9 +12352,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.c busybox-1.22.1/archiv
 +
 +    return 0;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.h busybox-1.22.1/archival/libipkg/pkg_parse.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_parse.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_parse.h busybox-1.23.0/archival/libipkg/pkg_parse.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_parse.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_parse.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12398,9 +12387,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.h busybox-1.22.1/archiv
 +int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.c busybox-1.22.1/archival/libipkg/pkg_src.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_src.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src.c busybox-1.23.0/archival/libipkg/pkg_src.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_src.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_src.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12445,9 +12434,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.c busybox-1.22.1/archival
 +}
 +
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.h busybox-1.22.1/archival/libipkg/pkg_src.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_src.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src.h busybox-1.23.0/archival/libipkg/pkg_src.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_src.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_src.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12483,9 +12472,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.h busybox-1.22.1/archival
 +void pkg_src_deinit(pkg_src_t *src);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.c busybox-1.22.1/archival/libipkg/pkg_src_list.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_src_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src_list.c busybox-1.23.0/archival/libipkg/pkg_src_list.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_src_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_src_list.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12562,9 +12551,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.c busybox-1.22.1/arc
 +{
 +    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.h busybox-1.22.1/archival/libipkg/pkg_src_list.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_src_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src_list.h busybox-1.23.0/archival/libipkg/pkg_src_list.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_src_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_src_list.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12623,9 +12612,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.h busybox-1.22.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.c busybox-1.22.1/archival/libipkg/pkg_vec.c
---- busybox-1.22.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_vec.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_vec.c busybox-1.23.0/archival/libipkg/pkg_vec.c
+--- busybox-1.23.0.orig/archival/libipkg/pkg_vec.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_vec.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12858,9 +12847,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.c busybox-1.22.1/archival
 +     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.h busybox-1.22.1/archival/libipkg/pkg_vec.h
---- busybox-1.22.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/pkg_vec.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_vec.h busybox-1.23.0/archival/libipkg/pkg_vec.h
+--- busybox-1.23.0.orig/archival/libipkg/pkg_vec.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/pkg_vec.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12924,9 +12913,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.h busybox-1.22.1/archival
 +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
 +#endif
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.22.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.22.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/sprintf_alloc.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.23.0/archival/libipkg/sprintf_alloc.h
+--- busybox-1.23.0.orig/archival/libipkg/sprintf_alloc.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/sprintf_alloc.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12953,9 +12942,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.22.1/ar
 +#define sprintf_alloc(str, fmt, args...)  *str = xasprintf(fmt, ## args)
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.c busybox-1.22.1/archival/libipkg/str_list.c
---- busybox-1.22.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/str_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/str_list.c busybox-1.23.0/archival/libipkg/str_list.c
+--- busybox-1.23.0.orig/archival/libipkg/str_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/str_list.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13033,9 +13022,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.c busybox-1.22.1/archiva
 +					 (void *)target_str,
 +					 (void_list_cmp_t)strcmp);
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.h busybox-1.22.1/archival/libipkg/str_list.h
---- busybox-1.22.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/str_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/str_list.h busybox-1.23.0/archival/libipkg/str_list.h
+--- busybox-1.23.0.orig/archival/libipkg/str_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/str_list.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13088,9 +13077,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.h busybox-1.22.1/archiva
 +char *str_list_remove_elt(str_list_t *list, const char *target_str);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.c busybox-1.22.1/archival/libipkg/str_util.c
---- busybox-1.22.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/str_util.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/str_util.c busybox-1.23.0/archival/libipkg/str_util.c
+--- busybox-1.23.0.orig/archival/libipkg/str_util.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/str_util.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13161,9 +13150,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.c busybox-1.22.1/archiva
 +    return str ? strdup(str) : NULL;
 +}
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.h busybox-1.22.1/archival/libipkg/str_util.h
---- busybox-1.22.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/str_util.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/str_util.h busybox-1.23.0/archival/libipkg/str_util.h
+--- busybox-1.23.0.orig/archival/libipkg/str_util.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/str_util.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13192,9 +13181,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.h busybox-1.22.1/archiva
 +char *str_dup_safe(const char *str);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/user.c busybox-1.22.1/archival/libipkg/user.c
---- busybox-1.22.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/user.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/user.c busybox-1.23.0/archival/libipkg/user.c
+--- busybox-1.23.0.orig/archival/libipkg/user.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/user.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13245,9 +13234,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/user.c busybox-1.22.1/archival/li
 +
 +     return response;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/user.h busybox-1.22.1/archival/libipkg/user.h
---- busybox-1.22.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/user.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/user.h busybox-1.23.0/archival/libipkg/user.h
+--- busybox-1.23.0.orig/archival/libipkg/user.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/user.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13272,9 +13261,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/user.h busybox-1.22.1/archival/li
 +
 +char *get_user_response(const char *format, ...);
 +
-diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.c busybox-1.22.1/archival/libipkg/void_list.c
---- busybox-1.22.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/void_list.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/void_list.c busybox-1.23.0/archival/libipkg/void_list.c
+--- busybox-1.23.0.orig/archival/libipkg/void_list.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/void_list.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13470,9 +13459,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.c busybox-1.22.1/archiv
 +     else
 +	  return NULL;
 +}
-diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.h busybox-1.22.1/archival/libipkg/void_list.h
---- busybox-1.22.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/void_list.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/void_list.h busybox-1.23.0/archival/libipkg/void_list.h
+--- busybox-1.23.0.orig/archival/libipkg/void_list.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/void_list.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13533,9 +13522,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.h busybox-1.22.1/archiv
 +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
 +
 +#endif
-diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.c busybox-1.22.1/archival/libipkg/xsystem.c
---- busybox-1.22.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/xsystem.c	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/xsystem.c busybox-1.23.0/archival/libipkg/xsystem.c
+--- busybox-1.23.0.orig/archival/libipkg/xsystem.c	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/xsystem.c	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13601,9 +13590,9 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.c busybox-1.22.1/archival
 +    return -1;
 +}
 +	 
-diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.h busybox-1.22.1/archival/libipkg/xsystem.h
---- busybox-1.22.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/archival/libipkg/xsystem.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/archival/libipkg/xsystem.h busybox-1.23.0/archival/libipkg/xsystem.h
+--- busybox-1.23.0.orig/archival/libipkg/xsystem.h	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/archival/libipkg/xsystem.h	2015-01-09 11:18:22.440197244 -0600
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13639,10 +13628,10 @@ diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.h busybox-1.22.1/archival
 +
 +#endif
 +	 
-diff -Nur busybox-1.22.1.orig/include/applets.src.h busybox-1.22.1/include/applets.src.h
---- busybox-1.22.1.orig/include/applets.src.h	2014-01-09 19:15:44.000000000 +0100
-+++ busybox-1.22.1/include/applets.src.h	2014-05-23 21:12:06.000000000 +0200
-@@ -194,6 +194,7 @@
+diff -Nur busybox-1.23.0.orig/include/applets.src.h busybox-1.23.0/include/applets.src.h
+--- busybox-1.23.0.orig/include/applets.src.h	2014-10-04 15:35:59.000000000 -0500
++++ busybox-1.23.0/include/applets.src.h	2015-01-09 11:18:22.440197244 -0600
+@@ -193,6 +193,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))
@@ -13650,9 +13639,413 @@ diff -Nur busybox-1.22.1.orig/include/applets.src.h busybox-1.22.1/include/apple
  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.22.1.orig/include/bb_archive.h busybox-1.22.1/include/bb_archive.h
---- busybox-1.22.1.orig/include/bb_archive.h	2014-01-09 19:15:44.000000000 +0100
-+++ busybox-1.22.1/include/bb_archive.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/include/applets.src.h.orig busybox-1.23.0/include/applets.src.h.orig
+--- busybox-1.23.0.orig/include/applets.src.h.orig	1969-12-31 18:00:00.000000000 -0600
++++ busybox-1.23.0/include/applets.src.h.orig	2014-10-04 15:35:59.000000000 -0500
+@@ -0,0 +1,400 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * applets.h - a listing of all busybox applets.
++ *
++ * If you write a new applet, you need to add an entry to this list to make
++ * busybox aware of it.
++ */
++
++/*
++name  - applet name as it is typed on command line
++help  - applet name, converted to C (ether-wake: help = ether_wake)
++main  - corresponding <applet>_main to call (bzcat: main = bunzip2)
++l     - location to install link to: [/usr]/[s]bin
++s     - suid type:
++        BB_SUID_REQUIRE: will complain if busybox isn't suid
++        and is run by non-root (applet_main() will not be called at all)
++        BB_SUID_DROP: will drop suid prior to applet_main()
++        BB_SUID_MAYBE: neither of the above
++        (every instance of BB_SUID_REQUIRE and BB_SUID_MAYBE
++        needs to be justified in comment)
++        NB: please update FEATURE_SUID help text whenever you add/remove
++        BB_SUID_REQUIRE or BB_SUID_MAYBE applet.
++*/
++
++#if defined(PROTOTYPES)
++# define APPLET(name,l,s)                    int name##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++# define APPLET_ODDNAME(name,main,l,s,help)  int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++# define APPLET_NOEXEC(name,main,l,s,help)   int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++# define APPLET_NOFORK(name,main,l,s,help)   int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
++
++#elif defined(NAME_MAIN)
++# define APPLET(name,l,s)                    name name##_main
++# define APPLET_ODDNAME(name,main,l,s,help)  name main##_main
++# define APPLET_NOEXEC(name,main,l,s,help)   name main##_main
++# define APPLET_NOFORK(name,main,l,s,help)   name main##_main
++
++#elif defined(MAKE_USAGE) && ENABLE_FEATURE_VERBOSE_USAGE
++# define APPLET(name,l,s)                    MAKE_USAGE(#name, name##_trivial_usage name##_full_usage)
++# define APPLET_ODDNAME(name,main,l,s,help)  MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
++# define APPLET_NOEXEC(name,main,l,s,help)   MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
++# define APPLET_NOFORK(name,main,l,s,help)   MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
++
++#elif defined(MAKE_USAGE) && !ENABLE_FEATURE_VERBOSE_USAGE
++# define APPLET(name,l,s)                    MAKE_USAGE(#name, name##_trivial_usage)
++# define APPLET_ODDNAME(name,main,l,s,help)  MAKE_USAGE(#name, help##_trivial_usage)
++# define APPLET_NOEXEC(name,main,l,s,help)   MAKE_USAGE(#name, help##_trivial_usage)
++# define APPLET_NOFORK(name,main,l,s,help)   MAKE_USAGE(#name, help##_trivial_usage)
++
++#elif defined(MAKE_LINKS)
++# define APPLET(name,l,c)                    LINK l name
++# define APPLET_ODDNAME(name,main,l,s,help)  LINK l name
++# define APPLET_NOEXEC(name,main,l,s,help)   LINK l name
++# define APPLET_NOFORK(name,main,l,s,help)   LINK l name
++
++#elif defined(MAKE_SUID)
++# define APPLET(name,l,s)                    SUID s l name
++# define APPLET_ODDNAME(name,main,l,s,help)  SUID s l name
++# define APPLET_NOEXEC(name,main,l,s,help)   SUID s l name
++# define APPLET_NOFORK(name,main,l,s,help)   SUID s l name
++
++#else
++  static struct bb_applet applets[] = { /*    name, main, location, need_suid */
++# define APPLET(name,l,s)                    { #name, #name, l, s },
++# define APPLET_ODDNAME(name,main,l,s,help)  { #name, #main, l, s },
++# define APPLET_NOEXEC(name,main,l,s,help)   { #name, #main, l, s, 1 },
++# define APPLET_NOFORK(name,main,l,s,help)   { #name, #main, l, s, 1, 1 },
++#endif
++
++#if ENABLE_INSTALL_NO_USR
++# define BB_DIR_USR_BIN BB_DIR_BIN
++# define BB_DIR_USR_SBIN BB_DIR_SBIN
++#endif
++
++
++INSERT
++IF_TEST(APPLET_NOFORK([,  test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
++IF_TEST(APPLET_NOFORK([[, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
++IF_ACPID(APPLET(acpid, BB_DIR_SBIN, BB_SUID_DROP))
++IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP))
++IF_ARP(APPLET(arp, BB_DIR_SBIN, BB_SUID_DROP))
++IF_ARPING(APPLET(arping, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename))
++IF_BBCONFIG(APPLET(bbconfig, BB_DIR_BIN, BB_SUID_DROP))
++IF_BEEP(APPLET(beep, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP))
++IF_BRCTL(APPLET(brctl, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CAT(APPLET_NOFORK(cat, cat, BB_DIR_BIN, BB_SUID_DROP, cat))
++IF_CATV(APPLET(catv, BB_DIR_BIN, BB_SUID_DROP))
++IF_CHAT(APPLET(chat, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP))
++IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CHGRP(APPLET_NOEXEC(chgrp, chgrp, BB_DIR_BIN, BB_SUID_DROP, chgrp))
++IF_CHMOD(APPLET_NOEXEC(chmod, chmod, BB_DIR_BIN, BB_SUID_DROP, chmod))
++IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))
++IF_CHPASSWD(APPLET(chpasswd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CHROOT(APPLET(chroot, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_CHRT(APPLET(chrt, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CHVT(APPLET(chvt, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
++IF_CLEAR(APPLET(clear, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_COMM(APPLET(comm, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
++/* Needs to be run by root or be suid root - needs to change /var/spool/cron* files: */
++IF_CRONTAB(APPLET(crontab, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
++IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_CUT(APPLET_NOEXEC(cut, cut, BB_DIR_USR_BIN, BB_SUID_DROP, cut))
++IF_DC(APPLET(dc, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))
++IF_DEALLOCVT(APPLET(deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup))
++IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_DEVFSD(APPLET(devfsd, BB_DIR_SBIN, BB_SUID_DROP))
++IF_DEVMEM(APPLET(devmem, BB_DIR_SBIN, BB_SUID_DROP))
++IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
++IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_DIRNAME(APPLET_NOFORK(dirname, dirname, BB_DIR_USR_BIN, BB_SUID_DROP, dirname))
++IF_DMESG(APPLET(dmesg, BB_DIR_BIN, BB_SUID_DROP))
++IF_DNSD(APPLET(dnsd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_HOSTNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
++IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix))
++IF_DU(APPLET(du, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_DUMPKMAP(APPLET(dumpkmap, BB_DIR_BIN, BB_SUID_DROP))
++IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
++//IF_E2FSCK(APPLET(e2fsck, BB_DIR_SBIN, BB_SUID_DROP))
++//IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
++IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))
++IF_EJECT(APPLET(eject, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
++IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
++IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
++IF_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, BB_DIR_USR_SBIN, BB_SUID_DROP, ether_wake))
++IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_FAKEIDENTD(APPLET(fakeidentd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FALSE(APPLET_NOFORK(false, false, BB_DIR_BIN, BB_SUID_DROP, false))
++IF_FBSET(APPLET(fbset, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FBSPLASH(APPLET(fbsplash, BB_DIR_SBIN, BB_SUID_DROP))
++IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush))
++IF_FDFORMAT(APPLET(fdformat, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FDISK(APPLET(fdisk, BB_DIR_SBIN, BB_SUID_DROP))
++IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP))
++/* Benefits from suid root: better access to /dev/BLOCKDEVs: */
++IF_FINDFS(APPLET(findfs, BB_DIR_SBIN, BB_SUID_MAYBE))
++IF_FLASH_ERASEALL(APPLET(flash_eraseall, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
++IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock))
++IF_FLASHCP(APPLET(flashcp, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FLOCK(APPLET(flock, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_FOLD(APPLET_NOEXEC(fold, fold, BB_DIR_USR_BIN, BB_SUID_DROP, fold))
++IF_FREE(APPLET(free, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP))
++IF_FSCK(APPLET(fsck, BB_DIR_SBIN, BB_SUID_DROP))
++//IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext2))
++//IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3))
++IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
++IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
++IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))
++IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput))
++IF_FUSER(APPLET(fuser, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
++IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_GETTY(APPLET(getty, BB_DIR_SBIN, BB_SUID_DROP))
++IF_HD(APPLET_NOEXEC(hd, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hd))
++IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))
++IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))
++IF_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, BB_DIR_USR_BIN, BB_SUID_DROP, hexdump))
++IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP))
++IF_HTTPD(APPLET(httpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
++IF_IFCONFIG(APPLET(ifconfig, BB_DIR_SBIN, BB_SUID_DROP))
++IF_IFUPDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown))
++IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP))
++IF_IFPLUGD(APPLET(ifplugd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup))
++IF_INETD(APPLET(inetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_INOTIFYD(APPLET(inotifyd, BB_DIR_SBIN, BB_SUID_DROP))
++IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP))
++#if ENABLE_FEATURE_IP_ADDRESS \
++ || ENABLE_FEATURE_IP_ROUTE \
++ || ENABLE_FEATURE_IP_LINK \
++ || ENABLE_FEATURE_IP_TUNNEL \
++ || ENABLE_FEATURE_IP_RULE
++IF_IP(APPLET(ip, BB_DIR_SBIN, BB_SUID_DROP))
++#endif
++IF_IPADDR(APPLET(ipaddr, BB_DIR_SBIN, BB_SUID_DROP))
++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_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))
++IF_IPTUNNEL(APPLET(iptunnel, BB_DIR_SBIN, BB_SUID_DROP))
++IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
++IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
++IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall))
++IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
++IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP))
++IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP))
++//IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length))
++IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
++IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
++IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, BB_SUID_DROP, ln))
++IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
++IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP))
++/* Needs to be run by root or be suid root - needs to change uid and gid: */
++IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE))
++IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
++IF_LOGREAD(APPLET(logread, BB_DIR_SBIN, BB_SUID_DROP))
++IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
++IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq))
++IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr))
++IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
++IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP))
++IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP))
++IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
++IF_MAN(APPLET(man, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
++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_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_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))
++IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
++IF_MKNOD(APPLET_NOEXEC(mknod, mknod, BB_DIR_BIN, BB_SUID_DROP, mknod))
++IF_CRYPTPW(APPLET_ODDNAME(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, mkpasswd))
++IF_MKSWAP(APPLET(mkswap, BB_DIR_SBIN, BB_SUID_DROP))
++IF_MKTEMP(APPLET(mktemp, BB_DIR_BIN, BB_SUID_DROP))
++IF_MORE(APPLET(more, BB_DIR_BIN, BB_SUID_DROP))
++/* On full-blown systems, requires suid for user mounts.
++ * But it's not unthinkable to have it available in non-suid flavor on some systems,
++ * for viewing mount table.
++ * Therefore we use BB_SUID_MAYBE instead of BB_SUID_REQUIRE: */
++IF_MOUNT(APPLET(mount, BB_DIR_BIN, IF_DESKTOP(BB_SUID_MAYBE) IF_NOT_DESKTOP(BB_SUID_DROP)))
++IF_MOUNTPOINT(APPLET(mountpoint, BB_DIR_BIN, BB_SUID_DROP))
++IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DROP))
++IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
++IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
++IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
++IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
++IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_NSLOOKUP(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_NTPD(APPLET(ntpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_OD(APPLET(od, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_OPENVT(APPLET(openvt, BB_DIR_USR_BIN, BB_SUID_DROP))
++//IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
++/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */
++IF_PASSWD(APPLET(passwd, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
++IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
++IF_PIPE_PROGRESS(APPLET(pipe_progress, BB_DIR_BIN, BB_SUID_DROP))
++IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP))
++IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill))
++IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_PRINTENV(APPLET_NOFORK(printenv, printenv, BB_DIR_BIN, BB_SUID_DROP, printenv))
++IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
++IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
++IF_PSCAN(APPLET(pscan, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_PWD(APPLET_NOFORK(pwd, pwd, BB_DIR_BIN, BB_SUID_DROP, pwd))
++IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP))
++IF_RDATE(APPLET(rdate, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_READAHEAD(APPLET(readahead, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_READPROFILE(APPLET(readprofile, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
++IF_RENICE(APPLET(renice, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon))
++IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
++IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
++IF_ROUTE(APPLET(route, BB_DIR_SBIN, BB_SUID_DROP))
++IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
++IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
++IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RUNSVDIR(APPLET(runsvdir, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_RX(APPLET(rx, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SCRIPT(APPLET(script, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SCRIPTREPLAY(APPLET(scriptreplay, BB_DIR_BIN, BB_SUID_DROP))
++IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
++IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
++IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
++IF_SETENFORCE(APPLET(setenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP))
++IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SETLOGCONS(APPLET(setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SETSEBOOL(APPLET(setsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SETSID(APPLET(setsid, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
++IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha1sum))
++IF_SHA3SUM(APPLET_NOEXEC(sha3sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha3sum))
++IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha256sum))
++IF_SHA512SUM(APPLET_NOEXEC(sha512sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha512sum))
++IF_SHOWKEY(APPLET(showkey, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
++/* Do not make this applet NOFORK. It breaks ^C-ing of pauses in shells: */
++IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
++IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
++IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort))
++IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
++IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
++IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
++/* Needs to be run by root or be suid root - needs to change uid and gid: */
++IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
++IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP))
++IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_SVLOGD(APPLET(svlogd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_SWAPONOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff))
++IF_SWAPONOFF(APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
++IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP))
++IF_SYNC(APPLET_NOFORK(sync, sync, BB_DIR_BIN, BB_SUID_DROP, sync))
++IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
++IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP))
++IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac))
++IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
++/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */
++IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
++IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TELNET(APPLET(telnet, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TELNETD(APPLET(telnetd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_TEST(APPLET_NOFORK(test, test, BB_DIR_USR_BIN, BB_SUID_DROP, test))
++#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
++IF_TFTP(APPLET(tftp, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TFTPD(APPLET(tftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++#endif
++IF_TIME(APPLET(time, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TIMEOUT(APPLET(timeout, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TOP(APPLET(top, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TR(APPLET(tr, BB_DIR_USR_BIN, BB_SUID_DROP))
++/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
++IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
++IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
++IF_TRUE(APPLET_NOFORK(true, true, BB_DIR_BIN, BB_SUID_DROP, true))
++IF_TTY(APPLET(tty, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TTYSIZE(APPLET(ttysize, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
++IF_TUNE2FS(APPLET(tune2fs, BB_DIR_SBIN, BB_SUID_DROP))
++IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP))
++IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
++IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, udpsvd))
++IF_UMOUNT(APPLET(umount, BB_DIR_BIN, BB_SUID_DROP))
++IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP))
++IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
++IF_UNIQ(APPLET(uniq, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos))
++IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_USLEEP(APPLET_NOFORK(usleep, usleep, BB_DIR_BIN, BB_SUID_DROP, usleep))
++IF_UUDECODE(APPLET(uudecode, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_UUENCODE(APPLET(uuencode, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
++/* Needs to be run by root or be suid root - needs to change uid and gid: */
++IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
++IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
++IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
++IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
++IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami))
++IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
++IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
++
++#if !defined(PROTOTYPES) && !defined(NAME_MAIN) && !defined(MAKE_USAGE) \
++	&& !defined(MAKE_LINKS) && !defined(MAKE_SUID)
++};
++#endif
++
++#undef APPLET
++#undef APPLET_ODDNAME
++#undef APPLET_NOEXEC
++#undef APPLET_NOFORK
+diff -Nur busybox-1.23.0.orig/include/bb_archive.h busybox-1.23.0/include/bb_archive.h
+--- busybox-1.23.0.orig/include/bb_archive.h	2014-12-10 23:00:17.000000000 -0600
++++ busybox-1.23.0/include/bb_archive.h	2015-01-09 11:18:22.440197244 -0600
 @@ -79,7 +79,6 @@
  	/* Archiver specific. Can make it a union if it ever gets big */
  #define PAX_NEXT_FILE 0
@@ -13676,9 +14069,9 @@ diff -Nur busybox-1.22.1.orig/include/bb_archive.h busybox-1.22.1/include/bb_arc
  	/* Temporary storage */
  	char *dpkg__buffer;
  	/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.22.1.orig/include/usage.src.h busybox-1.22.1/include/usage.src.h
---- busybox-1.22.1.orig/include/usage.src.h	2014-01-09 19:15:44.000000000 +0100
-+++ busybox-1.22.1/include/usage.src.h	2014-05-23 21:12:06.000000000 +0200
+diff -Nur busybox-1.23.0.orig/include/usage.src.h busybox-1.23.0/include/usage.src.h
+--- busybox-1.23.0.orig/include/usage.src.h	2014-10-04 15:35:59.000000000 -0500
++++ busybox-1.23.0/include/usage.src.h	2015-01-09 11:18:22.440197244 -0600
 @@ -19,4 +19,80 @@
  #define busybox_notes_usage \
         "Hello world!\n"
@@ -13760,3 +14153,14 @@ diff -Nur busybox-1.22.1.orig/include/usage.src.h busybox-1.22.1/include/usage.s
 + 	"\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
 + 
  #endif
+diff -Nur busybox-1.23.0.orig/Makefile busybox-1.23.0/Makefile
+--- busybox-1.23.0.orig/Makefile	2014-12-23 18:48:20.000000000 -0600
++++ busybox-1.23.0/Makefile	2015-01-09 11:18:22.424197243 -0600
+@@ -466,6 +466,7 @@
+ libs-y		:= \
+ 		archival/ \
+ 		archival/libarchive/ \
++		archival/libipkg/ \
+ 		console-tools/ \
+ 		coreutils/ \
+ 		coreutils/libcoreutils/ \
diff --git a/package/busybox/patches/004-busybox-1.23.0-ash.patch b/package/busybox/patches/004-busybox-1.23.0-ash.patch
new file mode 100644
index 000000000..fb494aa25
--- /dev/null
+++ b/package/busybox/patches/004-busybox-1.23.0-ash.patch
@@ -0,0 +1,34 @@
+--- busybox-1.23.0/shell/ash.c
++++ busybox-1.23.0-ash/shell/ash.c
+@@ -6746,6 +6746,14 @@ varvalue(char *name, int varflags, int f
+ 		len = strlen(p);
+ 		if (!(subtype == VSPLUS || subtype == VSLENGTH))
+ 			memtodest(p, len, syntax, quotes);
++#if ENABLE_UNICODE_SUPPORT
++		if (subtype == VSLENGTH && len > 0) {
++			reinit_unicode_for_ash();
++			if (unicode_status == UNICODE_ON) {
++				len = unicode_strlen(p);
++			}
++		}
++#endif
+ 		return len;
+ 	}
+ 
+@@ -6829,15 +6837,7 @@ evalvar(char *p, int flags, struct strli
+ 		varunset(p, var, 0, 0);
+ 
+ 	if (subtype == VSLENGTH) {
+-		ssize_t n = varlen;
+-		if (n > 0) {
+-			reinit_unicode_for_ash();
+-			if (unicode_status == UNICODE_ON) {
+-				const char *val = lookupvar(var);
+-				n = unicode_strlen(val);
+-			}
+-		}
+-		cvtnum(n > 0 ? n : 0);
++		cvtnum(varlen > 0 ? varlen : 0);
+ 		goto record;
+ 	}
+ 
diff --git a/package/busybox/patches/004-ping.patch b/package/busybox/patches/004-ping.patch
deleted file mode 100644
index aeb1f9706..000000000
--- a/package/busybox/patches/004-ping.patch
+++ /dev/null
@@ -1,1135 +0,0 @@
-diff -Nur busybox-1.22.1.orig/networking/ping.c busybox-1.22.1/networking/ping.c
---- busybox-1.22.1.orig/networking/ping.c	2014-01-20 03:38:10.000000000 +0100
-+++ busybox-1.22.1/networking/ping.c	2014-05-24 14:31:09.000000000 +0200
-@@ -152,6 +152,7 @@
- 	pingsock = 0,
- };
- 
-+static int using_dgram;
- static void
- #if ENABLE_PING6
- create_icmp_socket(len_and_sockaddr *lsa)
-@@ -184,6 +185,7 @@
- 		if (sock < 0)
- #endif
- 		bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-+		using_dgram = 1;
- 	}
- 
- 	xmove_fd(sock, pingsock);
-@@ -234,10 +236,12 @@
- 				bb_perror_msg("recvfrom");
- 			continue;
- 		}
--		if (c >= 76) {			/* ip + icmp */
--			struct iphdr *iphdr = (struct iphdr *) G.packet;
-+		if (c >= 76 || using_dgram && (c == 64)) {			/* ip + icmp */
-+			if(!using_dgram) {
-+				struct iphdr *iphdr = (struct iphdr *) G.packet;
- 
--			pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
-+				pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
-+			} else pkt = (struct icmp *) G.packet;
- 			if (pkt->icmp_type == ICMP_ECHOREPLY)
- 				break;
- 		}
-@@ -628,19 +632,21 @@
- }
- static void unpack4(char *buf, int sz, struct sockaddr_in *from)
- {
--	struct icmp *icmppkt;
- 	struct iphdr *iphdr;
-+	struct icmp *icmppkt;
- 	int hlen;
- 
- 	/* discard if too short */
- 	if (sz < (datalen + ICMP_MINLEN))
- 		return;
-+	if(!using_dgram) {
-+		/* check IP header */
-+		iphdr = (struct iphdr *) buf;
-+		hlen = iphdr->ihl << 2;
-+		sz -= hlen;
-+		icmppkt = (struct icmp *) (buf + hlen);
-+	} else icmppkt = (struct icmp *) buf;
- 
--	/* check IP header */
--	iphdr = (struct iphdr *) buf;
--	hlen = iphdr->ihl << 2;
--	sz -= hlen;
--	icmppkt = (struct icmp *) (buf + hlen);
- 	if (icmppkt->icmp_id != myid)
- 		return;				/* not our ping */
- 
-@@ -652,7 +658,7 @@
- 			tp = (uint32_t *) icmppkt->icmp_data;
- 		unpack_tail(sz, tp,
- 			inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
--			recv_seq, iphdr->ttl);
-+			recv_seq, using_dgram ? 42 : iphdr->ttl);
- 	} else if (icmppkt->icmp_type != ICMP_ECHO) {
- 		bb_error_msg("warning: got ICMP %d (%s)",
- 				icmppkt->icmp_type,
-@@ -696,11 +702,31 @@
- 	int sockopt;
- 
- 	pingaddr.sin = lsa->u.sin;
--	if (source_lsa) {
-+	if (source_lsa && !using_dgram) {
- 		if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
- 				&source_lsa->u.sa, source_lsa->len))
- 			bb_error_msg_and_die("can't set multicast source interface");
- 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+	} else if(using_dgram) {
-+		struct sockaddr_in sa;
-+		socklen_t sl;
-+
-+		sa.sin_family = AF_INET;
-+		sa.sin_port = 0;
-+		sa.sin_addr.s_addr = source_lsa ?
-+			source_lsa->u.sin.sin_addr.s_addr : 0;
-+		sl = sizeof(sa);
-+
-+		if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+
-+		if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
-+			perror("getsockname");
-+			exit(2);
-+		}
-+		myid = sa.sin_port;
- 	}
- 
- 	/* enable broadcast pings */
-@@ -717,6 +743,15 @@
- 		setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
- 	}
- 
-+	if(using_dgram) {
-+		int hold = 65536;
-+		if (setsockopt(pingsock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RECVTTL)");
-+		if (setsockopt(pingsock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RETOPTS)");
-+
-+	}
-+
- 	signal(SIGINT, print_stats_and_exit);
- 
- 	/* start the ping's going ... */
-@@ -751,10 +786,33 @@
- 	char control_buf[CMSG_SPACE(36)];
- 
- 	pingaddr.sin6 = lsa->u.sin6;
--	if (source_lsa)
-+	if (source_lsa && !using_dgram)
- 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+	else if(using_dgram) {
-+                struct sockaddr_in6 sa = {0};
-+                socklen_t sl;
-+
-+                sa.sin6_family = AF_INET6;
-+                sa.sin6_port = 0;
-+		if(source_lsa) {
-+			memcpy(&sa.sin6_addr, &source_lsa->u.sin6.sin6_addr, sizeof(struct in6_addr));
-+		}
-+                sl = sizeof(sa);
-+
-+                if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
-+                        perror("bind");
-+                        exit(2);
-+                }
-+
-+                if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
-+                        perror("getsockname");
-+                        exit(2);
-+                }
-+                myid = sa.sin6_port;
-+	}
- 
- #ifdef ICMP6_FILTER
-+	if(!using_dgram)
- 	{
- 		struct icmp6_filter filt;
- 		if (!(option_mask32 & OPT_VERBOSE)) {
-@@ -880,7 +938,7 @@
- 			str_I = NULL; /* don't try to bind to device later */
- 		}
- 	}
--	myid = (uint16_t) getpid();
-+	if(!using_dgram) myid = (uint16_t) getpid();
- 	hostname = argv[optind];
- #if ENABLE_PING6
- 	{
-diff -Nur busybox-1.22.1.orig/networking/ping.c.orig busybox-1.22.1/networking/ping.c.orig
---- busybox-1.22.1.orig/networking/ping.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.22.1/networking/ping.c.orig	2014-01-20 03:38:10.000000000 +0100
-@@ -0,0 +1,966 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * Mini ping implementation for busybox
-+ *
-+ * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
-+ *
-+ * Adapted from the ping in netkit-base 0.10:
-+ * Copyright (c) 1989 The Regents of the University of California.
-+ * All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Mike Muuss.
-+ *
-+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-+ */
-+/* from ping6.c:
-+ * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
-+ *
-+ * This version of ping is adapted from the ping in netkit-base 0.10,
-+ * which is:
-+ *
-+ * Original copyright notice is retained at the end of this file.
-+ *
-+ * This version is an adaptation of ping.c from busybox.
-+ * The code was modified by Bart Visscher <magick@linux-fan.com>
-+ */
-+
-+#include <net/if.h>
-+#include <netinet/ip_icmp.h>
-+#include "libbb.h"
-+
-+#ifdef __BIONIC__
-+/* should be in netinet/ip_icmp.h */
-+# define ICMP_DEST_UNREACH    3  /* Destination Unreachable  */
-+# define ICMP_SOURCE_QUENCH   4  /* Source Quench    */
-+# define ICMP_REDIRECT        5  /* Redirect (change route)  */
-+# define ICMP_ECHO            8  /* Echo Request      */
-+# define ICMP_TIME_EXCEEDED  11  /* Time Exceeded    */
-+# define ICMP_PARAMETERPROB  12  /* Parameter Problem    */
-+# define ICMP_TIMESTAMP      13  /* Timestamp Request    */
-+# define ICMP_TIMESTAMPREPLY 14  /* Timestamp Reply    */
-+# define ICMP_INFO_REQUEST   15  /* Information Request    */
-+# define ICMP_INFO_REPLY     16  /* Information Reply    */
-+# define ICMP_ADDRESS        17  /* Address Mask Request    */
-+# define ICMP_ADDRESSREPLY   18  /* Address Mask Reply    */
-+#endif
-+
-+//config:config PING
-+//config:	bool "ping"
-+//config:	default y
-+//config:	select PLATFORM_LINUX
-+//config:	help
-+//config:	  ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
-+//config:	  elicit an ICMP ECHO_RESPONSE from a host or gateway.
-+//config:
-+//config:config PING6
-+//config:	bool "ping6"
-+//config:	default y
-+//config:	depends on FEATURE_IPV6 && PING
-+//config:	help
-+//config:	  This will give you a ping that can talk IPv6.
-+//config:
-+//config:config FEATURE_FANCY_PING
-+//config:	bool "Enable fancy ping output"
-+//config:	default y
-+//config:	depends on PING
-+//config:	help
-+//config:	  Make the output from the ping applet include statistics, and at the
-+//config:	  same time provide full support for ICMP packets.
-+
-+/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
-+//applet:IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
-+//applet:IF_PING6(APPLET(ping6, BB_DIR_BIN, BB_SUID_MAYBE))
-+
-+//kbuild:lib-$(CONFIG_PING)  += ping.o
-+//kbuild:lib-$(CONFIG_PING6) += ping.o
-+
-+//usage:#if !ENABLE_FEATURE_FANCY_PING
-+//usage:# define ping_trivial_usage
-+//usage:       "HOST"
-+//usage:# define ping_full_usage "\n\n"
-+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
-+//usage:# define ping6_trivial_usage
-+//usage:       "HOST"
-+//usage:# define ping6_full_usage "\n\n"
-+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts"
-+//usage:#else
-+//usage:# define ping_trivial_usage
-+//usage:       "[OPTIONS] HOST"
-+//usage:# define ping_full_usage "\n\n"
-+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
-+//usage:	IF_PING6(
-+//usage:     "\n	-4,-6		Force IP or IPv6 name resolution"
-+//usage:	)
-+//usage:     "\n	-c CNT		Send only CNT pings"
-+//usage:     "\n	-s SIZE		Send SIZE data bytes in packets (default:56)"
-+//usage:     "\n	-t TTL		Set TTL"
-+//usage:     "\n	-I IFACE/IP	Use interface or IP address as source"
-+//usage:     "\n	-W SEC		Seconds to wait for the first response (default:10)"
-+//usage:     "\n			(after all -c CNT packets are sent)"
-+//usage:     "\n	-w SEC		Seconds until ping exits (default:infinite)"
-+//usage:     "\n			(can exit earlier with -c CNT)"
-+//usage:     "\n	-q		Quiet, only displays output at start"
-+//usage:     "\n			and when finished"
-+//usage:
-+//usage:# define ping6_trivial_usage
-+//usage:       "[OPTIONS] HOST"
-+//usage:# define ping6_full_usage "\n\n"
-+//usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
-+//usage:     "\n	-c CNT		Send only CNT pings"
-+//usage:     "\n	-s SIZE		Send SIZE data bytes in packets (default:56)"
-+//usage:     "\n	-I IFACE/IP	Use interface or IP address as source"
-+//usage:     "\n	-q		Quiet, only displays output at start"
-+//usage:     "\n			and when finished"
-+//usage:
-+//usage:#endif
-+//usage:
-+//usage:#define ping_example_usage
-+//usage:       "$ ping localhost\n"
-+//usage:       "PING slag (127.0.0.1): 56 data bytes\n"
-+//usage:       "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n"
-+//usage:       "\n"
-+//usage:       "--- debian ping statistics ---\n"
-+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
-+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-+//usage:#define ping6_example_usage
-+//usage:       "$ ping6 ip6-localhost\n"
-+//usage:       "PING ip6-localhost (::1): 56 data bytes\n"
-+//usage:       "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n"
-+//usage:       "\n"
-+//usage:       "--- ip6-localhost ping statistics ---\n"
-+//usage:       "1 packets transmitted, 1 packets received, 0% packet loss\n"
-+//usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
-+
-+#if ENABLE_PING6
-+# include <netinet/icmp6.h>
-+/* I see RENUMBERED constants in bits/in.h - !!?
-+ * What a fuck is going on with libc? Is it a glibc joke? */
-+# ifdef IPV6_2292HOPLIMIT
-+#  undef IPV6_HOPLIMIT
-+#  define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
-+# endif
-+#endif
-+
-+enum {
-+	DEFDATALEN = 56,
-+	MAXIPLEN = 60,
-+	MAXICMPLEN = 76,
-+	MAX_DUP_CHK = (8 * 128),
-+	MAXWAIT = 10,
-+	PINGINTERVAL = 1, /* 1 second */
-+	pingsock = 0,
-+};
-+
-+static void
-+#if ENABLE_PING6
-+create_icmp_socket(len_and_sockaddr *lsa)
-+#else
-+create_icmp_socket(void)
-+#define create_icmp_socket(lsa) create_icmp_socket()
-+#endif
-+{
-+	int sock;
-+#if ENABLE_PING6
-+	if (lsa->u.sa.sa_family == AF_INET6)
-+		sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
-+	else
-+#endif
-+		sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
-+	if (sock < 0) {
-+		if (errno != EPERM)
-+			bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-+#if defined(__linux__) || defined(__APPLE__)
-+		/* We don't have root privileges.  Try SOCK_DGRAM instead.
-+		 * Linux needs net.ipv4.ping_group_range for this to work.
-+		 * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ
-+		 */
-+#if ENABLE_PING6
-+		if (lsa->u.sa.sa_family == AF_INET6)
-+			sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
-+		else
-+#endif
-+			sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */
-+		if (sock < 0)
-+#endif
-+		bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-+	}
-+
-+	xmove_fd(sock, pingsock);
-+}
-+
-+#if !ENABLE_FEATURE_FANCY_PING
-+
-+/* Simple version */
-+
-+struct globals {
-+	char *hostname;
-+	char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
-+} FIX_ALIASING;
-+#define G (*(struct globals*)&bb_common_bufsiz1)
-+#define INIT_G() do { } while (0)
-+
-+static void noresp(int ign UNUSED_PARAM)
-+{
-+	printf("No response from %s\n", G.hostname);
-+	exit(EXIT_FAILURE);
-+}
-+
-+static void ping4(len_and_sockaddr *lsa)
-+{
-+	struct icmp *pkt;
-+	int c;
-+
-+	pkt = (struct icmp *) G.packet;
-+	/*memset(pkt, 0, sizeof(G.packet)); already is */
-+	pkt->icmp_type = ICMP_ECHO;
-+	pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
-+
-+	xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
-+
-+	/* listen for replies */
-+	while (1) {
-+#if 0
-+		struct sockaddr_in from;
-+		socklen_t fromlen = sizeof(from);
-+
-+		c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
-+				(struct sockaddr *) &from, &fromlen);
-+#else
-+		c = recv(pingsock, G.packet, sizeof(G.packet), 0);
-+#endif
-+		if (c < 0) {
-+			if (errno != EINTR)
-+				bb_perror_msg("recvfrom");
-+			continue;
-+		}
-+		if (c >= 76) {			/* ip + icmp */
-+			struct iphdr *iphdr = (struct iphdr *) G.packet;
-+
-+			pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
-+			if (pkt->icmp_type == ICMP_ECHOREPLY)
-+				break;
-+		}
-+	}
-+	if (ENABLE_FEATURE_CLEAN_UP)
-+		close(pingsock);
-+}
-+
-+#if ENABLE_PING6
-+static void ping6(len_and_sockaddr *lsa)
-+{
-+	struct icmp6_hdr *pkt;
-+	int c;
-+	int sockopt;
-+
-+	pkt = (struct icmp6_hdr *) G.packet;
-+	/*memset(pkt, 0, sizeof(G.packet)); already is */
-+	pkt->icmp6_type = ICMP6_ECHO_REQUEST;
-+
-+	sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
-+	setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
-+
-+	xsendto(pingsock, G.packet, DEFDATALEN + sizeof(struct icmp6_hdr), &lsa->u.sa, lsa->len);
-+
-+	/* listen for replies */
-+	while (1) {
-+#if 0
-+		struct sockaddr_in6 from;
-+		socklen_t fromlen = sizeof(from);
-+
-+		c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0,
-+				(struct sockaddr *) &from, &fromlen);
-+#else
-+		c = recv(pingsock, G.packet, sizeof(G.packet), 0);
-+#endif
-+		if (c < 0) {
-+			if (errno != EINTR)
-+				bb_perror_msg("recvfrom");
-+			continue;
-+		}
-+		if (c >= ICMP_MINLEN) {	/* icmp6_hdr */
-+			if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
-+				break;
-+		}
-+	}
-+	if (ENABLE_FEATURE_CLEAN_UP)
-+		close(pingsock);
-+}
-+#endif
-+
-+#if !ENABLE_PING6
-+# define common_ping_main(af, argv) common_ping_main(argv)
-+#endif
-+static int common_ping_main(sa_family_t af, char **argv)
-+{
-+	len_and_sockaddr *lsa;
-+
-+	INIT_G();
-+
-+#if ENABLE_PING6
-+	while ((++argv)[0] && argv[0][0] == '-') {
-+		if (argv[0][1] == '4') {
-+			af = AF_INET;
-+			continue;
-+		}
-+		if (argv[0][1] == '6') {
-+			af = AF_INET6;
-+			continue;
-+		}
-+		bb_show_usage();
-+	}
-+#else
-+	argv++;
-+#endif
-+
-+	G.hostname = *argv;
-+	if (!G.hostname)
-+		bb_show_usage();
-+
-+#if ENABLE_PING6
-+	lsa = xhost_and_af2sockaddr(G.hostname, 0, af);
-+#else
-+	lsa = xhost_and_af2sockaddr(G.hostname, 0, AF_INET);
-+#endif
-+	/* Set timer _after_ DNS resolution */
-+	signal(SIGALRM, noresp);
-+	alarm(5); /* give the host 5000ms to respond */
-+
-+	create_icmp_socket(lsa);
-+#if ENABLE_PING6
-+	if (lsa->u.sa.sa_family == AF_INET6)
-+		ping6(lsa);
-+	else
-+#endif
-+		ping4(lsa);
-+	printf("%s is alive!\n", G.hostname);
-+	return EXIT_SUCCESS;
-+}
-+
-+
-+#else /* FEATURE_FANCY_PING */
-+
-+
-+/* Full(er) version */
-+
-+#define OPT_STRING ("qvc:s:t:w:W:I:n4" IF_PING6("6"))
-+enum {
-+	OPT_QUIET = 1 << 0,
-+	OPT_VERBOSE = 1 << 1,
-+	OPT_c = 1 << 2,
-+	OPT_s = 1 << 3,
-+	OPT_t = 1 << 4,
-+	OPT_w = 1 << 5,
-+	OPT_W = 1 << 6,
-+	OPT_I = 1 << 7,
-+	/*OPT_n = 1 << 8, - ignored */
-+	OPT_IPV4 = 1 << 9,
-+	OPT_IPV6 = (1 << 10) * ENABLE_PING6,
-+};
-+
-+
-+struct globals {
-+	int if_index;
-+	char *str_I;
-+	len_and_sockaddr *source_lsa;
-+	unsigned datalen;
-+	unsigned pingcount; /* must be int-sized */
-+	unsigned opt_ttl;
-+	unsigned long ntransmitted, nreceived, nrepeats;
-+	uint16_t myid;
-+	unsigned tmin, tmax; /* in us */
-+	unsigned long long tsum; /* in us, sum of all times */
-+	unsigned deadline;
-+	unsigned timeout;
-+	unsigned total_secs;
-+	unsigned sizeof_rcv_packet;
-+	char *rcv_packet; /* [datalen + MAXIPLEN + MAXICMPLEN] */
-+	void *snd_packet; /* [datalen + ipv4/ipv6_const] */
-+	const char *hostname;
-+	const char *dotted;
-+	union {
-+		struct sockaddr sa;
-+		struct sockaddr_in sin;
-+#if ENABLE_PING6
-+		struct sockaddr_in6 sin6;
-+#endif
-+	} pingaddr;
-+	unsigned char rcvd_tbl[MAX_DUP_CHK / 8];
-+} FIX_ALIASING;
-+#define G (*(struct globals*)&bb_common_bufsiz1)
-+#define if_index     (G.if_index    )
-+#define source_lsa   (G.source_lsa  )
-+#define str_I        (G.str_I       )
-+#define datalen      (G.datalen     )
-+#define pingcount    (G.pingcount   )
-+#define opt_ttl      (G.opt_ttl     )
-+#define myid         (G.myid        )
-+#define tmin         (G.tmin        )
-+#define tmax         (G.tmax        )
-+#define tsum         (G.tsum        )
-+#define deadline     (G.deadline    )
-+#define timeout      (G.timeout     )
-+#define total_secs   (G.total_secs  )
-+#define hostname     (G.hostname    )
-+#define dotted       (G.dotted      )
-+#define pingaddr     (G.pingaddr    )
-+#define rcvd_tbl     (G.rcvd_tbl    )
-+void BUG_ping_globals_too_big(void);
-+#define INIT_G() do { \
-+	if (sizeof(G) > COMMON_BUFSIZE) \
-+		BUG_ping_globals_too_big(); \
-+	datalen = DEFDATALEN; \
-+	timeout = MAXWAIT; \
-+	tmin = UINT_MAX; \
-+} while (0)
-+
-+
-+#define BYTE(bit)	rcvd_tbl[(bit)>>3]
-+#define MASK(bit)	(1 << ((bit) & 7))
-+#define SET(bit)	(BYTE(bit) |= MASK(bit))
-+#define CLR(bit)	(BYTE(bit) &= (~MASK(bit)))
-+#define TST(bit)	(BYTE(bit) & MASK(bit))
-+
-+static void print_stats_and_exit(int junk) NORETURN;
-+static void print_stats_and_exit(int junk UNUSED_PARAM)
-+{
-+	unsigned long ul;
-+	unsigned long nrecv;
-+
-+	signal(SIGINT, SIG_IGN);
-+
-+	nrecv = G.nreceived;
-+	printf("\n--- %s ping statistics ---\n"
-+		"%lu packets transmitted, "
-+		"%lu packets received, ",
-+		hostname, G.ntransmitted, nrecv
-+	);
-+	if (G.nrepeats)
-+		printf("%lu duplicates, ", G.nrepeats);
-+	ul = G.ntransmitted;
-+	if (ul != 0)
-+		ul = (ul - nrecv) * 100 / ul;
-+	printf("%lu%% packet loss\n", ul);
-+	if (tmin != UINT_MAX) {
-+		unsigned tavg = tsum / (nrecv + G.nrepeats);
-+		printf("round-trip min/avg/max = %u.%03u/%u.%03u/%u.%03u ms\n",
-+			tmin / 1000, tmin % 1000,
-+			tavg / 1000, tavg % 1000,
-+			tmax / 1000, tmax % 1000);
-+	}
-+	/* if condition is true, exit with 1 -- 'failure' */
-+	exit(nrecv == 0 || (deadline && nrecv < pingcount));
-+}
-+
-+static void sendping_tail(void (*sp)(int), int size_pkt)
-+{
-+	int sz;
-+
-+	CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK);
-+	G.ntransmitted++;
-+
-+	size_pkt += datalen;
-+
-+	/* sizeof(pingaddr) can be larger than real sa size, but I think
-+	 * it doesn't matter */
-+	sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr));
-+	if (sz != size_pkt)
-+		bb_error_msg_and_die(bb_msg_write_error);
-+
-+	if (pingcount == 0 || deadline || G.ntransmitted < pingcount) {
-+		/* Didn't send all pings yet - schedule next in 1s */
-+		signal(SIGALRM, sp);
-+		if (deadline) {
-+			total_secs += PINGINTERVAL;
-+			if (total_secs >= deadline)
-+				signal(SIGALRM, print_stats_and_exit);
-+		}
-+		alarm(PINGINTERVAL);
-+	} else { /* -c NN, and all NN are sent (and no deadline) */
-+		/* Wait for the last ping to come back.
-+		 * -W timeout: wait for a response in seconds.
-+		 * Affects only timeout in absense of any responses,
-+		 * otherwise ping waits for two RTTs. */
-+		unsigned expire = timeout;
-+
-+		if (G.nreceived) {
-+			/* approx. 2*tmax, in seconds (2 RTT) */
-+			expire = tmax / (512*1024);
-+			if (expire == 0)
-+				expire = 1;
-+		}
-+		signal(SIGALRM, print_stats_and_exit);
-+		alarm(expire);
-+	}
-+}
-+
-+static void sendping4(int junk UNUSED_PARAM)
-+{
-+	struct icmp *pkt = G.snd_packet;
-+
-+	//memset(pkt, 0, datalen + ICMP_MINLEN + 4); - G.snd_packet was xzalloced
-+	pkt->icmp_type = ICMP_ECHO;
-+	/*pkt->icmp_code = 0;*/
-+	pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */
-+	pkt->icmp_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */
-+	pkt->icmp_id = myid;
-+
-+	/* If datalen < 4, we store timestamp _past_ the packet,
-+	 * but it's ok - we allocated 4 extra bytes in xzalloc() just in case.
-+	 */
-+	/*if (datalen >= 4)*/
-+		/* No hton: we'll read it back on the same machine */
-+		*(uint32_t*)&pkt->icmp_dun = monotonic_us();
-+
-+	pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, datalen + ICMP_MINLEN);
-+
-+	sendping_tail(sendping4, ICMP_MINLEN);
-+}
-+#if ENABLE_PING6
-+static void sendping6(int junk UNUSED_PARAM)
-+{
-+	struct icmp6_hdr *pkt = G.snd_packet;
-+
-+	//memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
-+	pkt->icmp6_type = ICMP6_ECHO_REQUEST;
-+	/*pkt->icmp6_code = 0;*/
-+	/*pkt->icmp6_cksum = 0;*/
-+	pkt->icmp6_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */
-+	pkt->icmp6_id = myid;
-+
-+	/*if (datalen >= 4)*/
-+		*(bb__aliased_uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
-+
-+	//TODO? pkt->icmp_cksum = inet_cksum(...);
-+
-+	sendping_tail(sendping6, sizeof(struct icmp6_hdr));
-+}
-+#endif
-+
-+static const char *icmp_type_name(int id)
-+{
-+	switch (id) {
-+	case ICMP_ECHOREPLY:      return "Echo Reply";
-+	case ICMP_DEST_UNREACH:   return "Destination Unreachable";
-+	case ICMP_SOURCE_QUENCH:  return "Source Quench";
-+	case ICMP_REDIRECT:       return "Redirect (change route)";
-+	case ICMP_ECHO:           return "Echo Request";
-+	case ICMP_TIME_EXCEEDED:  return "Time Exceeded";
-+	case ICMP_PARAMETERPROB:  return "Parameter Problem";
-+	case ICMP_TIMESTAMP:      return "Timestamp Request";
-+	case ICMP_TIMESTAMPREPLY: return "Timestamp Reply";
-+	case ICMP_INFO_REQUEST:   return "Information Request";
-+	case ICMP_INFO_REPLY:     return "Information Reply";
-+	case ICMP_ADDRESS:        return "Address Mask Request";
-+	case ICMP_ADDRESSREPLY:   return "Address Mask Reply";
-+	default:                  return "unknown ICMP type";
-+	}
-+}
-+#if ENABLE_PING6
-+/* RFC3542 changed some definitions from RFC2292 for no good reason, whee!
-+ * the newer 3542 uses a MLD_ prefix where as 2292 uses ICMP6_ prefix */
-+#ifndef MLD_LISTENER_QUERY
-+# define MLD_LISTENER_QUERY ICMP6_MEMBERSHIP_QUERY
-+#endif
-+#ifndef MLD_LISTENER_REPORT
-+# define MLD_LISTENER_REPORT ICMP6_MEMBERSHIP_REPORT
-+#endif
-+#ifndef MLD_LISTENER_REDUCTION
-+# define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
-+#endif
-+static const char *icmp6_type_name(int id)
-+{
-+	switch (id) {
-+	case ICMP6_DST_UNREACH:      return "Destination Unreachable";
-+	case ICMP6_PACKET_TOO_BIG:   return "Packet too big";
-+	case ICMP6_TIME_EXCEEDED:    return "Time Exceeded";
-+	case ICMP6_PARAM_PROB:       return "Parameter Problem";
-+	case ICMP6_ECHO_REPLY:       return "Echo Reply";
-+	case ICMP6_ECHO_REQUEST:     return "Echo Request";
-+	case MLD_LISTENER_QUERY:     return "Listener Query";
-+	case MLD_LISTENER_REPORT:    return "Listener Report";
-+	case MLD_LISTENER_REDUCTION: return "Listener Reduction";
-+	default:                     return "unknown ICMP type";
-+	}
-+}
-+#endif
-+
-+static void unpack_tail(int sz, uint32_t *tp,
-+		const char *from_str,
-+		uint16_t recv_seq, int ttl)
-+{
-+	unsigned char *b, m;
-+	const char *dupmsg = " (DUP!)";
-+	unsigned triptime = triptime; /* for gcc */
-+
-+	if (tp) {
-+		/* (int32_t) cast is for hypothetical 64-bit unsigned */
-+		/* (doesn't hurt 32-bit real-world anyway) */
-+		triptime = (int32_t) ((uint32_t)monotonic_us() - *tp);
-+		tsum += triptime;
-+		if (triptime < tmin)
-+			tmin = triptime;
-+		if (triptime > tmax)
-+			tmax = triptime;
-+	}
-+
-+	b = &BYTE(recv_seq % MAX_DUP_CHK);
-+	m = MASK(recv_seq % MAX_DUP_CHK);
-+	/*if TST(recv_seq % MAX_DUP_CHK):*/
-+	if (*b & m) {
-+		++G.nrepeats;
-+	} else {
-+		/*SET(recv_seq % MAX_DUP_CHK):*/
-+		*b |= m;
-+		++G.nreceived;
-+		dupmsg += 7;
-+	}
-+
-+	if (option_mask32 & OPT_QUIET)
-+		return;
-+
-+	printf("%d bytes from %s: seq=%u ttl=%d", sz,
-+		from_str, recv_seq, ttl);
-+	if (tp)
-+		printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000);
-+	puts(dupmsg);
-+	fflush_all();
-+}
-+static void unpack4(char *buf, int sz, struct sockaddr_in *from)
-+{
-+	struct icmp *icmppkt;
-+	struct iphdr *iphdr;
-+	int hlen;
-+
-+	/* discard if too short */
-+	if (sz < (datalen + ICMP_MINLEN))
-+		return;
-+
-+	/* check IP header */
-+	iphdr = (struct iphdr *) buf;
-+	hlen = iphdr->ihl << 2;
-+	sz -= hlen;
-+	icmppkt = (struct icmp *) (buf + hlen);
-+	if (icmppkt->icmp_id != myid)
-+		return;				/* not our ping */
-+
-+	if (icmppkt->icmp_type == ICMP_ECHOREPLY) {
-+		uint16_t recv_seq = ntohs(icmppkt->icmp_seq);
-+		uint32_t *tp = NULL;
-+
-+		if (sz >= ICMP_MINLEN + sizeof(uint32_t))
-+			tp = (uint32_t *) icmppkt->icmp_data;
-+		unpack_tail(sz, tp,
-+			inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
-+			recv_seq, iphdr->ttl);
-+	} else if (icmppkt->icmp_type != ICMP_ECHO) {
-+		bb_error_msg("warning: got ICMP %d (%s)",
-+				icmppkt->icmp_type,
-+				icmp_type_name(icmppkt->icmp_type));
-+	}
-+}
-+#if ENABLE_PING6
-+static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
-+{
-+	struct icmp6_hdr *icmppkt;
-+	char buf[INET6_ADDRSTRLEN];
-+
-+	/* discard if too short */
-+	if (sz < (datalen + sizeof(struct icmp6_hdr)))
-+		return;
-+
-+	icmppkt = (struct icmp6_hdr *) packet;
-+	if (icmppkt->icmp6_id != myid)
-+		return;				/* not our ping */
-+
-+	if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
-+		uint16_t recv_seq = ntohs(icmppkt->icmp6_seq);
-+		uint32_t *tp = NULL;
-+
-+		if (sz >= sizeof(struct icmp6_hdr) + sizeof(uint32_t))
-+			tp = (uint32_t *) &icmppkt->icmp6_data8[4];
-+		unpack_tail(sz, tp,
-+			inet_ntop(AF_INET6, &from->sin6_addr,
-+					buf, sizeof(buf)),
-+			recv_seq, hoplimit);
-+	} else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) {
-+		bb_error_msg("warning: got ICMP %d (%s)",
-+				icmppkt->icmp6_type,
-+				icmp6_type_name(icmppkt->icmp6_type));
-+	}
-+}
-+#endif
-+
-+static void ping4(len_and_sockaddr *lsa)
-+{
-+	int sockopt;
-+
-+	pingaddr.sin = lsa->u.sin;
-+	if (source_lsa) {
-+		if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
-+				&source_lsa->u.sa, source_lsa->len))
-+			bb_error_msg_and_die("can't set multicast source interface");
-+		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+	}
-+
-+	/* enable broadcast pings */
-+	setsockopt_broadcast(pingsock);
-+
-+	/* set recv buf (needed if we can get lots of responses: flood ping,
-+	 * broadcast ping etc) */
-+	sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
-+	setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
-+
-+	if (opt_ttl != 0) {
-+		setsockopt(pingsock, IPPROTO_IP, IP_TTL, &opt_ttl, sizeof(opt_ttl));
-+		/* above doesnt affect packets sent to bcast IP, so... */
-+		setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
-+	}
-+
-+	signal(SIGINT, print_stats_and_exit);
-+
-+	/* start the ping's going ... */
-+	sendping4(0);
-+
-+	/* listen for replies */
-+	while (1) {
-+		struct sockaddr_in from;
-+		socklen_t fromlen = (socklen_t) sizeof(from);
-+		int c;
-+
-+		c = recvfrom(pingsock, G.rcv_packet, G.sizeof_rcv_packet, 0,
-+				(struct sockaddr *) &from, &fromlen);
-+		if (c < 0) {
-+			if (errno != EINTR)
-+				bb_perror_msg("recvfrom");
-+			continue;
-+		}
-+		unpack4(G.rcv_packet, c, &from);
-+		if (pingcount && G.nreceived >= pingcount)
-+			break;
-+	}
-+}
-+#if ENABLE_PING6
-+extern int BUG_bad_offsetof_icmp6_cksum(void);
-+static void ping6(len_and_sockaddr *lsa)
-+{
-+	int sockopt;
-+	struct msghdr msg;
-+	struct sockaddr_in6 from;
-+	struct iovec iov;
-+	char control_buf[CMSG_SPACE(36)];
-+
-+	pingaddr.sin6 = lsa->u.sin6;
-+	if (source_lsa)
-+		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+
-+#ifdef ICMP6_FILTER
-+	{
-+		struct icmp6_filter filt;
-+		if (!(option_mask32 & OPT_VERBOSE)) {
-+			ICMP6_FILTER_SETBLOCKALL(&filt);
-+			ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
-+		} else {
-+			ICMP6_FILTER_SETPASSALL(&filt);
-+		}
-+		if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
-+					sizeof(filt)) < 0)
-+			bb_error_msg_and_die("setsockopt(ICMP6_FILTER)");
-+	}
-+#endif /*ICMP6_FILTER*/
-+
-+	/* enable broadcast pings */
-+	setsockopt_broadcast(pingsock);
-+
-+	/* set recv buf (needed if we can get lots of responses: flood ping,
-+	 * broadcast ping etc) */
-+	sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
-+	setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
-+
-+	sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
-+	if (offsetof(struct icmp6_hdr, icmp6_cksum) != 2)
-+		BUG_bad_offsetof_icmp6_cksum();
-+	setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
-+
-+	/* request ttl info to be returned in ancillary data */
-+	setsockopt(pingsock, SOL_IPV6, IPV6_HOPLIMIT, &const_int_1, sizeof(const_int_1));
-+
-+	if (if_index)
-+		pingaddr.sin6.sin6_scope_id = if_index;
-+
-+	signal(SIGINT, print_stats_and_exit);
-+
-+	/* start the ping's going ... */
-+	sendping6(0);
-+
-+	/* listen for replies */
-+	msg.msg_name = &from;
-+	msg.msg_namelen = sizeof(from);
-+	msg.msg_iov = &iov;
-+	msg.msg_iovlen = 1;
-+	msg.msg_control = control_buf;
-+	iov.iov_base = G.rcv_packet;
-+	iov.iov_len = G.sizeof_rcv_packet;
-+	while (1) {
-+		int c;
-+		struct cmsghdr *mp;
-+		int hoplimit = -1;
-+		msg.msg_controllen = sizeof(control_buf);
-+
-+		c = recvmsg(pingsock, &msg, 0);
-+		if (c < 0) {
-+			if (errno != EINTR)
-+				bb_perror_msg("recvfrom");
-+			continue;
-+		}
-+		for (mp = CMSG_FIRSTHDR(&msg); mp; mp = CMSG_NXTHDR(&msg, mp)) {
-+			if (mp->cmsg_level == SOL_IPV6
-+			 && mp->cmsg_type == IPV6_HOPLIMIT
-+			 /* don't check len - we trust the kernel: */
-+			 /* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */
-+			) {
-+				/*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */
-+				move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
-+			}
-+		}
-+		unpack6(G.rcv_packet, c, &from, hoplimit);
-+		if (pingcount && G.nreceived >= pingcount)
-+			break;
-+	}
-+}
-+#endif
-+
-+static void ping(len_and_sockaddr *lsa)
-+{
-+	printf("PING %s (%s)", hostname, dotted);
-+	if (source_lsa) {
-+		printf(" from %s",
-+			xmalloc_sockaddr2dotted_noport(&source_lsa->u.sa));
-+	}
-+	printf(": %d data bytes\n", datalen);
-+
-+	create_icmp_socket(lsa);
-+	/* untested whether "-I addr" really works for IPv6: */
-+	if (str_I)
-+		setsockopt_bindtodevice(pingsock, str_I);
-+
-+	G.sizeof_rcv_packet = datalen + MAXIPLEN + MAXICMPLEN;
-+	G.rcv_packet = xzalloc(G.sizeof_rcv_packet);
-+#if ENABLE_PING6
-+	if (lsa->u.sa.sa_family == AF_INET6) {
-+		/* +4 reserves a place for timestamp, which may end up sitting
-+		 * _after_ packet. Saves one if() - see sendping4/6() */
-+		G.snd_packet = xzalloc(datalen + sizeof(struct icmp6_hdr) + 4);
-+		ping6(lsa);
-+	} else
-+#endif
-+	{
-+		G.snd_packet = xzalloc(datalen + ICMP_MINLEN + 4);
-+		ping4(lsa);
-+	}
-+}
-+
-+static int common_ping_main(int opt, char **argv)
-+{
-+	len_and_sockaddr *lsa;
-+	char *str_s;
-+
-+	INIT_G();
-+
-+	/* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
-+	opt_complementary = "=1:q--v:v--q:c+:t+:w+:W+";
-+	opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I);
-+	if (opt & OPT_s)
-+		datalen = xatou16(str_s); // -s
-+	if (opt & OPT_I) { // -I
-+		if_index = if_nametoindex(str_I);
-+		if (!if_index) {
-+			/* TODO: I'm not sure it takes IPv6 unless in [XX:XX..] format */
-+			source_lsa = xdotted2sockaddr(str_I, 0);
-+			str_I = NULL; /* don't try to bind to device later */
-+		}
-+	}
-+	myid = (uint16_t) getpid();
-+	hostname = argv[optind];
-+#if ENABLE_PING6
-+	{
-+		sa_family_t af = AF_UNSPEC;
-+		if (opt & OPT_IPV4)
-+			af = AF_INET;
-+		if (opt & OPT_IPV6)
-+			af = AF_INET6;
-+		lsa = xhost_and_af2sockaddr(hostname, 0, af);
-+	}
-+#else
-+	lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
-+#endif
-+
-+	if (source_lsa && source_lsa->u.sa.sa_family != lsa->u.sa.sa_family)
-+		/* leaking it here... */
-+		source_lsa = NULL;
-+
-+	dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
-+	ping(lsa);
-+	print_stats_and_exit(EXIT_SUCCESS);
-+	/*return EXIT_SUCCESS;*/
-+}
-+#endif /* FEATURE_FANCY_PING */
-+
-+
-+int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-+int ping_main(int argc UNUSED_PARAM, char **argv)
-+{
-+#if !ENABLE_FEATURE_FANCY_PING
-+	return common_ping_main(AF_UNSPEC, argv);
-+#else
-+	return common_ping_main(0, argv);
-+#endif
-+}
-+
-+#if ENABLE_PING6
-+int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-+int ping6_main(int argc UNUSED_PARAM, char **argv)
-+{
-+# if !ENABLE_FEATURE_FANCY_PING
-+	return common_ping_main(AF_INET6, argv);
-+# else
-+	return common_ping_main(OPT_IPV6, argv);
-+# endif
-+}
-+#endif
-+
-+/* from ping6.c:
-+ * Copyright (c) 1989 The Regents of the University of California.
-+ * All rights reserved.
-+ *
-+ * This code is derived from software contributed to Berkeley by
-+ * Mike Muuss.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
-+ *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
-+ *
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
diff --git a/package/busybox/patches/005-busybox-1.23.0-modprobe.patch b/package/busybox/patches/005-busybox-1.23.0-modprobe.patch
new file mode 100644
index 000000000..5b28cdec5
--- /dev/null
+++ b/package/busybox/patches/005-busybox-1.23.0-modprobe.patch
@@ -0,0 +1,114 @@
+--- busybox-1.23.0/modutils/depmod.c
++++ busybox-1.23.0-modprobe/modutils/depmod.c
+@@ -51,7 +51,11 @@ static int FAST_FUNC parse_module(const
+ 
+ 	info->dnext = info->dprev = info;
+ 	info->name = xstrdup(fname + 2); /* skip "./" */
+-	info->modname = xstrdup(filename2modname(fname, modname));
++	info->modname = xstrdup(
++		filename2modname(
++			bb_get_last_path_component_nostrip(fname),
++			modname
++	));
+ 	for (ptr = image; ptr < image + len - 10; ptr++) {
+ 		if (strncmp(ptr, "depends=", 8) == 0) {
+ 			char *u;
+@@ -242,17 +246,18 @@ int depmod_main(int argc UNUSED_PARAM, c
+ 	if (!(option_mask32 & OPT_n))
+ 		xfreopen_write("modules.alias", stdout);
+ 	for (m = modules; m != NULL; m = m->next) {
++		char modname[MODULE_NAME_LEN];
+ 		const char *fname = bb_basename(m->name);
+-		int fnlen = strchrnul(fname, '.') - fname;
++		filename2modname(fname, modname);
+ 		while (m->aliases) {
+ 			/* Last word can well be m->modname instead,
+ 			 * but depmod from module-init-tools 3.4
+ 			 * uses module basename, i.e., no s/-/_/g.
+ 			 * (pathname and .ko.* are still stripped)
+ 			 * Mimicking that... */
+-			printf("alias %s %.*s\n",
++			printf("alias %s %s\n",
+ 				(char*)llist_pop(&m->aliases),
+-				fnlen, fname);
++				modname);
+ 		}
+ 	}
+ #endif
+@@ -260,12 +265,13 @@ int depmod_main(int argc UNUSED_PARAM, c
+ 	if (!(option_mask32 & OPT_n))
+ 		xfreopen_write("modules.symbols", stdout);
+ 	for (m = modules; m != NULL; m = m->next) {
++		char modname[MODULE_NAME_LEN];
+ 		const char *fname = bb_basename(m->name);
+-		int fnlen = strchrnul(fname, '.') - fname;
++		filename2modname(fname, modname);
+ 		while (m->symbols) {
+-			printf("alias symbol:%s %.*s\n",
++			printf("alias symbol:%s %s\n",
+ 				(char*)llist_pop(&m->symbols),
+-				fnlen, fname);
++				modname);
+ 		}
+ 	}
+ #endif
+--- busybox-1.23.0/modutils/modprobe.c
++++ busybox-1.23.0-modprobe/modutils/modprobe.c
+@@ -238,17 +238,6 @@ static void add_probe(const char *name)
+ {
+ 	struct module_entry *m;
+ 
+-	/*
+-	 * get_or_add_modentry() strips path from name and works
+-	 * on remaining basename.
+-	 * This would make "rmmod dir/name" and "modprobe dir/name"
+-	 * to work like "rmmod name" and "modprobe name",
+-	 * which is wrong, and can be abused via implicit modprobing:
+-	 * "ifconfig /usbserial up" tries to modprobe netdev-/usbserial.
+-	 */
+-	if (strchr(name, '/'))
+-		bb_error_msg_and_die("malformed module name '%s'", name);
+-
+ 	m = get_or_add_modentry(name);
+ 	if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
+ 	 && (m->flags & MODULE_FLAG_LOADED)
+--- busybox-1.23.0/modutils/modprobe-small.c
++++ busybox-1.23.0-modprobe/modutils/modprobe-small.c
+@@ -149,9 +149,13 @@ static void replace(char *s, char what,
+ static char *filename2modname(const char *filename, char *modname)
+ {
+ 	int i;
+-	char *from;
++	const char *from;
+ 
+-	from = bb_get_last_path_component_nostrip(filename);
++	// Disabled since otherwise "modprobe dir/name" would work
++	// as if it is "modprobe name". It is unclear why
++	// 'basenamization' was here in the first place.
++	//from = bb_get_last_path_component_nostrip(filename);
++	from = filename;
+ 	for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
+ 		modname[i] = (from[i] == '-') ? '_' : from[i];
+ 	modname[i] = '\0';
+--- busybox-1.23.0/modutils/modutils.c
++++ busybox-1.23.0-modprobe/modutils/modutils.c
+@@ -48,13 +48,17 @@ int FAST_FUNC string_to_llist(char *stri
+ char* FAST_FUNC filename2modname(const char *filename, char *modname)
+ {
+ 	int i;
+-	char *from;
++	const char *from;
+ 
+ 	if (filename == NULL)
+ 		return NULL;
+ 	if (modname == NULL)
+ 		modname = xmalloc(MODULE_NAME_LEN);
+-	from = bb_get_last_path_component_nostrip(filename);
++	// Disabled since otherwise "modprobe dir/name" would work
++	// as if it is "modprobe name". It is unclear why
++	// 'basenamization' was here in the first place.
++	//from = bb_get_last_path_component_nostrip(filename);
++	from = filename;
+ 	for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
+ 		modname[i] = (from[i] == '-') ? '_' : from[i];
+ 	modname[i] = '\0';
diff --git a/package/busybox/patches/006-busybox-1.23.0-vi.patch b/package/busybox/patches/006-busybox-1.23.0-vi.patch
new file mode 100644
index 000000000..3a07ab9d9
--- /dev/null
+++ b/package/busybox/patches/006-busybox-1.23.0-vi.patch
@@ -0,0 +1,49 @@
+--- busybox-1.23.0/editors/vi.c
++++ busybox-1.23.0-vi/editors/vi.c
+@@ -542,9 +542,6 @@ static void cookmode(void);	// return to
+ static int mysleep(int);
+ static int readit(void);	// read (maybe cursor) key from stdin
+ static int get_one_char(void);	// read 1 char from stdin
+-#if !ENABLE_FEATURE_VI_READONLY
+-#define file_insert(fn, p, update_ro_status) file_insert(fn, p)
+-#endif
+ // file_insert might reallocate text[]!
+ static int file_insert(const char *, char *, int);
+ static int file_write(char *, char *, char *);
+@@ -1325,7 +1322,7 @@ static void colon(char *buf)
+ 			q = next_line(q);
+ 		{ // dance around potentially-reallocated text[]
+ 			uintptr_t ofs = q - text;
+-			size = file_insert(fn, q, /*update_ro:*/ 0);
++			size = file_insert(fn, q, 0);
+ 			q = text + ofs;
+ 		}
+ 		if (size < 0)
+@@ -2905,7 +2902,7 @@ static char *get_input_line(const char *
+ }
+ 
+ // might reallocate text[]!
+-static int file_insert(const char *fn, char *p, int update_ro_status)
++static int file_insert(const char *fn, char *p, int initial)
+ {
+ 	int cnt = -1;
+ 	int fd, size;
+@@ -2918,7 +2915,8 @@ static int file_insert(const char *fn, c
+ 
+ 	fd = open(fn, O_RDONLY);
+ 	if (fd < 0) {
+-		status_line_bold_errno(fn);
++		if (!initial)
++			status_line_bold_errno(fn);
+ 		return cnt;
+ 	}
+ 
+@@ -2946,7 +2944,7 @@ static int file_insert(const char *fn, c
+ 	close(fd);
+ 
+ #if ENABLE_FEATURE_VI_READONLY
+-	if (update_ro_status
++	if (initial
+ 	 && ((access(fn, W_OK) < 0) ||
+ 		/* root will always have access()
+ 		 * so we check fileperms too */
diff --git a/package/busybox/patches/011-utmp-segfault-mips64-fix.patch b/package/busybox/patches/011-utmp-segfault-mips64-fix.patch
deleted file mode 100644
index 428ffca38..000000000
--- a/package/busybox/patches/011-utmp-segfault-mips64-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur busybox-1.20.2.orig/libbb/utmp.c busybox-1.20.2/libbb/utmp.c
---- busybox-1.20.2.orig/libbb/utmp.c	2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/libbb/utmp.c	2012-09-24 20:25:27.000000000 +0200
-@@ -10,8 +10,14 @@
- 
- static void touch(const char *filename)
- {
--	if (access(filename, R_OK | W_OK) == -1)
--		close(open(filename, O_WRONLY | O_CREAT, 0664));
-+        int c = 0;
-+
-+        if (access(filename, R_OK | W_OK) == -1) {
-+                c=open(filename, O_WRONLY | O_CREAT, 0664);
-+                if (c > 0) {
-+                        close(c);
-+                }
-+        }
- }
- 
- void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
diff --git a/package/busybox/patches/012-find-posix.patch b/package/busybox/patches/012-find-posix.patch
deleted file mode 100644
index 70484fbe4..000000000
--- a/package/busybox/patches/012-find-posix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur busybox-1.20.2.orig/scripts/gen_build_files.sh busybox-1.20.2/scripts/gen_build_files.sh
---- busybox-1.20.2.orig/scripts/gen_build_files.sh	2012-06-26 13:35:45.000000000 +0000
-+++ busybox-1.20.2/scripts/gen_build_files.sh	2013-04-29 12:18:26.089999426 +0000
-@@ -61,7 +61,7 @@
- 
- # (Re)generate */Kbuild and */Config.in
- # We skip .dotdirs - makes git/svn/etc users happier
--{ cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \
-+{ cd -- "$srctree" && find . -type d ! '(' -name '.?*' -prune ')'; } \
- | while read -r d; do
- 	d="${d#./}"
- 
diff --git a/package/busybox/patches/017-remove-alloca.patch b/package/busybox/patches/017-remove-alloca.patch
deleted file mode 100644
index ca27f8fb7..000000000
--- a/package/busybox/patches/017-remove-alloca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur busybox-1.21.1.orig/scripts/basic/docproc.c busybox-1.21.1/scripts/basic/docproc.c
---- busybox-1.21.1.orig/scripts/basic/docproc.c	Sat May 11 17:30:44 2013
-+++ busybox-1.21.1/scripts/basic/docproc.c	Thu Jan 16 03:00:39 2014
-@@ -39,7 +39,6 @@
- #include <limits.h>
- #include <sys/types.h>
- #include <sys/wait.h>
--#include <alloca.h>
- 
- /* exitstatus is used to keep track of any failing calls to kernel-doc,
-  * but execution continues. */
-diff -Nur busybox-1.21.1.orig/scripts/basic/fixdep.c busybox-1.21.1/scripts/basic/fixdep.c
---- busybox-1.21.1.orig/scripts/basic/fixdep.c	Sat May 11 17:30:44 2013
-+++ busybox-1.21.1/scripts/basic/fixdep.c	Thu Jan 16 03:00:33 2014
-@@ -113,7 +113,6 @@
- #include <limits.h>
- #include <ctype.h>
- #include <arpa/inet.h>
--#include <alloca.h>
- 
- /* bbox: not needed
- #define INT_CONF ntohl(0x434f4e46)