diff options
| -rw-r--r-- | package/busybox/Makefile | 4 | ||||
| -rw-r--r-- | package/busybox/config/Config.in | 21 | ||||
| -rw-r--r-- | package/busybox/config/archival/Config.in | 7 | ||||
| -rw-r--r-- | package/busybox/config/coreutils/Config.in | 9 | ||||
| -rw-r--r-- | package/busybox/config/init/Config.in | 26 | ||||
| -rw-r--r-- | package/busybox/config/libbb/Config.in | 33 | ||||
| -rw-r--r-- | package/busybox/config/loginutils/Config.in | 8 | ||||
| -rw-r--r-- | package/busybox/config/miscutils/Config.in | 7 | ||||
| -rw-r--r-- | package/busybox/config/networking/Config.in | 7 | ||||
| -rw-r--r-- | package/busybox/config/networking/udhcp/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/config/util-linux/Config.in | 36 | ||||
| -rw-r--r-- | package/busybox/patches/001-ipkg.patch | 462 | ||||
| -rw-r--r-- | package/busybox/patches/003-disable-cflags.patch | 22 | ||||
| -rw-r--r-- | package/busybox/patches/003-udhcpc-quiet.patch | 21 | ||||
| -rw-r--r-- | package/busybox/patches/005-darwin-clang.patch | 12 | ||||
| -rw-r--r-- | package/busybox/patches/011-remove-non-posix-mallopt.patch | 39 | ||||
| -rw-r--r-- | package/busybox/patches/012-msghdr.patch | 50 |
17 files changed, 402 insertions, 364 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index c34ae8605..fbfadf3a0 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.24.2 +PKG_VERSION:= 1.25.0 PKG_RELEASE:= 1 -PKG_HASH:= e71ef53ec656f31c42633918d301405d40dea1d97eca12f272217ae4a971c855 +PKG_HASH:= 5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 80d59adab..9cf99ae04 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -124,6 +124,17 @@ config BUSYBOX_FEATURE_COMPRESS_USAGE and have very little memory, this might not be a win. Otherwise, you probably want this. +config BUSYBOX_BUSYBOX + bool "Include busybox applet" + default y + help + The busybox applet provides general help regarding busybox and + allows the included applets to be listed. It's also required + if applet links are to be installed at runtime. + + If you can live without these features disabling this will save + some space. + config BUSYBOX_FEATURE_INSTALLER bool "Support --install [-s] to install applet links at runtime" default n @@ -691,6 +702,16 @@ config BUSYBOX_DEBUG_PESSIMIZE in a much bigger executable that more closely matches the source code. +config BUSYBOX_DEBUG_SANITIZE + bool "Enable runtime sanitizers (ASAN/LSAN/USAN/etc...)" + default n + help + Say Y here if you want to enable runtime sanitizers. These help + catch bad memory accesses (e.g. buffer overflows), but will make + the executable larger and slow down runtime a bit. + + If you aren't developing/testing busybox, say N here. + config BUSYBOX_UNIT_TEST bool "Build unit tests" default n diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index c223adafd..8cb90efd7 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -176,6 +176,13 @@ config BUSYBOX_GUNZIP You can use the `-t' option to test the integrity of an archive, without decompressing it. +config BUSYBOX_FEATURE_GUNZIP_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_GUNZIP && BUSYBOX_LONG_OPTS + help + Enable use of long options. + config BUSYBOX_GZIP bool "gzip" default y diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index ffd6d0eb1..54e4a1b9b 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -779,6 +779,15 @@ config BUSYBOX_FEATURE_STAT_FORMAT users can pass a custom format string for output. This adds about 7k to a nonstatic build on amd64. +config BUSYBOX_FEATURE_STAT_FILESYSTEM + bool "Enable display of filesystem status (-f)" + default n + depends on BUSYBOX_STAT + select BUSYBOX_PLATFORM_LINUX # statfs() + help + Without this, stat will not support the '-f' option to display + information about filesystem status. + config BUSYBOX_STTY bool "stty" default n diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in index 7910b0f4d..09fdf9f98 100644 --- a/package/busybox/config/init/Config.in +++ b/package/busybox/config/init/Config.in @@ -79,6 +79,17 @@ config BUSYBOX_INIT help init is the first program run when the system boots. +config BUSYBOX_LINUXRC + bool "Support running init from within an initrd (not initramfs)" + default n + select BUSYBOX_FEATURE_SYSLOG + 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_FEATURE_USE_INITTAB bool "Support reading an inittab file" default y @@ -166,6 +177,21 @@ config BUSYBOX_INIT_TERMINAL_TYPE Note that on Linux, init attempts to detect serial terminal and sets TERM to "vt102" if one is found. +config BUSYBOX_FEATURE_INIT_MODIFY_CMDLINE + bool "Modify the command-line to \"init\"" + default n + depends on BUSYBOX_INIT || BUSYBOX_LINUXRC + help + When launched as PID 1 and after parsing its arguments, init + wipes all the arguments but argv[0] and rewrites argv[0] to + contain only "init", so that its command-line appears solely as + "init" in tools such as ps. + If this option is set to Y, init will keep its original behavior, + otherwise, all the arguments including argv[0] will be preserved, + be they parsed or ignored by init. + The original command-line used to launch init can then be + retrieved in /proc/1/cmdline on Linux, for example. + config BUSYBOX_MESG bool "mesg" default n diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index 9205677e2..9eb353dc0 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -6,6 +6,39 @@ menu "Busybox Library Tuning" +config BUSYBOX_FEATURE_USE_BSS_TAIL + bool "Use the end of BSS page" + default n + help + Attempt to reclaim a small unused part of BSS. + + Executables have the following parts: + = read-only executable code and constants, also known as "text" + = read-write data + = non-initialized (zeroed on demand) data, also known as "bss" + + At link time, "text" is padded to a full page. At runtime, all "text" + pages are mapped RO and executable. + "Data" starts on the next page boundary, but is not padded + to a full page at the end. "Bss" starts wherever "data" ends. + At runtime, "data" pages are mapped RW and they are file-backed + (this includes a small portion of "bss" which may live in the last + partial page of "data"). + Pages which are fully in "bss" are mapped to anonymous memory. + + "Bss" end is usually not page-aligned. There is an unused space + in the last page. Linker marks its start with the "_end" symbol. + + This option will attempt to use that space for bb_common_bufsiz1[] + array. If it fits after _end, it will be used, and COMMON_BUFSIZE + will be enlarged from its guaranteed minimum size of 1 kbyte. + This may require recompilation a second time, since value of _end + is known only after final link. + + If you are getting a build error like this: + appletlib.c:(.text.main+0xd): undefined reference to '_end' + disable this option. + config BUSYBOX_FEATURE_SYSTEMD bool "Enable systemd support" default n diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in index a0b84fff5..e720acb3b 100644 --- a/package/busybox/config/loginutils/Config.in +++ b/package/busybox/config/loginutils/Config.in @@ -295,6 +295,14 @@ config BUSYBOX_CRYPTPW using the given salt. Debian has this utility under mkpasswd name. Busybox provides mkpasswd as an alias for cryptpw. +config BUSYBOX_MKPASSWD + bool "mkpasswd" + default n + help + Encrypts the given password with the crypt(3) libc function + using the given salt. Debian has this utility under mkpasswd + name. Busybox provides mkpasswd as an alias for cryptpw. + config BUSYBOX_CHPASSWD bool "chpasswd" default n diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 5da46fecb..107a96664 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -192,6 +192,13 @@ config BUSYBOX_UBIUPDATEVOL help Update a UBI volume. +config BUSYBOX_UBIRENAME + bool "ubirename" + default n + select BUSYBOX_PLATFORM_LINUX + help + Utility to rename UBI volumes + config BUSYBOX_ADJTIMEX bool "adjtimex" default n diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index f0e66148b..fece6971b 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -656,6 +656,13 @@ config BUSYBOX_FEATURE_IP_RULE help Add support for rule commands to "ip". +config BUSYBOX_FEATURE_IP_NEIGH + bool "ip neighbor" + default n + depends on BUSYBOX_IP + help + Add support for neighbor commands to "ip". + config BUSYBOX_FEATURE_IP_SHORT_FORMS bool "Support short forms of ip commands" default n diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 35e5ce538..aec0fd62f 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -110,7 +110,7 @@ config BUSYBOX_FEATURE_UDHCP_PORT config BUSYBOX_UDHCP_DEBUG int "Maximum verbosity level for udhcp applets (0..9)" - default 9 + default 0 range 0 9 depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_DHCPRELAY help diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index de0106440..f2e84a71a 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -6,6 +6,12 @@ menu "Linux System Utilities" +config BUSYBOX_BLKDISCARD + bool "blkdiscard" + default n + help + blkdiscard discards sectors on a given device. + config BUSYBOX_BLOCKDEV bool "blockdev" default n @@ -84,6 +90,21 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE /lib/firmware/ and if it exists, send it to the kernel for loading into the hardware. +config BUSYBOX_NSENTER + bool "nsenter" + default n + select BUSYBOX_PLATFORM_LINUX + help + Run program with namespaces of other processes. + +config BUSYBOX_FEATURE_NSENTER_LONG_OPTS + bool "Enable long options" + default n + depends on BUSYBOX_NSENTER && BUSYBOX_LONG_OPTS + help + Support long options for the nsenter applet. This makes + the busybox implementation more compatible with upstream. + config BUSYBOX_REV bool "rev" default n @@ -98,6 +119,14 @@ config BUSYBOX_UEVENT uevent is a netlink listener for kernel uevent notifications sent via netlink. It is usually used for dynamic device creation. +config BUSYBOX_UNSHARE + bool "unshare" + default n + depends on BUSYBOX_LONG_OPTS && !BUSYBOX_NOMMU + select BUSYBOX_PLATFORM_LINUX + help + Run program with some namespaces unshared from parent. + config BUSYBOX_ACPID bool "acpid" default n @@ -820,6 +849,13 @@ config BUSYBOX_VOLUMEID menu "Filesystem/Volume identification" depends on BUSYBOX_VOLUMEID +config BUSYBOX_FEATURE_VOLUMEID_BCACHE + bool "bcache filesystem" + default n + depends on BUSYBOX_VOLUMEID + help + TODO + config BUSYBOX_FEATURE_VOLUMEID_EXT bool "Ext filesystem" default y diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 5bd069253..5a36ef206 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,6 @@ -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 +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 @@ -0,0 +1,39 @@ +/* ipkg.c - the itsy package management system + @@ -41,9 +41,9 @@ diff -Nur busybox-1.24.1.orig/archival/ipkg.c busybox-1.24.1/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -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 +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 @@ -25,6 +25,8 @@ \ data_align.o \ @@ -62,9 +62,9 @@ diff -Nur busybox-1.24.1.orig/archival/libarchive/Kbuild.src busybox-1.24.1/arch get_header_tar_bz2.o \ get_header_tar_lzma.o \ 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 +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 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -308,9 +308,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/args.c busybox-1.24.1/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -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 +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 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -384,9 +384,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/args.h busybox-1.24.1/archival/li +void args_usage(const char *complaint); + +#endif -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 +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 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -453,9 +453,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile.c busybox-1.24.1/archiva + + return ret; +} -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 +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 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -487,9 +487,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile.h busybox-1.24.1/archiva + +#endif + -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 +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 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -538,9 +538,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile_list.c busybox-1.24.1/ar + return nv_pair_list_pop(list); +} + -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 +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 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -578,9 +578,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/conffile_list.h busybox-1.24.1/ar + +#endif + -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 +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 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -768,9 +768,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/file_util.c busybox-1.24.1/archiv + return hash_file(file_name, HASH_MD5); +} + -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 +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 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -801,9 +801,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/file_util.h busybox-1.24.1/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -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 +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 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -960,9 +960,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/hash_table.c busybox-1.24.1/archi + } +} + -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 +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 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1008,9 +1008,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/hash_table.h busybox-1.24.1/archi +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.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 +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 @@ -0,0 +1,1367 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2379,9 +2379,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.24.1/archiva +} + + -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 +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 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2424,9 +2424,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.24.1/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -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 +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 @@ -0,0 +1,739 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3167,9 +3167,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_conf.c busybox-1.24.1/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -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 +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 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3278,9 +3278,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_conf.h busybox-1.24.1/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -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 +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 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3322,9 +3322,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_configure.c busybox-1.24.1/a + return 0; +} + -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 +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 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3351,9 +3351,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_configure.h busybox-1.24.1/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -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 +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 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3550,9 +3550,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_download.c busybox-1.24.1/ar + } + return 0; +} -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 +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 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3584,9 +3584,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_download.h busybox-1.24.1/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -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 +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 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -3656,9 +3656,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg.h busybox-1.24.1/archival/li +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -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 +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 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3742,9 +3742,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_includes.h busybox-1.24.1/ar +#include <mntent.h> + +#endif /* IPKG_INCLUDES_H */ -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 +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 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5728,9 +5728,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_install.c busybox-1.24.1/arc +} + +#endif -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 +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 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5767,9 +5767,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_install.h busybox-1.24.1/arc +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.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 +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 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5806,9 +5806,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_message.c busybox-1.24.1/arc + ipkg_cb_message(conf,level,ts); + } +} -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 +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 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5842,9 +5842,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_message.h busybox-1.24.1/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.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 +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 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6231,9 +6231,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_remove.c busybox-1.24.1/arch + + return 0; +} -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 +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 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6268,9 +6268,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_remove.h busybox-1.24.1/arch + + +#endif -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 +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 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6351,9 +6351,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.24.1/arc + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -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 +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 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6373,9 +6373,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.24.1/arc +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -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 +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 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6562,9 +6562,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_utils.c busybox-1.24.1/archi +} + + -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 +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 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6595,9 +6595,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/ipkg_utils.h busybox-1.24.1/archi +int line_is_blank(const char *line); + +#endif -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 +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 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6659,9 +6659,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/Kbuild busybox-1.24.1/archival/li +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -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 +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 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7246,9 +7246,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/libipkg.c busybox-1.24.1/archival + + return err; +} -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 +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 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7328,9 +7328,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/libipkg.h busybox-1.24.1/archival +extern void free_error_list(struct errlist **errors); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.c busybox-1.24.1/archival/libipkg/nv_pair.c ---- busybox-1.24.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/nv_pair.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7372,9 +7372,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.c busybox-1.24.1/archival +} + + -diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.h busybox-1.24.1/archival/libipkg/nv_pair.h ---- busybox-1.24.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/nv_pair.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7408,9 +7408,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair.h busybox-1.24.1/archival + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.c busybox-1.24.1/archival/libipkg/nv_pair_list.c ---- busybox-1.24.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/nv_pair_list.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7510,9 +7510,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.c busybox-1.24.1/arc + } + return NULL; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.h busybox-1.24.1/archival/libipkg/nv_pair_list.h ---- busybox-1.24.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/nv_pair_list.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7574,9 +7574,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/nv_pair_list.h busybox-1.24.1/arc + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.c busybox-1.24.1/archival/libipkg/pkg.c ---- busybox-1.24.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9335,9 +9335,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.c busybox-1.24.1/archival/lib + } + return 0; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.c busybox-1.24.1/archival/libipkg/pkg_depends.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_depends.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10371,9 +10371,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.c busybox-1.24.1/arch + + return 0; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.h busybox-1.24.1/archival/libipkg/pkg_depends.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_depends.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10480,9 +10480,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_depends.h busybox-1.24.1/arch +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.c busybox-1.24.1/archival/libipkg/pkg_dest.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_dest.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10576,9 +10576,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.c busybox-1.24.1/archiva + + dest->root_dir = NULL; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.h busybox-1.24.1/archival/libipkg/pkg_dest.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_dest.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10618,9 +10618,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest.h busybox-1.24.1/archiva + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.24.1/archival/libipkg/pkg_dest_list.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_dest_list.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10707,9 +10707,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.24.1/ar +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.24.1/archival/libipkg/pkg_dest_list.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_dest_list.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10761,9 +10761,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.24.1/ar + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.c busybox-1.24.1/archival/libipkg/pkg_extract.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_extract.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11020,9 +11020,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.c busybox-1.24.1/arch + + return 0; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.h busybox-1.24.1/archival/libipkg/pkg_extract.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_extract.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11056,9 +11056,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_extract.h busybox-1.24.1/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.h busybox-1.24.1/archival/libipkg/pkg.h ---- busybox-1.24.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11289,9 +11289,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg.h busybox-1.24.1/archival/lib +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.c busybox-1.24.1/archival/libipkg/pkg_hash.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_hash.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11916,9 +11916,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.c busybox-1.24.1/archiva +} + + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.h busybox-1.24.1/archival/libipkg/pkg_hash.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_hash.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11981,9 +11981,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_hash.h busybox-1.24.1/archiva + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.c busybox-1.24.1/archival/libipkg/pkg_parse.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_parse.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12353,9 +12353,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.c busybox-1.24.1/archiv + + return 0; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.h busybox-1.24.1/archival/libipkg/pkg_parse.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_parse.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12388,9 +12388,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_parse.h busybox-1.24.1/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.c busybox-1.24.1/archival/libipkg/pkg_src.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_src.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12435,9 +12435,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.c busybox-1.24.1/archival +} + + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.h busybox-1.24.1/archival/libipkg/pkg_src.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_src.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12473,9 +12473,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src.h busybox-1.24.1/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.c busybox-1.24.1/archival/libipkg/pkg_src_list.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_src_list.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12552,9 +12552,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.c busybox-1.24.1/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.h busybox-1.24.1/archival/libipkg/pkg_src_list.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_src_list.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12613,9 +12613,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_src_list.h busybox-1.24.1/arc + +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.c busybox-1.24.1/archival/libipkg/pkg_vec.c ---- busybox-1.24.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_vec.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12848,9 +12848,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.c busybox-1.24.1/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.h busybox-1.24.1/archival/libipkg/pkg_vec.h ---- busybox-1.24.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/pkg_vec.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12914,9 +12914,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/pkg_vec.h busybox-1.24.1/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.24.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.24.1/archival/libipkg/sprintf_alloc.h ---- busybox-1.24.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/sprintf_alloc.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12943,9 +12943,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.24.1/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.c busybox-1.24.1/archival/libipkg/str_list.c ---- busybox-1.24.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/str_list.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13023,9 +13023,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.c busybox-1.24.1/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.h busybox-1.24.1/archival/libipkg/str_list.h ---- busybox-1.24.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/str_list.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13078,9 +13078,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/str_list.h busybox-1.24.1/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.c busybox-1.24.1/archival/libipkg/str_util.c ---- busybox-1.24.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/str_util.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13151,9 +13151,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.c busybox-1.24.1/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.h busybox-1.24.1/archival/libipkg/str_util.h ---- busybox-1.24.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/str_util.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13182,9 +13182,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/str_util.h busybox-1.24.1/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/user.c busybox-1.24.1/archival/libipkg/user.c ---- busybox-1.24.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/user.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13235,9 +13235,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/user.c busybox-1.24.1/archival/li + + return response; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/user.h busybox-1.24.1/archival/libipkg/user.h ---- busybox-1.24.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/user.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13262,9 +13262,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/user.h busybox-1.24.1/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.c busybox-1.24.1/archival/libipkg/void_list.c ---- busybox-1.24.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/void_list.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13460,9 +13460,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.c busybox-1.24.1/archiv + else + return NULL; +} -diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.h busybox-1.24.1/archival/libipkg/void_list.h ---- busybox-1.24.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/void_list.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13523,9 +13523,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/void_list.h busybox-1.24.1/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.c busybox-1.24.1/archival/libipkg/xsystem.c ---- busybox-1.24.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/xsystem.c 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13591,9 +13591,9 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.c busybox-1.24.1/archival + return -1; +} + -diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.h busybox-1.24.1/archival/libipkg/xsystem.h ---- busybox-1.24.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.24.1/archival/libipkg/xsystem.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13629,10 +13629,10 @@ diff -Nur busybox-1.24.1.orig/archival/libipkg/xsystem.h busybox-1.24.1/archival + +#endif + -diff -Nur busybox-1.24.1.orig/include/applets.src.h busybox-1.24.1/include/applets.src.h ---- busybox-1.24.1.orig/include/applets.src.h 2015-10-24 02:24:35.000000000 +0200 -+++ busybox-1.24.1/include/applets.src.h 2015-10-31 19:00:22.000000000 +0100 -@@ -193,6 +193,7 @@ +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)) @@ -13640,24 +13640,10 @@ diff -Nur busybox-1.24.1.orig/include/applets.src.h busybox-1.24.1/include/apple IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP)) IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP)) IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP)) -diff -Nur busybox-1.24.1.orig/include/bb_archive.h busybox-1.24.1/include/bb_archive.h ---- busybox-1.24.1.orig/include/bb_archive.h 2015-10-24 02:24:35.000000000 +0200 -+++ busybox-1.24.1/include/bb_archive.h 2015-10-31 19:00:22.000000000 +0100 -@@ -79,7 +79,6 @@ - /* Archiver specific. Can make it a union if it ever gets big */ - #define PAX_NEXT_FILE 0 - #define PAX_GLOBAL 1 --#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB - smallint tar__end; - # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS - char* tar__longname; -@@ -92,13 +91,12 @@ - # if ENABLE_FEATURE_TAR_SELINUX - char* tar__sctx[2]; - # endif --#endif - #if ENABLE_CPIO || ENABLE_RPM2CPIO || ENABLE_RPM - uoff_t cpio__blocks; +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 @@ struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; #endif @@ -13666,9 +13652,9 @@ diff -Nur busybox-1.24.1.orig/include/bb_archive.h busybox-1.24.1/include/bb_arc /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.24.1.orig/include/usage.src.h busybox-1.24.1/include/usage.src.h ---- busybox-1.24.1.orig/include/usage.src.h 2015-07-13 04:18:47.000000000 +0200 -+++ busybox-1.24.1/include/usage.src.h 2015-10-31 19:00:22.000000000 +0100 +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 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13750,9 +13736,9 @@ diff -Nur busybox-1.24.1.orig/include/usage.src.h busybox-1.24.1/include/usage.s + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + #endif -diff -Nur busybox-1.24.1.orig/Makefile busybox-1.24.1/Makefile ---- busybox-1.24.1.orig/Makefile 2015-10-24 02:28:51.000000000 +0200 -+++ busybox-1.24.1/Makefile 2015-10-31 19:00:22.000000000 +0100 +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 @@ -466,6 +466,7 @@ libs-y := \ archival/ \ diff --git a/package/busybox/patches/003-disable-cflags.patch b/package/busybox/patches/003-disable-cflags.patch deleted file mode 100644 index 83417d119..000000000 --- a/package/busybox/patches/003-disable-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur busybox-1.22.1.orig/Makefile.flags busybox-1.22.1/Makefile.flags ---- busybox-1.22.1.orig/Makefile.flags 2014-01-09 19:15:44.000000000 +0100 -+++ busybox-1.22.1/Makefile.flags 2014-05-23 21:31:04.000000000 +0200 -@@ -61,18 +61,6 @@ - # be fixed.. - #CFLAGS += $(call cc-option,-Wconversion,) - --ifneq ($(CONFIG_DEBUG),y) --CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) --else --CFLAGS += $(call cc-option,-g,) --#CFLAGS += "-D_FORTIFY_SOURCE=2" --ifeq ($(CONFIG_DEBUG_PESSIMIZE),y) --CFLAGS += $(call cc-option,-O0,) --else --CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) --endif --endif -- - # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)... - ARCH_FPIC ?= -fpic - ARCH_FPIE ?= -fpie diff --git a/package/busybox/patches/003-udhcpc-quiet.patch b/package/busybox/patches/003-udhcpc-quiet.patch new file mode 100644 index 000000000..123230999 --- /dev/null +++ b/package/busybox/patches/003-udhcpc-quiet.patch @@ -0,0 +1,21 @@ +diff -Nur busybox-1.25.0.orig/networking/ifupdown.c busybox-1.25.0/networking/ifupdown.c +--- busybox-1.25.0.orig/networking/ifupdown.c 2016-05-26 19:42:44.000000000 +0200 ++++ busybox-1.25.0/networking/ifupdown.c 2016-06-25 01:14:51.656598262 +0200 +@@ -537,7 +537,7 @@ + }, + { "udhcpc", + "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]" +- "[[ -s %script%]][[ %udhcpc_opts%]]", ++ "[[ -s %script%]][[ %udhcpc_opts%]] 2>/dev/null", + "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", + }, + }; +@@ -576,7 +576,7 @@ + return 0; + # endif + return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " +- "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", ++ "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]] 2>/dev/null", + ifd, exec); + } + # else diff --git a/package/busybox/patches/005-darwin-clang.patch b/package/busybox/patches/005-darwin-clang.patch deleted file mode 100644 index 501e5c332..000000000 --- a/package/busybox/patches/005-darwin-clang.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur busybox-1.22.1.orig/scripts/kconfig/zconf.hash.c_shipped busybox-1.22.1/scripts/kconfig/zconf.hash.c_shipped ---- busybox-1.22.1.orig/scripts/kconfig/zconf.hash.c_shipped 2014-01-09 19:15:44.000000000 +0100 -+++ busybox-1.22.1/scripts/kconfig/zconf.hash.c_shipped 2014-05-24 23:21:27.000000000 +0200 -@@ -156,7 +156,7 @@ - #ifdef __GNUC__ - __inline - #endif --struct kconf_id * -+static struct kconf_id * - kconf_id_lookup (register const char *str, register unsigned int len) - { - enum diff --git a/package/busybox/patches/011-remove-non-posix-mallopt.patch b/package/busybox/patches/011-remove-non-posix-mallopt.patch deleted file mode 100644 index e18a25d2f..000000000 --- a/package/busybox/patches/011-remove-non-posix-mallopt.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur busybox-1.23.0.orig/libbb/appletlib.c busybox-1.23.0/libbb/appletlib.c ---- busybox-1.23.0.orig/libbb/appletlib.c 2014-11-20 01:08:23.000000000 +0100 -+++ busybox-1.23.0/libbb/appletlib.c 2015-03-07 09:10:56.000000000 +0100 -@@ -28,13 +28,6 @@ - */ - #include "busybox.h" - --#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ -- || defined(__APPLE__) \ -- ) --# include <malloc.h> /* for mallopt */ --#endif -- -- - /* Declare <applet>_main() */ - #define PROTOTYPES - #include "applets.h" -@@ -792,21 +785,6 @@ - int main(int argc UNUSED_PARAM, char **argv) - #endif - { -- /* Tweak malloc for reduced memory consumption */ --#ifdef M_TRIM_THRESHOLD -- /* M_TRIM_THRESHOLD is the maximum amount of freed top-most memory -- * to keep before releasing to the OS -- * Default is way too big: 256k -- */ -- mallopt(M_TRIM_THRESHOLD, 8 * 1024); --#endif --#ifdef M_MMAP_THRESHOLD -- /* M_MMAP_THRESHOLD is the request size threshold for using mmap() -- * Default is too big: 256k -- */ -- mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256); --#endif -- - #if !BB_MMU - /* NOMMU re-exec trick sets high-order bit in first byte of name */ - if (argv[0][0] & 0x80) { diff --git a/package/busybox/patches/012-msghdr.patch b/package/busybox/patches/012-msghdr.patch deleted file mode 100644 index c34a4d4fc..000000000 --- a/package/busybox/patches/012-msghdr.patch +++ /dev/null @@ -1,50 +0,0 @@ -Patch from nsz via #musl -Fixes mips64 big endian n64 issue with ip - ---- busybox-1.24.2.orig/networking/libiproute/libnetlink.c -+++ busybox-1.24.2/networking/libiproute/libnetlink.c -@@ -72,10 +72,10 @@ - struct sockaddr_nl nladdr; - struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } }; - struct msghdr msg = { -- (void*)&nladdr, sizeof(nladdr), -- iov, 2, -- NULL, 0, -- 0 -+ .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr), -+ .msg_iov = iov, .msg_iovlen = 2, -+ .msg_control = NULL, .msg_controllen = 0, -+ .msg_flags = 0 - }; - - memset(&nladdr, 0, sizeof(nladdr)); -@@ -106,10 +106,10 @@ - struct nlmsghdr *h; - - struct msghdr msg = { -- (void*)&nladdr, sizeof(nladdr), -- &iov, 1, -- NULL, 0, -- 0 -+ .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr), -+ .msg_iov = &iov, .msg_iovlen = 1, -+ .msg_control = NULL, .msg_controllen = 0, -+ .msg_flags = 0 - }; - - status = recvmsg(rth->fd, &msg, 0); -@@ -212,10 +212,10 @@ - struct iovec iov = { (void*)n, n->nlmsg_len }; - char *buf = xmalloc(8*1024); /* avoid big stack buffer */ - struct msghdr msg = { -- (void*)&nladdr, sizeof(nladdr), -- &iov, 1, -- NULL, 0, -- 0 -+ .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr), -+ .msg_iov = &iov, .msg_iovlen = 1, -+ .msg_control = NULL, .msg_controllen = 0, -+ .msg_flags = 0 - }; - - memset(&nladdr, 0, sizeof(nladdr)); |