diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-11-01 19:15:02 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-11-01 22:12:17 +0100 |
commit | e746ded4dd366dda0dc859771abd02a599c5b6af (patch) | |
tree | 3b786c1481dab4bbd91aeca9eb43392fb109793f /package/busybox | |
parent | 1a86ee023560efb171e037fdd3a190d6e1d7c7f4 (diff) |
busybox: update to latest stable version
Diffstat (limited to 'package/busybox')
-rw-r--r-- | package/busybox/Makefile | 6 | ||||
-rw-r--r-- | package/busybox/config/Config.in | 2 | ||||
-rw-r--r-- | package/busybox/config/archival/Config.in | 10 | ||||
-rw-r--r-- | package/busybox/config/coreutils/Config.in | 30 | ||||
-rw-r--r-- | package/busybox/config/miscutils/Config.in | 36 | ||||
-rw-r--r-- | package/busybox/config/networking/Config.in | 49 | ||||
-rw-r--r-- | package/busybox/config/util-linux/Config.in | 21 | ||||
-rw-r--r-- | package/busybox/patches/001-ipkg.patch | 855 |
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 |