summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-11-01 19:15:02 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-11-01 22:12:17 +0100
commite746ded4dd366dda0dc859771abd02a599c5b6af (patch)
tree3b786c1481dab4bbd91aeca9eb43392fb109793f /package
parent1a86ee023560efb171e037fdd3a190d6e1d7c7f4 (diff)
busybox: update to latest stable version
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile6
-rw-r--r--package/busybox/config/Config.in2
-rw-r--r--package/busybox/config/archival/Config.in10
-rw-r--r--package/busybox/config/coreutils/Config.in30
-rw-r--r--package/busybox/config/miscutils/Config.in36
-rw-r--r--package/busybox/config/networking/Config.in49
-rw-r--r--package/busybox/config/util-linux/Config.in21
-rw-r--r--package/busybox/patches/001-ipkg.patch855
8 files changed, 373 insertions, 636 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index c8013b943..d1fc86f10 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= busybox
-PKG_VERSION:= 1.23.2
-PKG_RELEASE:= 5
-PKG_HASH:= 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
+PKG_VERSION:= 1.24.1
+PKG_RELEASE:= 1
+PKG_HASH:= 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base/apps
PKG_BUILDDEP:= bzip2-host
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 54d4e1120..e01d8d8d8 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -266,7 +266,7 @@ config BUSYBOX_PAM
config BUSYBOX_FEATURE_USE_SENDFILE
bool "Use sendfile system call"
default y
- select PLATFORM_LINUX
+ select BUSYBOX_PLATFORM_LINUX
help
When enabled, busybox will use the kernel sendfile() function
instead of read/write loops to copy data between file descriptors
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index e13da8c0e..320203861 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -218,6 +218,16 @@ config BUSYBOX_LZOP_COMPR_HIGH
are actually slower than gzip at equivalent compression ratios
and take up 3.2K of code.
+config BUSYBOX_FEATURE_GZIP_LEVELS
+ bool "Enable compression levels"
+ default n
+ depends on BUSYBOX_GZIP
+ help
+ Enable support for compression levels 4-9. The default level
+ is 6. If levels 1-3 are specified, 4 is used.
+ If this option is not selected, -N options are ignored and -9
+ is used.
+
config BUSYBOX_IPKG
bool "ipkg"
default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 46eccd4f1..adc99c1b7 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -148,6 +148,13 @@ config BUSYBOX_FEATURE_TR_EQUIV
useful for cases when no other way of expressing a character
is possible.
+config BUSYBOX_TRUNCATE
+ bool "truncate"
+ default n
+ help
+ truncate truncates files to a given size. If a file does
+ not exist, it is created unless told otherwise.
+
config BUSYBOX_UNLINK
bool "unlink"
default y
@@ -292,6 +299,13 @@ config BUSYBOX_FEATURE_DD_IBS_OBS
Enables support for writing a certain number of bytes in and out,
at a time, and performing conversions on the data stream.
+config BUSYBOX_FEATURE_DD_STATUS
+ bool "Enable status display options"
+ default n
+ depends on BUSYBOX_DD
+ help
+ Enables support for status=noxfer/none option.
+
config BUSYBOX_DF
bool "df"
default y
@@ -782,6 +796,14 @@ config BUSYBOX_SYNC
help
sync is used to flush filesystem buffers.
+config BUSYBOX_FEATURE_SYNC_FANCY
+ bool "Enable -d and -f flags (requres syncfs(2) in libc)"
+ default n
+ depends on BUSYBOX_SYNC
+ help
+ sync -d FILE... executes fdatasync() on each FILE.
+ sync -f FILE... executes syncfs() on each FILE.
+
config BUSYBOX_TAC
bool "tac"
default y
@@ -840,6 +862,14 @@ config BUSYBOX_UNAME
help
uname is used to print system information.
+config BUSYBOX_UNAME_OSNAME
+ string "Operating system name"
+ default "GNU/Linux"
+ depends on BUSYBOX_UNAME
+ help
+ Sets the operating system name reported by uname -o. The
+ default is "GNU/Linux".
+
config BUSYBOX_UNEXPAND
bool "unexpand"
default y
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 496349f42..a0f76ff40 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -16,6 +16,34 @@ config BUSYBOX_CONSPY
or conspy -nd NUM screenshot of console num
or conspy -cs NUM poor man's GNU screen like
+config BUSYBOX_I2CGET
+ bool "i2cget"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Read from I2C/SMBus chip registers.
+
+config BUSYBOX_I2CSET
+ bool "i2cset"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Set I2C registers.
+
+config BUSYBOX_I2CDUMP
+ bool "i2cdump"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Examine I2C registers.
+
+config BUSYBOX_I2CDETECT
+ bool "i2cdetect"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ Detect I2C chips.
+
config BUSYBOX_LESS
bool "less"
depends on !BUSYBOX_DISABLE_LESS
@@ -44,6 +72,14 @@ config BUSYBOX_FEATURE_LESS_FLAGS
help
The -M/-m flag enables a more sophisticated status line.
+config BUSYBOX_FEATURE_LESS_TRUNCATE
+ bool "Enable -S"
+ default y
+ depends on BUSYBOX_LESS
+ help
+ The -S flag causes long lines to be truncated rather than
+ wrapped.
+
config BUSYBOX_FEATURE_LESS_MARKS
bool "Enable marks"
default y
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 93ff2c0f0..3f5019e7b 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -635,6 +635,13 @@ config BUSYBOX_FEATURE_IP_ROUTE
help
Add support for routing table management to "ip".
+config BUSYBOX_FEATURE_IP_ROUTE_DIR
+ string "ip route configuration directory"
+ default "/etc/iproute2"
+ depends on BUSYBOX_FEATURE_IP_ROUTE
+ help
+ Location of the "ip" applet routing configuration.
+
config BUSYBOX_FEATURE_IP_TUNNEL
bool "ip tunnel"
default y
@@ -1093,6 +1100,48 @@ config BUSYBOX_FEATURE_WGET_TIMEOUT
connection initialization). When FEATURE_WGET_LONG_OPTIONS is
also enabled, the --timeout option will work in addition to -T.
+config BUSYBOX_FEATURE_WGET_OPENSSL
+ bool "Try to connect to HTTPS using openssl"
+ default y
+ depends on BUSYBOX_WGET
+ help
+ Choose how wget establishes SSL connection for https:// URLs.
+
+ Busybox itself contains no SSL code. wget will spawn
+ a helper program to talk over HTTPS.
+
+ OpenSSL has a simple SSL client for debug purposes.
+ If you select "openssl" helper, wget will effectively call
+ "openssl s_client -quiet -connect IP:443 2>/dev/null"
+ and pipe its data through it.
+ Note inconvenient API: host resolution is done twice,
+ and there is no guarantee openssl's idea of IPv6 address
+ format is the same as ours.
+ Another problem is that s_client prints debug information
+ to stderr, and it needs to be suppressed. This means
+ all error messages get suppressed too.
+ openssl is also a big binary, often dynamically linked
+ against ~15 libraries.
+
+config BUSYBOX_FEATURE_WGET_SSL_HELPER
+ bool "Try to connect to HTTPS using ssl_helper"
+ default y
+ depends on BUSYBOX_WGET
+ help
+ Choose how wget establishes SSL connection for https:// URLs.
+
+ Busybox itself contains no SSL code. wget will spawn
+ a helper program to talk over HTTPS.
+
+ ssl_helper is a tool which can be built statically
+ from busybox sources against a small embedded SSL library.
+ Please see networking/ssl_helper/README.
+ It does not require double host resolution and emits
+ error messages to stderr.
+
+ Precompiled static binary may be available at
+ http://busybox.net/downloads/binaries/
+
config BUSYBOX_ZCIP
bool "zcip"
default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 04e049668..f848f85c5 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -15,14 +15,14 @@ config BUSYBOX_BLOCKDEV
config BUSYBOX_FATATTR
bool "fatattr"
default n
- select PLATFORM_LINUX
+ select BUSYBOX_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
+ select BUSYBOX_PLATFORM_LINUX
help
Discard unused blocks on a mounted filesystem.
@@ -90,6 +90,14 @@ config BUSYBOX_REV
help
Reverse lines of a file or files.
+config BUSYBOX_UEVENT
+ bool "uevent"
+ default y
+ select BUSYBOX_PLATFORM_LINUX
+ help
+ uevent is a netlink listener for kernel uevent notifications
+ sent via netlink. It is usually used for dynamic device creation.
+
config BUSYBOX_ACPID
bool "acpid"
default n
@@ -333,7 +341,7 @@ config BUSYBOX_FSCK_MINIX
config BUSYBOX_MKFS_EXT2
bool "mkfs_ext2"
default n
- select PLATFORM_LINUX
+ select BUSYBOX_PLATFORM_LINUX
help
Utility to create EXT2 filesystems.
@@ -610,6 +618,13 @@ config BUSYBOX_FEATURE_MOUNT_FSTAB
help
Support mount all and looking for files in /etc/fstab.
+config BUSYBOX_FEATURE_MOUNT_OTHERTAB
+ depends on BUSYBOX_FEATURE_MOUNT_FSTAB
+ bool "Support -T <alt_fstab>"
+ default n
+ help
+ Support mount -T (specifying an alternate fstab)
+
config BUSYBOX_PIVOT_ROOT
bool "pivot_root"
default n
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 5e8e8b346..5bd069253 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
-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
+diff -Nur busybox-1.24.1.orig/archival/ipkg.c busybox-1.24.1/archival/ipkg.c
+--- busybox-1.24.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/ipkg.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,39 @@
+/* ipkg.c - the itsy package management system
+
@@ -41,10 +41,10 @@ diff -Nur busybox-1.23.0.orig/archival/ipkg.c busybox-1.23.0/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-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 @@
+diff -Nur busybox-1.24.1.orig/archival/libarchive/Kbuild.src busybox-1.24.1/archival/libarchive/Kbuild.src
+--- busybox-1.24.1.orig/archival/libarchive/Kbuild.src 2015-10-24 02:24:35.000000000 +0200
++++ busybox-1.24.1/archival/libarchive/Kbuild.src 2015-10-31 19:01:17.000000000 +0100
+@@ -25,6 +25,8 @@
\
data_align.o \
find_list_entry.o \
@@ -53,17 +53,18 @@ diff -Nur busybox-1.23.0.orig/archival/libarchive/Kbuild.src busybox-1.23.0/arch
init_handle.o
DPKG_FILES:= \
- unpack_ar_archive.o \
+@@ -32,8 +34,6 @@
filter_accept_list_reassign.o \
+ unsafe_prefix.o \
get_header_ar.o \
- get_header_tar.o \
- get_header_tar_gz.o \
get_header_tar_bz2.o \
get_header_tar_lzma.o \
-
-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
+ get_header_tar_xz.o \
+diff -Nur busybox-1.24.1.orig/archival/libipkg/args.c busybox-1.24.1/archival/libipkg/args.c
+--- busybox-1.24.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/args.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -307,9 +308,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/args.c busybox-1.23.0/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/args.h busybox-1.24.1/archival/libipkg/args.h
+--- busybox-1.24.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/args.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -383,9 +384,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/args.h busybox-1.23.0/archival/li
+void args_usage(const char *complaint);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile.c busybox-1.24.1/archival/libipkg/conffile.c
+--- busybox-1.24.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/conffile.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -452,9 +453,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile.c busybox-1.23.0/archiva
+
+ return ret;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile.h busybox-1.24.1/archival/libipkg/conffile.h
+--- busybox-1.24.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/conffile.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -486,9 +487,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile.h busybox-1.23.0/archiva
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile_list.c busybox-1.24.1/archival/libipkg/conffile_list.c
+--- busybox-1.24.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/conffile_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -537,9 +538,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile_list.c busybox-1.23.0/ar
+ return nv_pair_list_pop(list);
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile_list.h busybox-1.24.1/archival/libipkg/conffile_list.h
+--- busybox-1.24.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/conffile_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -577,9 +578,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/conffile_list.h busybox-1.23.0/ar
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/file_util.c busybox-1.24.1/archival/libipkg/file_util.c
+--- busybox-1.24.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/file_util.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -767,9 +768,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/file_util.c busybox-1.23.0/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/file_util.h busybox-1.24.1/archival/libipkg/file_util.h
+--- busybox-1.24.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/file_util.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -800,9 +801,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/file_util.h busybox-1.23.0/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/hash_table.c busybox-1.24.1/archival/libipkg/hash_table.c
+--- busybox-1.24.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/hash_table.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -959,9 +960,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/hash_table.c busybox-1.23.0/archi
+ }
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/hash_table.h busybox-1.24.1/archival/libipkg/hash_table.h
+--- busybox-1.24.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/hash_table.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1007,9 +1008,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/hash_table.h busybox-1.23.0/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.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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.24.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_cmd.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,1367 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2378,9 +2379,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.23.0/archiva
+}
+
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.24.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_cmd.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2423,9 +2424,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.23.0/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_conf.c busybox-1.24.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_conf.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,739 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3166,9 +3167,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_conf.c busybox-1.23.0/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_conf.h busybox-1.24.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_conf.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3277,9 +3278,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_conf.h busybox-1.23.0/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_configure.c busybox-1.24.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_configure.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3321,9 +3322,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_configure.c busybox-1.23.0/a
+ return 0;
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_configure.h busybox-1.24.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_configure.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3350,9 +3351,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_configure.h busybox-1.23.0/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_download.c busybox-1.24.1/archival/libipkg/ipkg_download.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_download.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3549,9 +3550,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_download.c busybox-1.23.0/ar
+ }
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_download.h busybox-1.24.1/archival/libipkg/ipkg_download.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_download.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3583,9 +3584,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_download.h busybox-1.23.0/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg.h busybox-1.24.1/archival/libipkg/ipkg.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,68 @@
+/* ipkg.h - the itsy package management system
+
@@ -3655,9 +3656,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg.h busybox-1.23.0/archival/li
+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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_includes.h busybox-1.24.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_includes.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,82 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3741,9 +3742,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_includes.h busybox-1.23.0/ar
+#include <mntent.h>
+
+#endif /* IPKG_INCLUDES_H */
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_install.c busybox-1.24.1/archival/libipkg/ipkg_install.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_install.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5727,9 +5728,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_install.c busybox-1.23.0/arc
+}
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_install.h busybox-1.24.1/archival/libipkg/ipkg_install.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_install.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5766,9 +5767,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_install.h busybox-1.23.0/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.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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_message.c busybox-1.24.1/archival/libipkg/ipkg_message.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_message.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5805,9 +5806,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_message.c busybox-1.23.0/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_message.h busybox-1.24.1/archival/libipkg/ipkg_message.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_message.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5841,9 +5842,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_message.h busybox-1.23.0/arc
+extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
+
+#endif /* _IPKG_MESSAGE_H_ */
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_remove.c busybox-1.24.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_remove.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6230,9 +6231,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_remove.c busybox-1.23.0/arch
+
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_remove.h busybox-1.24.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_remove.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6267,9 +6268,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_remove.h busybox-1.23.0/arch
+
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.24.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_upgrade.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6350,9 +6351,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.23.0/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.24.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_upgrade.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6372,9 +6373,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.23.0/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_utils.c busybox-1.24.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_utils.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6561,9 +6562,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_utils.c busybox-1.23.0/archi
+}
+
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_utils.h busybox-1.24.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.24.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/ipkg_utils.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6594,9 +6595,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/ipkg_utils.h busybox-1.23.0/archi
+int line_is_blank(const char *line);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/Kbuild busybox-1.24.1/archival/libipkg/Kbuild
+--- busybox-1.24.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/Kbuild 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,60 @@
+# Makefile for busybox
+#
@@ -6658,9 +6659,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/Kbuild busybox-1.23.0/archival/li
+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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/libipkg.c busybox-1.24.1/archival/libipkg/libipkg.c
+--- busybox-1.24.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/libipkg.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,583 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7245,9 +7246,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/libipkg.c busybox-1.23.0/archival
+
+ return err;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/libipkg.h busybox-1.24.1/archival/libipkg/libipkg.h
+--- busybox-1.24.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/libipkg.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7327,9 +7328,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/libipkg.h busybox-1.23.0/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.c busybox-1.24.1/archival/libipkg/nv_pair.c
+--- busybox-1.24.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/nv_pair.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7371,9 +7372,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair.c busybox-1.23.0/archival
+}
+
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.h busybox-1.24.1/archival/libipkg/nv_pair.h
+--- busybox-1.24.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/nv_pair.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7407,9 +7408,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair.h busybox-1.23.0/archival
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.c busybox-1.24.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.24.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/nv_pair_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7509,9 +7510,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair_list.c busybox-1.23.0/arc
+ }
+ return NULL;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.h busybox-1.24.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.24.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/nv_pair_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7573,9 +7574,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/nv_pair_list.h busybox-1.23.0/arc
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.c busybox-1.24.1/archival/libipkg/pkg.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9334,9 +9335,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg.c busybox-1.23.0/archival/lib
+ }
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.c busybox-1.24.1/archival/libipkg/pkg_depends.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_depends.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,1032 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10370,9 +10371,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_depends.c busybox-1.23.0/arch
+
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.h busybox-1.24.1/archival/libipkg/pkg_depends.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_depends.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10479,9 +10480,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_depends.h busybox-1.23.0/arch
+int pkg_dependence_satisfied(depend_t *depend);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.c busybox-1.24.1/archival/libipkg/pkg_dest.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_dest.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10575,9 +10576,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest.c busybox-1.23.0/archiva
+
+ dest->root_dir = NULL;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.h busybox-1.24.1/archival/libipkg/pkg_dest.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_dest.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10617,9 +10618,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest.h busybox-1.23.0/archiva
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.24.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_dest_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10706,9 +10707,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.23.0/ar
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.24.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_dest_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10760,9 +10761,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.23.0/ar
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.c busybox-1.24.1/archival/libipkg/pkg_extract.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_extract.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,255 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11019,9 +11020,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_extract.c busybox-1.23.0/arch
+
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.h busybox-1.24.1/archival/libipkg/pkg_extract.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_extract.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,32 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11055,9 +11056,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_extract.h busybox-1.23.0/arch
+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.h busybox-1.24.1/archival/libipkg/pkg.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,229 @@
+/* pkg.h - the itsy package management system
+
@@ -11288,9 +11289,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg.h busybox-1.23.0/archival/lib
+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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.c busybox-1.24.1/archival/libipkg/pkg_hash.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_hash.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,623 @@
+/* ipkg_hash.c - the itsy package management system
+
@@ -11915,9 +11916,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_hash.c busybox-1.23.0/archiva
+}
+
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.h busybox-1.24.1/archival/libipkg/pkg_hash.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_hash.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,61 @@
+/* pkg_hash.h - the itsy package management system
+
@@ -11980,9 +11981,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_hash.h busybox-1.23.0/archiva
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.c busybox-1.24.1/archival/libipkg/pkg_parse.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_parse.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,368 @@
+/* pkg_parse.c - the itsy package management system
+
@@ -12352,9 +12353,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_parse.c busybox-1.23.0/archiv
+
+ return 0;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.h busybox-1.24.1/archival/libipkg/pkg_parse.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_parse.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,31 @@
+/* pkg_parse.h - the itsy package management system
+
@@ -12387,9 +12388,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_parse.h busybox-1.23.0/archiv
+int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.c busybox-1.24.1/archival/libipkg/pkg_src.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_src.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,43 @@
+/* pkg_src.c - the itsy package management system
+
@@ -12434,9 +12435,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src.c busybox-1.23.0/archival
+}
+
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.h busybox-1.24.1/archival/libipkg/pkg_src.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_src.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,34 @@
+/* pkg_src.h - the itsy package management system
+
@@ -12472,9 +12473,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src.h busybox-1.23.0/archival
+void pkg_src_deinit(pkg_src_t *src);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.c busybox-1.24.1/archival/libipkg/pkg_src_list.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_src_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,75 @@
+/* pkg_src_list.c - the itsy package management system
+
@@ -12551,9 +12552,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src_list.c busybox-1.23.0/arc
+{
+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.h busybox-1.24.1/archival/libipkg/pkg_src_list.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_src_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,57 @@
+/* pkg_src_list.h - the itsy package management system
+
@@ -12612,9 +12613,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_src_list.h busybox-1.23.0/arc
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.c busybox-1.24.1/archival/libipkg/pkg_vec.c
+--- busybox-1.24.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_vec.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,231 @@
+/* pkg_vec.c - the itsy package management system
+
@@ -12847,9 +12848,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_vec.c busybox-1.23.0/archival
+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.h busybox-1.24.1/archival/libipkg/pkg_vec.h
+--- busybox-1.24.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/pkg_vec.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,62 @@
+/* pkg_vec.h - the itsy package management system
+
@@ -12913,9 +12914,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/pkg_vec.h busybox-1.23.0/archival
+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.24.1/archival/libipkg/sprintf_alloc.h
+--- busybox-1.24.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/sprintf_alloc.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,25 @@
+/* sprintf_alloca.c -- like sprintf with memory allocation
+
@@ -12942,9 +12943,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.23.0/ar
+#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args)
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.c busybox-1.24.1/archival/libipkg/str_list.c
+--- busybox-1.24.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/str_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,76 @@
+/* str_list.c - the itsy package management system
+
@@ -13022,9 +13023,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/str_list.c busybox-1.23.0/archiva
+ (void *)target_str,
+ (void_list_cmp_t)strcmp);
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.h busybox-1.24.1/archival/libipkg/str_list.h
+--- busybox-1.24.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/str_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,51 @@
+/* str_list.h - the itsy package management system
+
@@ -13077,9 +13078,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/str_list.h busybox-1.23.0/archiva
+char *str_list_remove_elt(str_list_t *list, const char *target_str);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.c busybox-1.24.1/archival/libipkg/str_util.c
+--- busybox-1.24.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/str_util.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,69 @@
+/* str_utils.c - the itsy package management system
+
@@ -13150,9 +13151,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/str_util.c busybox-1.23.0/archiva
+ return str ? strdup(str) : NULL;
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.h busybox-1.24.1/archival/libipkg/str_util.h
+--- busybox-1.24.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/str_util.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,27 @@
+/* str_utils.h - the itsy package management system
+
@@ -13181,9 +13182,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/str_util.h busybox-1.23.0/archiva
+char *str_dup_safe(const char *str);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/user.c busybox-1.24.1/archival/libipkg/user.c
+--- busybox-1.24.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/user.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,49 @@
+/* user.c - the itsy package management system
+
@@ -13234,9 +13235,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/user.c busybox-1.23.0/archival/li
+
+ return response;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/user.h busybox-1.24.1/archival/libipkg/user.h
+--- busybox-1.24.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/user.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,23 @@
+/* user.c - the itsy package management system
+
@@ -13261,9 +13262,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/user.h busybox-1.23.0/archival/li
+
+char *get_user_response(const char *format, ...);
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.c busybox-1.24.1/archival/libipkg/void_list.c
+--- busybox-1.24.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/void_list.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,194 @@
+/* void_list.c - the itsy package management system
+
@@ -13459,9 +13460,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/void_list.c busybox-1.23.0/archiv
+ else
+ return NULL;
+}
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.h busybox-1.24.1/archival/libipkg/void_list.h
+--- busybox-1.24.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/void_list.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,59 @@
+/* void_list.h - the itsy package management system
+
@@ -13522,9 +13523,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/void_list.h busybox-1.23.0/archiv
+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
+
+#endif
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.c busybox-1.24.1/archival/libipkg/xsystem.c
+--- busybox-1.24.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/xsystem.c 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,64 @@
+/* xsystem.c - system(3) with error messages
+
@@ -13590,9 +13591,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/xsystem.c busybox-1.23.0/archival
+ return -1;
+}
+
-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
+diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.h busybox-1.24.1/archival/libipkg/xsystem.h
+--- busybox-1.24.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.24.1/archival/libipkg/xsystem.h 2015-10-31 19:00:22.000000000 +0100
@@ -0,0 +1,34 @@
+/* xsystem.h - system(3) with error messages
+
@@ -13628,9 +13629,9 @@ diff -Nur busybox-1.23.0.orig/archival/libipkg/xsystem.h busybox-1.23.0/archival
+
+#endif
+
-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
+diff -Nur busybox-1.24.1.orig/include/applets.src.h busybox-1.24.1/include/applets.src.h
+--- busybox-1.24.1.orig/include/applets.src.h 2015-10-24 02:24:35.000000000 +0200
++++ busybox-1.24.1/include/applets.src.h 2015-10-31 19:00:22.000000000 +0100
@@ -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))
@@ -13639,413 +13640,9 @@ diff -Nur busybox-1.23.0.orig/include/applets.src.h busybox-1.23.0/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.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
+diff -Nur busybox-1.24.1.orig/include/bb_archive.h busybox-1.24.1/include/bb_archive.h
+--- busybox-1.24.1.orig/include/bb_archive.h 2015-10-24 02:24:35.000000000 +0200
++++ busybox-1.24.1/include/bb_archive.h 2015-10-31 19:00:22.000000000 +0100
@@ -79,7 +79,6 @@
/* Archiver specific. Can make it a union if it ever gets big */
#define PAX_NEXT_FILE 0
@@ -14069,9 +13666,9 @@ diff -Nur busybox-1.23.0.orig/include/bb_archive.h busybox-1.23.0/include/bb_arc
/* Temporary storage */
char *dpkg__buffer;
/* How to process any sub archive, e.g. get_header_tar_gz */
-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
+diff -Nur busybox-1.24.1.orig/include/usage.src.h busybox-1.24.1/include/usage.src.h
+--- busybox-1.24.1.orig/include/usage.src.h 2015-07-13 04:18:47.000000000 +0200
++++ busybox-1.24.1/include/usage.src.h 2015-10-31 19:00:22.000000000 +0100
@@ -19,4 +19,80 @@
#define busybox_notes_usage \
"Hello world!\n"
@@ -14153,9 +13750,9 @@ diff -Nur busybox-1.23.0.orig/include/usage.src.h busybox-1.23.0/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
+diff -Nur busybox-1.24.1.orig/Makefile busybox-1.24.1/Makefile
+--- busybox-1.24.1.orig/Makefile 2015-10-24 02:28:51.000000000 +0200
++++ busybox-1.24.1/Makefile 2015-10-31 19:00:22.000000000 +0100
@@ -466,6 +466,7 @@
libs-y := \
archival/ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 08:18:15 +0000