summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile8
-rw-r--r--package/busybox/config/archival/Config.in46
-rw-r--r--package/busybox/config/coreutils/Config.in17
-rw-r--r--package/busybox/config/findutils/Config.in20
-rw-r--r--package/busybox/config/init/Config.in25
-rw-r--r--package/busybox/config/libbb/Config.in9
-rw-r--r--package/busybox/config/networking/Config.in36
-rw-r--r--package/busybox/config/runit/Config.in7
-rw-r--r--package/busybox/config/util-linux/Config.in64
-rw-r--r--package/busybox/patches/001-ipkg.patch451
-rw-r--r--package/busybox/patches/009-extra-flags.patch16
-rw-r--r--package/busybox/patches/009-modutils.patch21
-rw-r--r--package/busybox/patches/010-rlimit_fsize.patch11
-rw-r--r--package/busybox/patches/011-hotfixes.patch47
14 files changed, 411 insertions, 367 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 1b74786d4..42224adec 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= busybox
-PKG_VERSION:= 1.25.0
-PKG_RELEASE:= 3
-PKG_HASH:= 5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc
+PKG_VERSION:= 1.26.0
+PKG_RELEASE:= 1
+PKG_HASH:= 3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base/apps
PKG_URL:= http://www.busybox.net/
@@ -65,7 +65,7 @@ do-install:
PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE)
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),)
-ifeq ($(BUSYBOX_IFUPDOWN),y)
+ifeq ($(BUSYBOX_IFUP),y)
$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d
ifeq ($(ADK_RUNTIME_WAIT_FOR_ETHERNET),y)
$(INSTALL_BIN) ./files/network.wait $(IDIR_BUSYBOX)/etc/init.d/network
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 112f2dc88..8532767c2 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -91,6 +91,12 @@ config BUSYBOX_BUNZIP2
Unless you have a specific application which requires bunzip2, you
should probably say N here.
+config BUSYBOX_BZCAT
+ bool "bzcat"
+ default y
+ help
+ Alias to "bunzip2 -c".
+
config BUSYBOX_BZIP2
bool "bzip2"
depends on !BUSYBOX_DISABLE_BZIP2
@@ -176,6 +182,12 @@ config BUSYBOX_GUNZIP
You can use the `-t' option to test the integrity of
an archive, without decompressing it.
+config BUSYBOX_ZCAT
+ bool "zcat"
+ default y
+ help
+ Alias to "gunzip -c".
+
config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS
bool "Enable long options"
default y
@@ -215,6 +227,18 @@ config BUSYBOX_LZOP
help
Lzop compression/decompresion.
+config BUSYBOX_UNLZOP
+ bool "unlzop"
+ default n
+ help
+ Lzop decompresion.
+
+config BUSYBOX_LZOPCAT
+ bool "lzopcat"
+ default n
+ help
+ Alias to "unlzop -c".
+
config BUSYBOX_LZOP_COMPR_HIGH
bool "lzop compression levels 7,8,9 (not very useful)"
default n
@@ -377,15 +401,26 @@ config BUSYBOX_UNLZMA
config BUSYBOX_FEATURE_LZMA_FAST
bool "Optimize unlzma for speed"
default n
- depends on BUSYBOX_UNLZMA
+ depends on BUSYBOX_UNLZMA || BUSYBOX_LZCAT || BUSYBOX_LZMA
help
This option reduces decompression time by about 25% at the cost of
a 1K bigger binary.
+config BUSYBOX_LZCAT
+ bool "lzcat"
+ default n
+ help
+ unlzma is a compression utility using the Lempel-Ziv-Markov chain
+ compression algorithm, and range coding. Compression
+ is generally considerably better than that achieved by the bzip2
+ compressors.
+
+ The BusyBox unlzma applet is limited to decompression only.
+ On an x86 system, this applet adds about 4K.
+
config BUSYBOX_LZMA
bool "Provide lzma alias which supports only unpacking"
default n
- depends on BUSYBOX_UNLZMA
help
Enable this option if you want commands like "lzma -d" to work.
IOW: you'll get lzma applet, but it will always require -d option.
@@ -397,11 +432,16 @@ config BUSYBOX_UNXZ
help
unxz is a unlzma successor.
+config BUSYBOX_XZCAT
+ bool "xzcat"
+ default n
+ help
+ Alias to "unxz -c".
+
config BUSYBOX_XZ
bool "Provide xz alias which supports only unpacking"
depends on !BUSYBOX_DISABLE_XZ
default n
- depends on BUSYBOX_UNXZ
help
Enable this option if you want commands like "xz -d" to work.
IOW: you'll get xz applet, but it will always require -d option.
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 54e4a1b9b..bb0d2a121 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -94,6 +94,18 @@ config BUSYBOX_TEST
returning an appropriate exit code. The bash shell
has test built in, ash can build it in optionally.
+config BUSYBOX_TEST1
+ bool "test as ["
+ default y
+ help
+ Provide test command in the "[ EXPR ]" form
+
+config BUSYBOX_TEST2
+ bool "test as [["
+ default y
+ help
+ Provide test command in the "[[ EXPR ]]" form
+
config BUSYBOX_FEATURE_TEST_64
bool "Extend test to 64 bit"
default y
@@ -333,16 +345,15 @@ config BUSYBOX_DIRNAME
a file name.
config BUSYBOX_DOS2UNIX
- bool "dos2unix/unix2dos"
+ bool "dos2unix"
default n
help
dos2unix is used to convert a text file from DOS format to
UNIX format, and vice versa.
config BUSYBOX_UNIX2DOS
- bool
+ bool "unix2dos"
default n
- depends on BUSYBOX_DOS2UNIX
help
unix2dos is used to convert a text file from UNIX format to
DOS format, and vice versa.
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 53af0387a..a9bb761b2 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -205,23 +205,19 @@ config BUSYBOX_GREP
help
grep is used to search files for a specified pattern.
-config BUSYBOX_FEATURE_GREP_EGREP_ALIAS
- bool "Enable extended regular expressions (egrep & grep -E)"
+config BUSYBOX_EGREP
+ bool "egrep"
+ depends on !BUSYBOX_DISABLE_GREP
default y
- depends on BUSYBOX_GREP
help
- Enabled support for extended regular expressions. Extended
- regular expressions allow for alternation (foo|bar), grouping,
- and various repetition operators.
+ Alias to "grep -E"
-config BUSYBOX_FEATURE_GREP_FGREP_ALIAS
- bool "Alias fgrep to grep -F"
+config BUSYBOX_FGREP
+ bool "fgrep"
+ depends on !BUSYBOX_DISABLE_GREP
default y
- depends on BUSYBOX_GREP
help
- fgrep sees the search pattern as a normal string rather than
- regular expressions.
- grep -F always works, this just creates the fgrep alias.
+ Alias to "grep -F"
config BUSYBOX_FEATURE_GREP_CONTEXT
bool "Enable before and after context flags (-A, -B and -C)"
diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in
index 09fdf9f98..9e17c790c 100644
--- a/package/busybox/config/init/Config.in
+++ b/package/busybox/config/init/Config.in
@@ -46,11 +46,23 @@ config BUSYBOX_FEATURE_BOOTCHARTD_CONFIG_FILE
and /etc/bootchartd.conf files.
config BUSYBOX_HALT
- bool "poweroff, halt, and reboot"
+ bool "halt"
default y
help
Stop all processes and either halt, reboot, or power off the system.
+config BUSYBOX_POWEROFF
+ bool "poweroff"
+ default y
+ help
+ Stop all processes and power off the system.
+
+config BUSYBOX_REBOOT
+ bool "reboot"
+ default y
+ help
+ Stop all processes and reboot the system.
+
config BUSYBOX_FEATURE_CALL_TELINIT
bool "Call telinit on shutdown and reboot"
default n
@@ -154,17 +166,6 @@ config BUSYBOX_FEATURE_INIT_COREDUMPS
core file sizes. If this option is disabled, processes
will not generate any core files.
-config BUSYBOX_FEATURE_INITRD
- bool "Support running init from within an initrd (not initramfs)"
- default n
- depends on BUSYBOX_INIT
- help
- Legacy support for running init under the old-style initrd. Allows
- the name linuxrc to act as init, and it doesn't assume init is PID 1.
-
- This does not apply to initramfs, which runs /init as PID 1 and
- requires no special support.
-
config BUSYBOX_INIT_TERMINAL_TYPE
string "Initial terminal type"
default "linux"
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index 9eb353dc0..6aff24699 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -39,15 +39,6 @@ config BUSYBOX_FEATURE_USE_BSS_TAIL
appletlib.c:(.text.main+0xd): undefined reference to '_end'
disable this option.
-config BUSYBOX_FEATURE_SYSTEMD
- bool "Enable systemd support"
- default n
- help
- If you plan to use busybox daemons on a system where daemons
- are controlled by systemd, enable this option.
- If you don't use systemd, it is still safe to enable it,
- but the downside is increased code size.
-
config BUSYBOX_FEATURE_RTMINMAX
bool "Support RTMIN[+n] and RTMAX[-n] signal names"
default y
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index fece6971b..cedbc4482 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -258,6 +258,12 @@ config BUSYBOX_HOSTNAME
help
Show or set the system's host name.
+config BUSYBOX_DNSDOMAINNAME
+ bool "dnsdomainname"
+ default n
+ help
+ Alias to "hostname -d".
+
config BUSYBOX_HTTPD
bool "httpd"
default n
@@ -449,12 +455,12 @@ config BUSYBOX_IFPLUGD
help
Network interface plug detection daemon.
-config BUSYBOX_IFUPDOWN
- bool "ifupdown"
+config BUSYBOX_IFUP
+ bool "ifup"
default y if ADK_TARGET_WITH_NET
help
- Activate or deactivate the specified interfaces. This applet makes
- use of either "ifconfig" and "route" or the "ip" command to actually
+ Activate the specified interfaces. This applet makes use
+ of either "ifconfig" and "route" or the "ip" command to actually
configure network interfaces. Therefore, you will probably also want
to enable either IFCONFIG and ROUTE, or enable
FEATURE_IFUPDOWN_IP and the various IP options. Of
@@ -465,10 +471,16 @@ config BUSYBOX_IFUPDOWN
"ifconfig", "route" and "run-parts" or the "ip" command, either
via busybox or via standalone utilities.
+config BUSYBOX_IFDOWN
+ bool "ifdown"
+ default y if ADK_TARGET_WITH_NET
+ help
+ Deactivate the specified interfaces.
+
config BUSYBOX_IFUPDOWN_IFSTATE_PATH
string "Absolute path to ifstate file"
default "/var/run/ifstate"
- depends on BUSYBOX_IFUPDOWN
+ depends on BUSYBOX_IFUP
help
ifupdown keeps state information in a file called ifstate.
Typically it is located in /var/run/ifstate, however
@@ -479,7 +491,7 @@ config BUSYBOX_IFUPDOWN_IFSTATE_PATH
config BUSYBOX_FEATURE_IFUPDOWN_IP
bool "Use ip applet"
default y
- depends on BUSYBOX_IFUPDOWN
+ depends on BUSYBOX_IFUP
help
Use the iproute "ip" command to implement "ifup" and "ifdown", rather
than the default of using the older 'ifconfig' and 'route' utilities.
@@ -502,7 +514,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
bool "Use busybox ifconfig and route applets"
default n
- depends on BUSYBOX_IFUPDOWN && !BUSYBOX_FEATURE_IFUPDOWN_IP
+ depends on BUSYBOX_IFUP && !BUSYBOX_FEATURE_IFUPDOWN_IP
select BUSYBOX_IFCONFIG
select BUSYBOX_ROUTE
help
@@ -516,14 +528,14 @@ config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
config BUSYBOX_FEATURE_IFUPDOWN_IPV4
bool "Support for IPv4"
default y
- depends on BUSYBOX_IFUPDOWN
+ depends on BUSYBOX_IFUP
help
If you want ifup/ifdown to talk IPv4, leave this on.
config BUSYBOX_FEATURE_IFUPDOWN_IPV6
bool "Support for IPv6"
default y
- depends on BUSYBOX_IFUPDOWN && BUSYBOX_FEATURE_IPV6
+ depends on BUSYBOX_IFUP && BUSYBOX_FEATURE_IPV6
help
If you need support for IPv6, turn this option on.
@@ -539,7 +551,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IPV6
config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
bool "Enable mapping support"
default n
- depends on BUSYBOX_IFUPDOWN
+ depends on BUSYBOX_IFUP
help
This enables support for the "mapping" stanza, unless you have
a weird network setup you don't need it.
@@ -547,7 +559,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_MAPPING
config BUSYBOX_FEATURE_IFUPDOWN_EXTERNAL_DHCP
bool "Support for external dhcp clients"
default n
- depends on BUSYBOX_IFUPDOWN
+ depends on BUSYBOX_IFUP
help
This enables support for the external dhcp clients. Clients are
tried in the following order: dhcpcd, dhclient, pump and udhcpc.
@@ -1047,7 +1059,7 @@ config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
string "ifup udhcpc command line options"
default "-R" if BUSYBOX_NOMMU
default "-R -b"
- depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
+ depends on BUSYBOX_IFUP && BUSYBOX_UDHCPC
help
Command line options to pass to udhcpc from ifup.
Intended to alter options not available in /etc/network/interfaces.
diff --git a/package/busybox/config/runit/Config.in b/package/busybox/config/runit/Config.in
index fc767d280..87b9b6b1d 100644
--- a/package/busybox/config/runit/Config.in
+++ b/package/busybox/config/runit/Config.in
@@ -46,6 +46,13 @@ config BUSYBOX_SV_DEFAULT_SERVICE_DIR
Default directory for services.
Defaults to "/var/service"
+config BUSYBOX_SVC
+ bool "svc"
+ default n
+ help
+ svc controls the state of services monitored by the runsv supervisor.
+ It is comaptible with daemontools command with the same name.
+
config BUSYBOX_SVLOGD
bool "svlogd"
default n
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index f2e84a71a..00f98a722 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -90,6 +90,27 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
/lib/firmware/ and if it exists, send it to the kernel for
loading into the hardware.
+config BUSYBOX_MKE2FS
+ bool "mke2fs"
+ default n
+ select PLATFORM_LINUX
+ help
+ Utility to create EXT2 filesystems.
+
+config BUSYBOX_MKFS_EXT2
+ bool "mkfs.ext2"
+ default n
+ select PLATFORM_LINUX
+ help
+ Alias to "mke2fs".
+
+config BUSYBOX_MKDOSFS
+ bool "mkdosfs"
+ default n
+ select PLATFORM_LINUX
+ help
+ Utility to create FAT32 filesystems.
+
config BUSYBOX_NSENTER
bool "nsenter"
default n
@@ -445,7 +466,6 @@ config BUSYBOX_FEATURE_HEXDUMP_REVERSE
config BUSYBOX_HD
bool "hd"
default n
- depends on BUSYBOX_HEXDUMP
help
hd is an alias to hexdump -C.
@@ -720,12 +740,26 @@ config BUSYBOX_SETARCH
this util on a system that supports both 64bit and 32bit userland
(like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
-config BUSYBOX_SWAPONOFF
- bool "swaponoff"
+config BUSYBOX_LINUX32
+ bool "linux32"
default n
- select BUSYBOX_PLATFORM_LINUX
+ select PLATFORM_LINUX
help
- This option enables both the 'swapon' and the 'swapoff' utilities.
+ Alias to "setarch linux32".
+
+config BUSYBOX_LINUX64
+ bool "linux64"
+ default n
+ select PLATFORM_LINUX
+ help
+ Alias to "setarch linux64".
+
+config BUSYBOX_SWAPON
+ bool "swapon"
+ default y
+ select PLATFORM_LINUX
+ help
+ This option enables the 'swapon' utility.
Once you have created some swap space using 'mkswap', you also need
to enable your swap space with the 'swapon' utility. The 'swapoff'
utility is used, typically at system shutdown, to disable any swap
@@ -735,7 +769,7 @@ config BUSYBOX_SWAPONOFF
config BUSYBOX_FEATURE_SWAPON_DISCARD
bool "Support discard option -d"
default n
- depends on BUSYBOX_SWAPONOFF
+ depends on BUSYBOX_SWAPON
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
@@ -744,10 +778,17 @@ config BUSYBOX_FEATURE_SWAPON_DISCARD
config BUSYBOX_FEATURE_SWAPON_PRI
bool "Support priority option -p"
default y
- depends on BUSYBOX_SWAPONOFF
+ depends on BUSYBOX_SWAPON
help
Enable support for setting swap device priority in swapon.
+config BUSYBOX_SWAPOFF
+ bool "swapoff"
+ default n
+ select PLATFORM_LINUX
+ help
+ This option enables the 'swapoff' utility.
+
config BUSYBOX_SWITCH_ROOT
bool "switch_root"
default n
@@ -1103,6 +1144,15 @@ config BUSYBOX_FEATURE_VOLUMEID_LINUXRAID
help
TODO
+config BUSYBOX_FEATURE_VOLUMEID_UBIFS
+ bool "UBIFS filesystem"
+ default y
+ depends on BUSYBOX_VOLUMEID
+ help
+ UBIFS (Unsorted Block Image File System) is a file
+ system for use with raw flash memory media.
+
+
endmenu
endmenu
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 5a36ef206..d510ce258 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
-diff -Nur busybox-1.25.0.orig/archival/ipkg.c busybox-1.25.0/archival/ipkg.c
---- busybox-1.25.0.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/ipkg.c 2016-06-22 22:41:46.112441990 +0200
+diff -Nur busybox-1.26.0.orig/archival/ipkg.c busybox-1.26.0/archival/ipkg.c
+--- busybox-1.26.0.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/ipkg.c 2016-12-22 17:08:30.972837164 +0100
@@ -0,0 +1,39 @@
+/* ipkg.c - the itsy package management system
+
@@ -41,9 +41,9 @@ diff -Nur busybox-1.25.0.orig/archival/ipkg.c busybox-1.25.0/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.25.0.orig/archival/libarchive/Kbuild.src busybox-1.25.0/archival/libarchive/Kbuild.src
---- busybox-1.25.0.orig/archival/libarchive/Kbuild.src 2015-10-20 23:38:35.000000000 +0200
-+++ busybox-1.25.0/archival/libarchive/Kbuild.src 2016-06-22 22:41:46.112441990 +0200
+diff -Nur busybox-1.26.0.orig/archival/libarchive/Kbuild.src busybox-1.26.0/archival/libarchive/Kbuild.src
+--- busybox-1.26.0.orig/archival/libarchive/Kbuild.src 2016-12-12 08:46:14.000000000 +0100
++++ busybox-1.26.0/archival/libarchive/Kbuild.src 2016-12-22 17:08:30.972837164 +0100
@@ -25,6 +25,8 @@
\
data_align.o \
@@ -62,9 +62,9 @@ diff -Nur busybox-1.25.0.orig/archival/libarchive/Kbuild.src busybox-1.25.0/arch
get_header_tar_bz2.o \
get_header_tar_lzma.o \
get_header_tar_xz.o \
-diff -Nur busybox-1.25.0.orig/archival/libipkg/args.c busybox-1.25.0/archival/libipkg/args.c
---- busybox-1.25.0.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/args.c 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/args.c busybox-1.26.0/archival/libipkg/args.c
+--- busybox-1.26.0.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/args.c 2016-12-22 17:08:30.972837164 +0100
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -308,9 +308,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/args.c busybox-1.25.0/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/args.h busybox-1.25.0/archival/libipkg/args.h
---- busybox-1.25.0.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/args.h 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/args.h busybox-1.26.0/archival/libipkg/args.h
+--- busybox-1.26.0.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/args.h 2016-12-22 17:08:30.976839427 +0100
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -384,9 +384,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/args.h busybox-1.25.0/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile.c busybox-1.25.0/archival/libipkg/conffile.c
---- busybox-1.25.0.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/conffile.c 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/conffile.c busybox-1.26.0/archival/libipkg/conffile.c
+--- busybox-1.26.0.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/conffile.c 2016-12-22 17:08:30.976839427 +0100
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -453,9 +453,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile.c busybox-1.25.0/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile.h busybox-1.25.0/archival/libipkg/conffile.h
---- busybox-1.25.0.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/conffile.h 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/conffile.h busybox-1.26.0/archival/libipkg/conffile.h
+--- busybox-1.26.0.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/conffile.h 2016-12-22 17:08:30.976839427 +0100
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -487,9 +487,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile.h busybox-1.25.0/archiva
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile_list.c busybox-1.25.0/archival/libipkg/conffile_list.c
---- busybox-1.25.0.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/conffile_list.c 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/conffile_list.c busybox-1.26.0/archival/libipkg/conffile_list.c
+--- busybox-1.26.0.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/conffile_list.c 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -538,9 +538,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile_list.c busybox-1.25.0/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile_list.h busybox-1.25.0/archival/libipkg/conffile_list.h
---- busybox-1.25.0.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/conffile_list.h 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/conffile_list.h busybox-1.26.0/archival/libipkg/conffile_list.h
+--- busybox-1.26.0.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/conffile_list.h 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -578,9 +578,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/conffile_list.h busybox-1.25.0/ar
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/file_util.c busybox-1.25.0/archival/libipkg/file_util.c
---- busybox-1.25.0.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/file_util.c 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/file_util.c busybox-1.26.0/archival/libipkg/file_util.c
+--- busybox-1.26.0.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/file_util.c 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -768,9 +768,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/file_util.c busybox-1.25.0/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/file_util.h busybox-1.25.0/archival/libipkg/file_util.h
---- busybox-1.25.0.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/file_util.h 2016-06-22 22:41:46.116442246 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/file_util.h busybox-1.26.0/archival/libipkg/file_util.h
+--- busybox-1.26.0.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/file_util.h 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -801,9 +801,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/file_util.h busybox-1.25.0/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/hash_table.c busybox-1.25.0/archival/libipkg/hash_table.c
---- busybox-1.25.0.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/hash_table.c 2016-06-22 22:41:46.120442509 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/hash_table.c busybox-1.26.0/archival/libipkg/hash_table.c
+--- busybox-1.26.0.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/hash_table.c 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -960,9 +960,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/hash_table.c busybox-1.25.0/archi
+ }
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/hash_table.h busybox-1.25.0/archival/libipkg/hash_table.h
---- busybox-1.25.0.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/hash_table.h 2016-06-22 22:41:46.120442509 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/hash_table.h busybox-1.26.0/archival/libipkg/hash_table.h
+--- busybox-1.26.0.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/hash_table.h 2016-12-22 17:08:30.984843942 +0100
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1008,9 +1008,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/hash_table.h busybox-1.25.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.25.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.25.0/archival/libipkg/ipkg_cmd.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_cmd.c 2016-06-22 22:41:46.120442509 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.26.0/archival/libipkg/ipkg_cmd.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_cmd.c 2016-12-22 17:08:30.992848456 +0100
@@ -0,0 +1,1367 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2379,9 +2379,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.25.0/archiva
+}
+
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.25.0/archival/libipkg/ipkg_cmd.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_cmd.h 2016-06-22 22:41:46.120442509 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.26.0/archival/libipkg/ipkg_cmd.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_cmd.h 2016-12-22 17:08:30.992848456 +0100
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2424,9 +2424,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.25.0/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_conf.c busybox-1.25.0/archival/libipkg/ipkg_conf.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_conf.c 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_conf.c busybox-1.26.0/archival/libipkg/ipkg_conf.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_conf.c 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,739 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3167,9 +3167,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_conf.c busybox-1.25.0/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_conf.h busybox-1.25.0/archival/libipkg/ipkg_conf.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_conf.h 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_conf.h busybox-1.26.0/archival/libipkg/ipkg_conf.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_conf.h 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3278,9 +3278,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_conf.h busybox-1.25.0/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_configure.c busybox-1.25.0/archival/libipkg/ipkg_configure.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_configure.c 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_configure.c busybox-1.26.0/archival/libipkg/ipkg_configure.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_configure.c 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3322,9 +3322,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_configure.c busybox-1.25.0/a
+ return 0;
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_configure.h busybox-1.25.0/archival/libipkg/ipkg_configure.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_configure.h 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_configure.h busybox-1.26.0/archival/libipkg/ipkg_configure.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_configure.h 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3351,9 +3351,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_configure.h busybox-1.25.0/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_download.c busybox-1.25.0/archival/libipkg/ipkg_download.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_download.c 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_download.c busybox-1.26.0/archival/libipkg/ipkg_download.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_download.c 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3550,9 +3550,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_download.c busybox-1.25.0/ar
+ }
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_download.h busybox-1.25.0/archival/libipkg/ipkg_download.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_download.h 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_download.h busybox-1.26.0/archival/libipkg/ipkg_download.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_download.h 2016-12-22 17:08:30.996850708 +0100
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3584,9 +3584,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_download.h busybox-1.25.0/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg.h busybox-1.25.0/archival/libipkg/ipkg.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg.h 2016-06-22 22:41:46.124442761 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg.h busybox-1.26.0/archival/libipkg/ipkg.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg.h 2016-12-22 17:08:31.000852971 +0100
@@ -0,0 +1,68 @@
+/* ipkg.h - the itsy package management system
+
@@ -3656,9 +3656,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg.h busybox-1.25.0/archival/li
+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_includes.h busybox-1.25.0/archival/libipkg/ipkg_includes.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_includes.h 2016-06-22 22:41:46.128443016 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_includes.h busybox-1.26.0/archival/libipkg/ipkg_includes.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_includes.h 2016-12-22 17:08:31.000852971 +0100
@@ -0,0 +1,82 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3742,9 +3742,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_includes.h busybox-1.25.0/ar
+#include <mntent.h>
+
+#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_install.c busybox-1.25.0/archival/libipkg/ipkg_install.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_install.c 2016-06-22 22:41:46.128443016 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_install.c busybox-1.26.0/archival/libipkg/ipkg_install.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_install.c 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5728,9 +5728,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_install.c busybox-1.25.0/arc
+}
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_install.h busybox-1.25.0/archival/libipkg/ipkg_install.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_install.h 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_install.h busybox-1.26.0/archival/libipkg/ipkg_install.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_install.h 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5767,9 +5767,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_install.h busybox-1.25.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.25.0.orig/archival/libipkg/ipkg_message.c busybox-1.25.0/archival/libipkg/ipkg_message.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_message.c 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_message.c busybox-1.26.0/archival/libipkg/ipkg_message.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_message.c 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5806,9 +5806,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_message.c busybox-1.25.0/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_message.h busybox-1.25.0/archival/libipkg/ipkg_message.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_message.h 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_message.h busybox-1.26.0/archival/libipkg/ipkg_message.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_message.h 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5842,9 +5842,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_message.h busybox-1.25.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.25.0.orig/archival/libipkg/ipkg_remove.c busybox-1.25.0/archival/libipkg/ipkg_remove.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_remove.c 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_remove.c busybox-1.26.0/archival/libipkg/ipkg_remove.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_remove.c 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6231,9 +6231,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_remove.c busybox-1.25.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_remove.h busybox-1.25.0/archival/libipkg/ipkg_remove.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_remove.h 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_remove.h busybox-1.26.0/archival/libipkg/ipkg_remove.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_remove.h 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6268,9 +6268,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_remove.h busybox-1.25.0/arch
+
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.25.0/archival/libipkg/ipkg_upgrade.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_upgrade.c 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.26.0/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_upgrade.c 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6351,9 +6351,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.25.0/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.25.0/archival/libipkg/ipkg_upgrade.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_upgrade.h 2016-06-22 22:41:46.132443279 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.26.0/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_upgrade.h 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6373,9 +6373,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.25.0/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_utils.c busybox-1.25.0/archival/libipkg/ipkg_utils.c
---- busybox-1.25.0.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_utils.c 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_utils.c busybox-1.26.0/archival/libipkg/ipkg_utils.c
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_utils.c 2016-12-22 17:08:31.004855223 +0100
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6562,9 +6562,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_utils.c busybox-1.25.0/archi
+}
+
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_utils.h busybox-1.25.0/archival/libipkg/ipkg_utils.h
---- busybox-1.25.0.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/ipkg_utils.h 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/ipkg_utils.h busybox-1.26.0/archival/libipkg/ipkg_utils.h
+--- busybox-1.26.0.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/ipkg_utils.h 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6595,9 +6595,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/ipkg_utils.h busybox-1.25.0/archi
+int line_is_blank(const char *line);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/Kbuild busybox-1.25.0/archival/libipkg/Kbuild
---- busybox-1.25.0.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/Kbuild 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/Kbuild busybox-1.26.0/archival/libipkg/Kbuild
+--- busybox-1.26.0.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/Kbuild 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,60 @@
+# Makefile for busybox
+#
@@ -6659,9 +6659,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/Kbuild busybox-1.25.0/archival/li
+IPKG_ARCH:=$(TARGET_ARCH)
+endif
+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.25.0.orig/archival/libipkg/libipkg.c busybox-1.25.0/archival/libipkg/libipkg.c
---- busybox-1.25.0.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/libipkg.c 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/libipkg.c busybox-1.26.0/archival/libipkg/libipkg.c
+--- busybox-1.26.0.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/libipkg.c 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,583 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7246,9 +7246,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/libipkg.c busybox-1.25.0/archival
+
+ return err;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/libipkg.h busybox-1.25.0/archival/libipkg/libipkg.h
---- busybox-1.25.0.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/libipkg.h 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/libipkg.h busybox-1.26.0/archival/libipkg/libipkg.h
+--- busybox-1.26.0.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/libipkg.h 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7328,9 +7328,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/libipkg.h busybox-1.25.0/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair.c busybox-1.25.0/archival/libipkg/nv_pair.c
---- busybox-1.25.0.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/nv_pair.c 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/nv_pair.c busybox-1.26.0/archival/libipkg/nv_pair.c
+--- busybox-1.26.0.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/nv_pair.c 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7372,9 +7372,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair.c busybox-1.25.0/archival
+}
+
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair.h busybox-1.25.0/archival/libipkg/nv_pair.h
---- busybox-1.25.0.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/nv_pair.h 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/nv_pair.h busybox-1.26.0/archival/libipkg/nv_pair.h
+--- busybox-1.26.0.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/nv_pair.h 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7408,9 +7408,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair.h busybox-1.25.0/archival
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair_list.c busybox-1.25.0/archival/libipkg/nv_pair_list.c
---- busybox-1.25.0.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/nv_pair_list.c 2016-06-22 22:41:46.136443531 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/nv_pair_list.c busybox-1.26.0/archival/libipkg/nv_pair_list.c
+--- busybox-1.26.0.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/nv_pair_list.c 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7510,9 +7510,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair_list.c busybox-1.25.0/arc
+ }
+ return NULL;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair_list.h busybox-1.25.0/archival/libipkg/nv_pair_list.h
---- busybox-1.25.0.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/nv_pair_list.h 2016-06-22 22:41:46.140443787 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/nv_pair_list.h busybox-1.26.0/archival/libipkg/nv_pair_list.h
+--- busybox-1.26.0.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/nv_pair_list.h 2016-12-22 17:08:31.008857485 +0100
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7574,9 +7574,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/nv_pair_list.h busybox-1.25.0/arc
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg.c busybox-1.25.0/archival/libipkg/pkg.c
---- busybox-1.25.0.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg.c 2016-06-22 22:41:46.140443787 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg.c busybox-1.26.0/archival/libipkg/pkg.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg.c 2016-12-22 17:08:31.012859737 +0100
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9335,9 +9335,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg.c busybox-1.25.0/archival/lib
+ }
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_depends.c busybox-1.25.0/archival/libipkg/pkg_depends.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_depends.c 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_depends.c busybox-1.26.0/archival/libipkg/pkg_depends.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_depends.c 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,1032 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10371,9 +10371,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_depends.c busybox-1.25.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_depends.h busybox-1.25.0/archival/libipkg/pkg_depends.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_depends.h 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_depends.h busybox-1.26.0/archival/libipkg/pkg_depends.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_depends.h 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10480,9 +10480,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_depends.h busybox-1.25.0/arch
+int pkg_dependence_satisfied(depend_t *depend);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest.c busybox-1.25.0/archival/libipkg/pkg_dest.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_dest.c 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_dest.c busybox-1.26.0/archival/libipkg/pkg_dest.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_dest.c 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10576,9 +10576,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest.c busybox-1.25.0/archiva
+
+ dest->root_dir = NULL;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest.h busybox-1.25.0/archival/libipkg/pkg_dest.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_dest.h 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_dest.h busybox-1.26.0/archival/libipkg/pkg_dest.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_dest.h 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10618,9 +10618,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest.h busybox-1.25.0/archiva
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.25.0/archival/libipkg/pkg_dest_list.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_dest_list.c 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.26.0/archival/libipkg/pkg_dest_list.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_dest_list.c 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10707,9 +10707,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.25.0/ar
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.25.0/archival/libipkg/pkg_dest_list.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_dest_list.h 2016-06-22 22:41:46.144444050 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.26.0/archival/libipkg/pkg_dest_list.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_dest_list.h 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10761,9 +10761,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.25.0/ar
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_extract.c busybox-1.25.0/archival/libipkg/pkg_extract.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_extract.c 2016-06-22 22:41:46.148444302 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_extract.c busybox-1.26.0/archival/libipkg/pkg_extract.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_extract.c 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,255 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11020,9 +11020,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_extract.c busybox-1.25.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_extract.h busybox-1.25.0/archival/libipkg/pkg_extract.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_extract.h 2016-06-22 22:41:46.148444302 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_extract.h busybox-1.26.0/archival/libipkg/pkg_extract.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_extract.h 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,32 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11056,9 +11056,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_extract.h busybox-1.25.0/arch
+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg.h busybox-1.25.0/archival/libipkg/pkg.h
---- busybox-1.25.0.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg.h 2016-06-22 22:41:46.148444302 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg.h busybox-1.26.0/archival/libipkg/pkg.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg.h 2016-12-22 17:08:31.016862000 +0100
@@ -0,0 +1,229 @@
+/* pkg.h - the itsy package management system
+
@@ -11289,9 +11289,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg.h busybox-1.25.0/archival/lib
+int pkg_write_changed_filelists(ipkg_conf_t *conf);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_hash.c busybox-1.25.0/archival/libipkg/pkg_hash.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_hash.c 2016-06-22 22:41:46.148444302 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_hash.c busybox-1.26.0/archival/libipkg/pkg_hash.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_hash.c 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,623 @@
+/* ipkg_hash.c - the itsy package management system
+
@@ -11916,9 +11916,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_hash.c busybox-1.25.0/archiva
+}
+
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_hash.h busybox-1.25.0/archival/libipkg/pkg_hash.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_hash.h 2016-06-22 22:41:46.148444302 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_hash.h busybox-1.26.0/archival/libipkg/pkg_hash.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_hash.h 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,61 @@
+/* pkg_hash.h - the itsy package management system
+
@@ -11981,9 +11981,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_hash.h busybox-1.25.0/archiva
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_parse.c busybox-1.25.0/archival/libipkg/pkg_parse.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_parse.c 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_parse.c busybox-1.26.0/archival/libipkg/pkg_parse.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_parse.c 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,368 @@
+/* pkg_parse.c - the itsy package management system
+
@@ -12353,9 +12353,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_parse.c busybox-1.25.0/archiv
+
+ return 0;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_parse.h busybox-1.25.0/archival/libipkg/pkg_parse.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_parse.h 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_parse.h busybox-1.26.0/archival/libipkg/pkg_parse.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_parse.h 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,31 @@
+/* pkg_parse.h - the itsy package management system
+
@@ -12388,9 +12388,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_parse.h busybox-1.25.0/archiv
+int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src.c busybox-1.25.0/archival/libipkg/pkg_src.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_src.c 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_src.c busybox-1.26.0/archival/libipkg/pkg_src.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_src.c 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,43 @@
+/* pkg_src.c - the itsy package management system
+
@@ -12435,9 +12435,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src.c busybox-1.25.0/archival
+}
+
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src.h busybox-1.25.0/archival/libipkg/pkg_src.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_src.h 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_src.h busybox-1.26.0/archival/libipkg/pkg_src.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_src.h 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,34 @@
+/* pkg_src.h - the itsy package management system
+
@@ -12473,9 +12473,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src.h busybox-1.25.0/archival
+void pkg_src_deinit(pkg_src_t *src);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src_list.c busybox-1.25.0/archival/libipkg/pkg_src_list.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_src_list.c 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_src_list.c busybox-1.26.0/archival/libipkg/pkg_src_list.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_src_list.c 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,75 @@
+/* pkg_src_list.c - the itsy package management system
+
@@ -12552,9 +12552,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src_list.c busybox-1.25.0/arc
+{
+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src_list.h busybox-1.25.0/archival/libipkg/pkg_src_list.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_src_list.h 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_src_list.h busybox-1.26.0/archival/libipkg/pkg_src_list.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_src_list.h 2016-12-22 17:08:31.020864252 +0100
@@ -0,0 +1,57 @@
+/* pkg_src_list.h - the itsy package management system
+
@@ -12613,9 +12613,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_src_list.h busybox-1.25.0/arc
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_vec.c busybox-1.25.0/archival/libipkg/pkg_vec.c
---- busybox-1.25.0.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_vec.c 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_vec.c busybox-1.26.0/archival/libipkg/pkg_vec.c
+--- busybox-1.26.0.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_vec.c 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,231 @@
+/* pkg_vec.c - the itsy package management system
+
@@ -12848,9 +12848,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_vec.c busybox-1.25.0/archival
+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_vec.h busybox-1.25.0/archival/libipkg/pkg_vec.h
---- busybox-1.25.0.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/pkg_vec.h 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/pkg_vec.h busybox-1.26.0/archival/libipkg/pkg_vec.h
+--- busybox-1.26.0.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/pkg_vec.h 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,62 @@
+/* pkg_vec.h - the itsy package management system
+
@@ -12914,9 +12914,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/pkg_vec.h busybox-1.25.0/archival
+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+#endif
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.25.0/archival/libipkg/sprintf_alloc.h
---- busybox-1.25.0.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/sprintf_alloc.h 2016-06-22 22:41:46.152444557 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.26.0/archival/libipkg/sprintf_alloc.h
+--- busybox-1.26.0.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/sprintf_alloc.h 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,25 @@
+/* sprintf_alloca.c -- like sprintf with memory allocation
+
@@ -12943,9 +12943,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.25.0/ar
+#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args)
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/str_list.c busybox-1.25.0/archival/libipkg/str_list.c
---- busybox-1.25.0.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/str_list.c 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/str_list.c busybox-1.26.0/archival/libipkg/str_list.c
+--- busybox-1.26.0.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/str_list.c 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,76 @@
+/* str_list.c - the itsy package management system
+
@@ -13023,9 +13023,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/str_list.c busybox-1.25.0/archiva
+ (void *)target_str,
+ (void_list_cmp_t)strcmp);
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/str_list.h busybox-1.25.0/archival/libipkg/str_list.h
---- busybox-1.25.0.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/str_list.h 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/str_list.h busybox-1.26.0/archival/libipkg/str_list.h
+--- busybox-1.26.0.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/str_list.h 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,51 @@
+/* str_list.h - the itsy package management system
+
@@ -13078,9 +13078,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/str_list.h busybox-1.25.0/archiva
+char *str_list_remove_elt(str_list_t *list, const char *target_str);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/str_util.c busybox-1.25.0/archival/libipkg/str_util.c
---- busybox-1.25.0.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/str_util.c 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/str_util.c busybox-1.26.0/archival/libipkg/str_util.c
+--- busybox-1.26.0.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/str_util.c 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,69 @@
+/* str_utils.c - the itsy package management system
+
@@ -13151,9 +13151,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/str_util.c busybox-1.25.0/archiva
+ return str ? strdup(str) : NULL;
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/str_util.h busybox-1.25.0/archival/libipkg/str_util.h
---- busybox-1.25.0.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/str_util.h 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/str_util.h busybox-1.26.0/archival/libipkg/str_util.h
+--- busybox-1.26.0.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/str_util.h 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,27 @@
+/* str_utils.h - the itsy package management system
+
@@ -13182,9 +13182,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/str_util.h busybox-1.25.0/archiva
+char *str_dup_safe(const char *str);
+
+#endif
-diff -Nur busybox-1.25.0.orig/archival/libipkg/user.c busybox-1.25.0/archival/libipkg/user.c
---- busybox-1.25.0.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/user.c 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/user.c busybox-1.26.0/archival/libipkg/user.c
+--- busybox-1.26.0.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/user.c 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,49 @@
+/* user.c - the itsy package management system
+
@@ -13235,9 +13235,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/user.c busybox-1.25.0/archival/li
+
+ return response;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/user.h busybox-1.25.0/archival/libipkg/user.h
---- busybox-1.25.0.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/user.h 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/user.h busybox-1.26.0/archival/libipkg/user.h
+--- busybox-1.26.0.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/user.h 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,23 @@
+/* user.c - the itsy package management system
+
@@ -13262,9 +13262,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/user.h busybox-1.25.0/archival/li
+
+char *get_user_response(const char *format, ...);
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/void_list.c busybox-1.25.0/archival/libipkg/void_list.c
---- busybox-1.25.0.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/void_list.c 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/void_list.c busybox-1.26.0/archival/libipkg/void_list.c
+--- busybox-1.26.0.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/void_list.c 2016-12-22 17:08:31.024866515 +0100
@@ -0,0 +1,194 @@
+/* void_list.c - the itsy package management system
+
@@ -13460,9 +13460,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/void_list.c busybox-1.25.0/archiv
+ else
+ return NULL;
+}
-diff -Nur busybox-1.25.0.orig/archival/libipkg/void_list.h busybox-1.25.0/archival/libipkg/void_list.h
---- busybox-1.25.0.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/void_list.h 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/void_list.h busybox-1.26.0/archival/libipkg/void_list.h
+--- busybox-1.26.0.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/void_list.h 2016-12-22 17:08:31.028868767 +0100
@@ -0,0 +1,59 @@
+/* void_list.h - the itsy package management system
+
@@ -13523,9 +13523,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/void_list.h busybox-1.25.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.25.0.orig/archival/libipkg/xsystem.c busybox-1.25.0/archival/libipkg/xsystem.c
---- busybox-1.25.0.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/xsystem.c 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/xsystem.c busybox-1.26.0/archival/libipkg/xsystem.c
+--- busybox-1.26.0.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/xsystem.c 2016-12-22 17:08:31.028868767 +0100
@@ -0,0 +1,64 @@
+/* xsystem.c - system(3) with error messages
+
@@ -13591,9 +13591,9 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/xsystem.c busybox-1.25.0/archival
+ return -1;
+}
+
-diff -Nur busybox-1.25.0.orig/archival/libipkg/xsystem.h busybox-1.25.0/archival/libipkg/xsystem.h
---- busybox-1.25.0.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.25.0/archival/libipkg/xsystem.h 2016-06-22 22:41:46.156444820 +0200
+diff -Nur busybox-1.26.0.orig/archival/libipkg/xsystem.h busybox-1.26.0/archival/libipkg/xsystem.h
+--- busybox-1.26.0.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.26.0/archival/libipkg/xsystem.h 2016-12-22 17:08:31.028868767 +0100
@@ -0,0 +1,34 @@
+/* xsystem.h - system(3) with error messages
+
@@ -13629,21 +13629,10 @@ diff -Nur busybox-1.25.0.orig/archival/libipkg/xsystem.h busybox-1.25.0/archival
+
+#endif
+
-diff -Nur busybox-1.25.0.orig/include/applets.src.h busybox-1.25.0/include/applets.src.h
---- busybox-1.25.0.orig/include/applets.src.h 2015-10-20 23:38:36.000000000 +0200
-+++ busybox-1.25.0/include/applets.src.h 2016-06-22 22:41:46.160445072 +0200
-@@ -181,6 +181,7 @@
- IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
- IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
-+IF_IPKG(APPLET(ipkg, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_IPLINK(APPLET(iplink, BB_DIR_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.25.0.orig/include/bb_archive.h busybox-1.25.0/include/bb_archive.h
---- busybox-1.25.0.orig/include/bb_archive.h 2016-06-20 21:46:04.000000000 +0200
-+++ busybox-1.25.0/include/bb_archive.h 2016-06-22 22:42:23.458839620 +0200
-@@ -102,7 +101,7 @@
+diff -Nur busybox-1.26.0.orig/include/bb_archive.h busybox-1.26.0/include/bb_archive.h
+--- busybox-1.26.0.orig/include/bb_archive.h 2016-06-20 21:46:04.000000000 +0200
++++ busybox-1.26.0/include/bb_archive.h 2016-12-22 17:08:31.028868767 +0100
+@@ -102,7 +102,7 @@
struct hardlinks_t *cpio__hardlinks_to_create;
struct hardlinks_t *cpio__created_hardlinks;
#endif
@@ -13652,9 +13641,9 @@ diff -Nur busybox-1.25.0.orig/include/bb_archive.h busybox-1.25.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.25.0.orig/include/usage.src.h busybox-1.25.0/include/usage.src.h
---- busybox-1.25.0.orig/include/usage.src.h 2015-07-13 04:18:47.000000000 +0200
-+++ busybox-1.25.0/include/usage.src.h 2016-06-22 22:41:46.160445072 +0200
+diff -Nur busybox-1.26.0.orig/include/usage.src.h busybox-1.26.0/include/usage.src.h
+--- busybox-1.26.0.orig/include/usage.src.h 2015-07-13 04:18:47.000000000 +0200
++++ busybox-1.26.0/include/usage.src.h 2016-12-22 17:08:31.028868767 +0100
@@ -19,4 +19,80 @@
#define busybox_notes_usage \
"Hello world!\n"
@@ -13736,9 +13725,9 @@ diff -Nur busybox-1.25.0.orig/include/usage.src.h busybox-1.25.0/include/usage.s
+ "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
+
#endif
-diff -Nur busybox-1.25.0.orig/Makefile busybox-1.25.0/Makefile
---- busybox-1.25.0.orig/Makefile 2016-06-22 00:58:56.000000000 +0200
-+++ busybox-1.25.0/Makefile 2016-06-22 22:41:46.164445328 +0200
+diff -Nur busybox-1.26.0.orig/Makefile busybox-1.26.0/Makefile
+--- busybox-1.26.0.orig/Makefile 2016-12-20 02:21:42.000000000 +0100
++++ busybox-1.26.0/Makefile 2016-12-22 17:08:31.028868767 +0100
@@ -466,6 +466,7 @@
libs-y := \
archival/ \
diff --git a/package/busybox/patches/009-extra-flags.patch b/package/busybox/patches/009-extra-flags.patch
deleted file mode 100644
index 00671a0f4..000000000
--- a/package/busybox/patches/009-extra-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur busybox-1.20.2.orig/Makefile busybox-1.20.2/Makefile
---- busybox-1.20.2.orig/Makefile 2012-07-02 16:20:27.000000000 +0200
-+++ busybox-1.20.2/Makefile 2013-08-12 13:36:00.000000000 +0200
-@@ -318,10 +318,9 @@
- CFLAGS := $(CFLAGS)
- # Added only to final link stage of busybox binary
- CFLAGS_busybox := $(CFLAGS_busybox)
--CPPFLAGS := $(CPPFLAGS)
-+CPPFLAGS := $(CPPFLAGS) $(EXTRA_CPPFLAGS)
- AFLAGS := $(AFLAGS)
--LDFLAGS := $(LDFLAGS)
--LDLIBS :=
-+LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
-
- # Read KERNELRELEASE from .kernelrelease (if it exists)
- KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
diff --git a/package/busybox/patches/009-modutils.patch b/package/busybox/patches/009-modutils.patch
new file mode 100644
index 000000000..3d0dbf951
--- /dev/null
+++ b/package/busybox/patches/009-modutils.patch
@@ -0,0 +1,21 @@
+diff -Nur busybox-1.26.0.orig/modutils/modutils.c busybox-1.26.0/modutils/modutils.c
+--- busybox-1.26.0.orig/modutils/modutils.c 2016-10-03 23:16:44.000000000 +0200
++++ busybox-1.26.0/modutils/modutils.c 2016-12-23 06:15:16.694563841 +0100
+@@ -7,17 +7,12 @@
+ */
+ #include "modutils.h"
+
+-#ifdef __UCLIBC__
+-extern int init_module(void *module, unsigned long len, const char *options);
+-extern int delete_module(const char *module, unsigned int flags);
+-#else
+ # include <sys/syscall.h>
+ # define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+ # if defined(__NR_finit_module)
+ # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
+ # endif
+ # define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
+-#endif
+
+ static module_entry *helper_get_module(module_db *db, const char *module, int create)
+ {
diff --git a/package/busybox/patches/010-rlimit_fsize.patch b/package/busybox/patches/010-rlimit_fsize.patch
deleted file mode 100644
index 2e577cfc9..000000000
--- a/package/busybox/patches/010-rlimit_fsize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur busybox-1.19.4.orig/include/libbb.h busybox-1.19.4/include/libbb.h
---- busybox-1.19.4.orig/include/libbb.h 2012-02-04 20:34:24.000000000 +0100
-+++ busybox-1.19.4/include/libbb.h 2012-07-31 10:33:50.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <sys/poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-+#include <sys/resource.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/package/busybox/patches/011-hotfixes.patch b/package/busybox/patches/011-hotfixes.patch
deleted file mode 100644
index 53775ad4d..000000000
--- a/package/busybox/patches/011-hotfixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nur busybox-1.25.0.orig/archival/gzip.c busybox-1.25.0/archival/gzip.c
---- busybox-1.25.0.orig/archival/gzip.c 2016-06-20 01:43:06.000000000 +0200
-+++ busybox-1.25.0/archival/gzip.c 2016-09-07 17:12:42.763524056 +0200
-@@ -2220,10 +2220,7 @@
- opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
- if (opt == 0)
- opt = 1 << 6; /* default: 6 */
-- /* Map 1..3 to 4 */
-- if (opt & 0x7)
-- opt |= 1 << 4;
-- opt = ffs(opt >> 3);
-+ opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
- max_chain_length = 1 << gzip_level_config[opt].chain_shift;
- good_match = gzip_level_config[opt].good;
- max_lazy_match = gzip_level_config[opt].lazy2 * 2;
-diff -Nur busybox-1.25.0.orig/networking/libiproute/iproute.c busybox-1.25.0/networking/libiproute/iproute.c
---- busybox-1.25.0.orig/networking/libiproute/iproute.c 2016-05-26 19:42:44.000000000 +0200
-+++ busybox-1.25.0/networking/libiproute/iproute.c 2016-09-07 17:12:46.235747275 +0200
-@@ -362,10 +362,9 @@
- req.r.rtm_scope = RT_SCOPE_NOWHERE;
-
- if (cmd != RTM_DELROUTE) {
-+ req.r.rtm_scope = RT_SCOPE_UNIVERSE;
- if (RTPROT_BOOT != 0)
- req.r.rtm_protocol = RTPROT_BOOT;
-- if (RT_SCOPE_UNIVERSE != 0)
-- req.r.rtm_scope = RT_SCOPE_UNIVERSE;
- if (RTN_UNICAST != 0)
- req.r.rtm_type = RTN_UNICAST;
- }
-diff -Nur busybox-1.25.0.orig/networking/ntpd.c busybox-1.25.0/networking/ntpd.c
---- busybox-1.25.0.orig/networking/ntpd.c 2016-06-06 02:26:04.000000000 +0200
-+++ busybox-1.25.0/networking/ntpd.c 2016-09-07 17:12:38.979280766 +0200
-@@ -2051,6 +2051,13 @@
- goto bail;
- }
-
-+ /* Respond only to client and symmetric active packets */
-+ if ((msg.m_status & MODE_MASK) != MODE_CLIENT
-+ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT
-+ ) {
-+ goto bail;
-+ }
-+
- query_status = msg.m_status;
- query_xmttime = msg.m_xmttime;
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 18:27:52 +0000