diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
| commit | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch) | |
| tree | 406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/busybox | |
| parent | 38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff) | |
rework architecture / embedded systems concept
Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs
I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Makefile | 6 | ||||
| -rw-r--r-- | package/busybox/config/util-linux/Config.in | 1 | ||||
| -rw-r--r-- | package/busybox/patches/001-ipkg.patch | 498 | ||||
| -rw-r--r-- | package/busybox/patches/003-defaults.patch (renamed from package/busybox/patches/003-defaults-no.patch) | 49 | ||||
| -rw-r--r-- | package/busybox/patches/004-wget-accept-long-opts.patch | 23 | ||||
| -rw-r--r-- | package/busybox/patches/005-dot-find.patch | 12 | ||||
| -rw-r--r-- | package/busybox/patches/006-od-bloat.patch | 40 | ||||
| -rw-r--r-- | package/busybox/patches/007-endianness-check.patch | 71 |
8 files changed, 290 insertions, 410 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d4b9e8c6a..46752cb72 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.17.2 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 7360b7138b899ee7fc885791c740c3c3 +PKG_VERSION:= 1.18.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 6fe8f7d33..5462ee98a 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -253,6 +253,7 @@ config BUSYBOX_MKFS_REISER config BUSYBOX_MKFS_VFAT bool "mkfs_vfat" + default y if ADK_TARGET_WITH_MMC default n help Utility to create FAT32 filesystems. diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 10519636b..8269c0718 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,17 +1,17 @@ -diff -Nur busybox-1.17.2.orig/Makefile busybox-1.17.2/Makefile ---- busybox-1.17.2.orig/Makefile 2010-08-23 02:51:08.000000000 +0200 -+++ busybox-1.17.2/Makefile 2010-12-01 22:25:23.000000000 +0100 -@@ -464,6 +464,7 @@ - +diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile +--- busybox-1.18.1.orig/Makefile 2010-12-21 05:31:43.000000000 +0100 ++++ busybox-1.18.1/Makefile 2010-12-25 22:38:55.000000000 +0100 +@@ -465,6 +465,7 @@ libs-y := \ archival/ \ + archival/libarchive/ \ + archival/libipkg/ \ - archival/libunarchive/ \ console-tools/ \ coreutils/ \ -diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config.src ---- busybox-1.17.2.orig/archival/Config.src 2010-08-22 10:21:38.000000000 +0200 -+++ busybox-1.17.2/archival/Config.src 2010-12-01 22:25:23.000000000 +0100 + coreutils/libcoreutils/ \ +diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src +--- busybox-1.18.1.orig/archival/Config.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Config.src 2010-12-25 22:38:07.000000000 +0100 @@ -202,6 +202,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -25,20 +25,20 @@ diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.17.2.orig/archival/Kbuild.src busybox-1.17.2/archival/Kbuild.src ---- busybox-1.17.2.orig/archival/Kbuild.src 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/archival/Kbuild.src 2010-12-01 22:25:23.000000000 +0100 -@@ -23,6 +23,7 @@ - lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o +diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild.src +--- busybox-1.18.1.orig/archival/Kbuild.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Kbuild.src 2010-12-25 22:38:07.000000000 +0100 +@@ -22,6 +22,7 @@ + lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o +lib-$(CONFIG_IPKG) += ipkg.o lib-$(CONFIG_UNXZ) += bbunzip.o lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c ---- busybox-1.17.2.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/ipkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c +--- busybox-1.18.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/ipkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -68,9 +68,9 @@ diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/libipkg/Kbuild ---- busybox-1.17.2.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/Kbuild 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/libipkg/Kbuild +--- busybox-1.18.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/Kbuild 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -132,9 +132,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/li +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/libipkg/args.c ---- busybox-1.17.2.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/libipkg/args.c +--- busybox-1.18.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/args.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -378,9 +378,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/libipkg/args.h ---- busybox-1.17.2.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/libipkg/args.h +--- busybox-1.18.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/args.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -454,9 +454,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archival/libipkg/conffile.c ---- busybox-1.17.2.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archival/libipkg/conffile.c +--- busybox-1.18.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -523,9 +523,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archiva + + return ret; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archival/libipkg/conffile.h ---- busybox-1.17.2.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archival/libipkg/conffile.h +--- busybox-1.18.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -557,9 +557,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/archival/libipkg/conffile_list.c ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/archival/libipkg/conffile_list.c +--- busybox-1.18.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -608,9 +608,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/archival/libipkg/conffile_list.h ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/archival/libipkg/conffile_list.h +--- busybox-1.18.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -648,9 +648,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/ar + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archival/libipkg/file_util.c ---- busybox-1.17.2.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archival/libipkg/file_util.c +--- busybox-1.18.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/file_util.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -838,9 +838,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archival/libipkg/file_util.h ---- busybox-1.17.2.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archival/libipkg/file_util.h +--- busybox-1.18.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/file_util.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -871,9 +871,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archival/libipkg/hash_table.c ---- busybox-1.17.2.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archival/libipkg/hash_table.c +--- busybox-1.18.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/hash_table.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -1030,9 +1030,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archi + } +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archival/libipkg/hash_table.h ---- busybox-1.17.2.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archival/libipkg/hash_table.h +--- busybox-1.18.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/hash_table.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1078,9 +1078,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/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.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/libipkg/ipkg.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/libipkg/ipkg.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -1150,9 +1150,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/li +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archival/libipkg/ipkg_cmd.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archival/libipkg/ipkg_cmd.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c 2010-12-25 22:47:47.000000000 +0100 @@ -0,0 +1,1366 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -1193,7 +1193,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +#include "pkg.h" +#include "file_util.h" +#include "str_util.h" -+#include "unarchive.h" ++#include "archive.h" + +#include <fnmatch.h> + @@ -2520,9 +2520,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archival/libipkg/ipkg_cmd.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archival/libipkg/ipkg_cmd.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2565,9 +2565,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archival/libipkg/ipkg_conf.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archival/libipkg/ipkg_conf.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3280,9 +3280,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archival/libipkg/ipkg_conf.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archival/libipkg/ipkg_conf.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3391,9 +3391,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/archival/libipkg/ipkg_configure.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/archival/libipkg/ipkg_configure.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3435,9 +3435,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/a + return 0; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/archival/libipkg/ipkg_configure.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/archival/libipkg/ipkg_configure.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3464,9 +3464,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/archival/libipkg/ipkg_download.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/archival/libipkg/ipkg_download.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3663,9 +3663,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/ar + } + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/archival/libipkg/ipkg_download.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/archival/libipkg/ipkg_download.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3697,9 +3697,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/archival/libipkg/ipkg_includes.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_includes.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/archival/libipkg/ipkg_includes.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3783,9 +3783,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/ar +#include <mntent.h> + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/archival/libipkg/ipkg_install.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/archival/libipkg/ipkg_install.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5769,9 +5769,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/arc +} + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/archival/libipkg/ipkg_install.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/archival/libipkg/ipkg_install.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5808,9 +5808,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/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.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/archival/libipkg/ipkg_message.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/archival/libipkg/ipkg_message.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5847,9 +5847,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/arc + ipkg_cb_message(conf,level,ts); + } +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/archival/libipkg/ipkg_message.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/archival/libipkg/ipkg_message.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5883,9 +5883,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/archival/libipkg/ipkg_remove.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_remove.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/archival/libipkg/ipkg_remove.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6272,9 +6272,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/archival/libipkg/ipkg_remove.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_remove.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/archival/libipkg/ipkg_remove.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_remove.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6309,9 +6309,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/arch + + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/archival/libipkg/ipkg_upgrade.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/archival/libipkg/ipkg_upgrade.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6392,9 +6392,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/arc + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/archival/libipkg/ipkg_upgrade.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/archival/libipkg/ipkg_upgrade.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6414,9 +6414,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/arc +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archival/libipkg/ipkg_utils.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_utils.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archival/libipkg/ipkg_utils.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_utils.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6603,9 +6603,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archi +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archival/libipkg/ipkg_utils.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_utils.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archival/libipkg/ipkg_utils.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_utils.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6636,9 +6636,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archi +int line_is_blank(const char *line); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival/libipkg/libipkg.c ---- busybox-1.17.2.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/libipkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival/libipkg/libipkg.c +--- busybox-1.18.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/libipkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7223,9 +7223,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival + + return err; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival/libipkg/libipkg.h ---- busybox-1.17.2.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/libipkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival/libipkg/libipkg.h +--- busybox-1.18.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/libipkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7305,9 +7305,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival +extern void free_error_list(struct errlist **errors); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival/libipkg/nv_pair.c ---- busybox-1.17.2.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival/libipkg/nv_pair.c +--- busybox-1.18.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7349,9 +7349,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival/libipkg/nv_pair.h ---- busybox-1.17.2.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival/libipkg/nv_pair.h +--- busybox-1.18.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7385,9 +7385,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/archival/libipkg/nv_pair_list.c ---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/archival/libipkg/nv_pair_list.c +--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7487,9 +7487,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/arc + } + return NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/archival/libipkg/nv_pair_list.h ---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/archival/libipkg/nv_pair_list.h +--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7551,9 +7551,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/arc + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/libipkg/pkg.c ---- busybox-1.17.2.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/libipkg/pkg.c +--- busybox-1.18.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9312,9 +9312,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/lib + } + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/libipkg/pkg.h ---- busybox-1.17.2.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/libipkg/pkg.h +--- busybox-1.18.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -9545,9 +9545,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/lib +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/archival/libipkg/pkg_depends.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_depends.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/archival/libipkg/pkg_depends.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_depends.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10581,9 +10581,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/archival/libipkg/pkg_depends.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_depends.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/archival/libipkg/pkg_depends.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_depends.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10690,9 +10690,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/arch +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archival/libipkg/pkg_dest.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archival/libipkg/pkg_dest.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10786,9 +10786,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archiva + + dest->root_dir = NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archival/libipkg/pkg_dest.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archival/libipkg/pkg_dest.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10828,9 +10828,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/archival/libipkg/pkg_dest_list.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/archival/libipkg/pkg_dest_list.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10917,9 +10917,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/ar +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/archival/libipkg/pkg_dest_list.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/archival/libipkg/pkg_dest_list.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10971,9 +10971,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/ar + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/archival/libipkg/pkg_extract.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_extract.c 2010-12-01 22:27:00.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/archival/libipkg/pkg_extract.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_extract.c 2010-12-25 22:48:39.000000000 +0100 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11002,7 +11002,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/arch +#include "libbb.h" +#include "file_util.h" +#include "sprintf_alloc.h" -+#include "unarchive.h" ++#include "archive.h" + +#define IPKG_CONTROL_ARCHIVE "control.tar.gz" +#define IPKG_DATA_ARCHIVE "data.tar.gz" @@ -11230,9 +11230,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.h busybox-1.17.2/archival/libipkg/pkg_extract.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_extract.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/archival/libipkg/pkg_extract.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_extract.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11266,9 +11266,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.h busybox-1.17.2/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.c busybox-1.17.2/archival/libipkg/pkg_hash.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_hash.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archival/libipkg/pkg_hash.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_hash.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11893,9 +11893,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.c busybox-1.17.2/archiva +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.h busybox-1.17.2/archival/libipkg/pkg_hash.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_hash.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archival/libipkg/pkg_hash.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_hash.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11958,9 +11958,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.c busybox-1.17.2/archival/libipkg/pkg_parse.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_parse.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archival/libipkg/pkg_parse.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_parse.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12330,9 +12330,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.c busybox-1.17.2/archiv + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.h busybox-1.17.2/archival/libipkg/pkg_parse.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_parse.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archival/libipkg/pkg_parse.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_parse.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12365,9 +12365,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.h busybox-1.17.2/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.c busybox-1.17.2/archival/libipkg/pkg_src.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival/libipkg/pkg_src.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12412,9 +12412,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.c busybox-1.17.2/archival +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.h busybox-1.17.2/archival/libipkg/pkg_src.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival/libipkg/pkg_src.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12450,9 +12450,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.h busybox-1.17.2/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c busybox-1.17.2/archival/libipkg/pkg_src_list.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/archival/libipkg/pkg_src_list.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12529,9 +12529,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c busybox-1.17.2/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h busybox-1.17.2/archival/libipkg/pkg_src_list.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/archival/libipkg/pkg_src_list.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12590,9 +12590,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h busybox-1.17.2/arc + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.c busybox-1.17.2/archival/libipkg/pkg_vec.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_vec.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival/libipkg/pkg_vec.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_vec.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12825,9 +12825,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.c busybox-1.17.2/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.h busybox-1.17.2/archival/libipkg/pkg_vec.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_vec.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival/libipkg/pkg_vec.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_vec.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12891,9 +12891,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.h busybox-1.17.2/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.2/archival/libipkg/sprintf_alloc.h ---- busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/sprintf_alloc.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/archival/libipkg/sprintf_alloc.h +--- busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12920,9 +12920,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.2/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.c busybox-1.17.2/archival/libipkg/str_list.c ---- busybox-1.17.2.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archival/libipkg/str_list.c +--- busybox-1.18.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13000,9 +13000,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.c busybox-1.17.2/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.h busybox-1.17.2/archival/libipkg/str_list.h ---- busybox-1.17.2.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archival/libipkg/str_list.h +--- busybox-1.18.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13055,9 +13055,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.h busybox-1.17.2/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.c busybox-1.17.2/archival/libipkg/str_util.c ---- busybox-1.17.2.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_util.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archival/libipkg/str_util.c +--- busybox-1.18.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_util.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13128,9 +13128,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.c busybox-1.17.2/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.h busybox-1.17.2/archival/libipkg/str_util.h ---- busybox-1.17.2.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_util.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archival/libipkg/str_util.h +--- busybox-1.18.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_util.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13159,9 +13159,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.h busybox-1.17.2/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/user.c busybox-1.17.2/archival/libipkg/user.c ---- busybox-1.17.2.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/user.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/libipkg/user.c +--- busybox-1.18.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/user.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13212,9 +13212,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/user.c busybox-1.17.2/archival/li + + return response; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/user.h busybox-1.17.2/archival/libipkg/user.h ---- busybox-1.17.2.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/user.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/libipkg/user.h +--- busybox-1.18.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/user.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13239,9 +13239,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/user.h busybox-1.17.2/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.c busybox-1.17.2/archival/libipkg/void_list.c ---- busybox-1.17.2.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/void_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archival/libipkg/void_list.c +--- busybox-1.18.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/void_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13437,9 +13437,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.c busybox-1.17.2/archiv + else + return NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.h busybox-1.17.2/archival/libipkg/void_list.h ---- busybox-1.17.2.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/void_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.1/archival/libipkg/void_list.h +--- busybox-1.18.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/void_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13500,9 +13500,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.h busybox-1.17.2/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.c busybox-1.17.2/archival/libipkg/xsystem.c ---- busybox-1.17.2.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/xsystem.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival/libipkg/xsystem.c +--- busybox-1.18.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/xsystem.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13568,9 +13568,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.c busybox-1.17.2/archival + return -1; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.h busybox-1.17.2/archival/libipkg/xsystem.h ---- busybox-1.17.2.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/xsystem.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival/libipkg/xsystem.h +--- busybox-1.18.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/xsystem.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13606,21 +13606,10 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.h busybox-1.17.2/archival + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libunarchive/Kbuild.src busybox-1.17.2/archival/libunarchive/Kbuild.src ---- busybox-1.17.2.orig/archival/libunarchive/Kbuild.src 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/archival/libunarchive/Kbuild.src 2010-12-01 22:25:23.000000000 +0100 -@@ -43,6 +43,7 @@ - lib-$(CONFIG_DPKG) += $(DPKG_FILES) - lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) - lib-$(CONFIG_GUNZIP) += decompress_unzip.o -+lib-$(CONFIG_IPKG) += open_transformer.o get_header_tar.o get_header_tar_gz.o - lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_TAR) += get_header_tar.o -diff -Nur busybox-1.17.2.orig/include/applets.src.h busybox-1.17.2/include/applets.src.h ---- busybox-1.17.2.orig/include/applets.src.h 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/include/applets.src.h 2010-12-01 22:25:23.000000000 +0100 -@@ -209,6 +209,7 @@ +diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.1/include/applets.src.h +--- busybox-1.18.1.orig/include/applets.src.h 2010-12-21 05:31:04.000000000 +0100 ++++ busybox-1.18.1/include/applets.src.h 2010-12-25 22:38:09.000000000 +0100 +@@ -195,6 +195,7 @@ IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) @@ -13628,18 +13617,9 @@ diff -Nur busybox-1.17.2.orig/include/applets.src.h busybox-1.17.2/include/apple IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP)) -diff -Nur busybox-1.17.2.orig/include/unarchive.h busybox-1.17.2/include/unarchive.h ---- busybox-1.17.2.orig/include/unarchive.h 2010-08-22 10:21:38.000000000 +0200 -+++ busybox-1.17.2/include/unarchive.h 2010-12-01 22:25:23.000000000 +0100 -@@ -76,7 +76,7 @@ - off_t offset; - - /* Archiver specific. Can make it a union if it ever gets big */ --#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB -+#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG - smallint tar__end; - # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS - char* tar__longname; +diff -Nur busybox-1.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h +--- busybox-1.18.1.orig/include/archive.h 2010-12-20 01:41:27.000000000 +0100 ++++ busybox-1.18.1/include/archive.h 2010-12-25 22:51:31.000000000 +0100 @@ -95,7 +95,7 @@ struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; @@ -13649,12 +13629,12 @@ diff -Nur busybox-1.17.2.orig/include/unarchive.h busybox-1.17.2/include/unarchi /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.17.2.orig/include/usage.src.h busybox-1.17.2/include/usage.src.h ---- busybox-1.17.2.orig/include/usage.src.h 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/include/usage.src.h 2010-12-01 22:25:23.000000000 +0100 -@@ -1556,6 +1556,82 @@ - "$ ls -la /tmp/busybox*\n" \ - "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" +diff -Nur busybox-1.18.1.orig/include/usage.src.h busybox-1.18.1/include/usage.src.h +--- busybox-1.18.1.orig/include/usage.src.h 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/include/usage.src.h 2010-12-25 22:45:09.000000000 +0100 +@@ -1919,6 +1919,82 @@ + "\n -l Limits" \ + "\n -u Summary" \ +#define ipkg_trivial_usage \ + "[options]... sub-command [arguments]..." @@ -13732,6 +13712,6 @@ diff -Nur busybox-1.17.2.orig/include/usage.src.h busybox-1.17.2/include/usage.s + "\tregexp could be something like 'pkgname*' '*file*' or similar\n" \ + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + - #define halt_trivial_usage \ - "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") - #define halt_full_usage "\n\n" \ + #define iplink_trivial_usage \ + "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }" + #define iplink_full_usage "\n\n" \ diff --git a/package/busybox/patches/003-defaults-no.patch b/package/busybox/patches/003-defaults.patch index 1bc448165..d65bd788d 100644 --- a/package/busybox/patches/003-defaults-no.patch +++ b/package/busybox/patches/003-defaults.patch @@ -1,6 +1,6 @@ -diff -Nur busybox-1.17.1.orig/Config.in busybox-1.17.1/Config.in ---- busybox-1.17.1.orig/Config.in 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/Config.in 2010-07-26 14:32:24.000000000 +0200 +diff -Nur busybox-1.18.1.orig/Config.in busybox-1.18.1/Config.in +--- busybox-1.18.1.orig/Config.in 2010-12-21 05:31:04.000000000 +0100 ++++ busybox-1.18.1/Config.in 2010-12-25 23:20:18.000000000 +0100 @@ -15,7 +15,7 @@ config DESKTOP @@ -19,9 +19,9 @@ diff -Nur busybox-1.17.1.orig/Config.in busybox-1.17.1/Config.in help This option will enable backwards compatibility with SuSv2, specifically, old-style numeric options ('command -1 <file>') -diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config.src ---- busybox-1.17.1.orig/archival/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/archival/Config.src 2010-07-26 14:30:27.000000000 +0200 +diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src +--- busybox-1.18.1.orig/archival/Config.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Config.src 2010-12-25 23:21:02.000000000 +0100 @@ -79,7 +79,7 @@ config BUNZIP2 @@ -56,7 +56,7 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config - default y + default n help - Converts an RPM file into a CPIO archive. + Converts a RPM file into a CPIO archive. config RPM bool "rpm" @@ -90,9 +90,9 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config help unxz is a unlzma successor. -diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.src ---- busybox-1.17.1.orig/editors/Config.src 2010-07-06 04:25:53.000000000 +0200 -+++ busybox-1.17.1/editors/Config.src 2010-07-26 14:30:27.000000000 +0200 +diff -Nur busybox-1.18.1.orig/editors/Config.src busybox-1.18.1/editors/Config.src +--- busybox-1.18.1.orig/editors/Config.src 2010-12-20 01:41:27.000000000 +0100 ++++ busybox-1.18.1/editors/Config.src 2010-12-25 23:21:57.000000000 +0100 @@ -31,7 +31,7 @@ config DIFF @@ -102,14 +102,7 @@ diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.s help diff compares two files or directories and outputs the differences between them in a form that can be given to -@@ -62,13 +62,13 @@ - - config PATCH - bool "patch" -- default y -+ default n - help - Apply a unified diff formatted patch. +@@ -62,7 +62,7 @@ config SED bool "sed" @@ -118,10 +111,22 @@ diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.s help sed is used to perform text transformations on a file or input from a pipeline. -diff -Nur busybox-1.17.1.orig/networking/Config.src busybox-1.17.1/networking/Config.src ---- busybox-1.17.1.orig/networking/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/networking/Config.src 2010-07-26 14:30:27.000000000 +0200 -@@ -961,7 +961,7 @@ +diff -Nur busybox-1.18.1.orig/editors/patch.c busybox-1.18.1/editors/patch.c +--- busybox-1.18.1.orig/editors/patch.c 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/editors/patch.c 2010-12-25 23:22:38.000000000 +0100 +@@ -27,7 +27,7 @@ + + //config:config PATCH + //config: bool "patch" +-//config: default y ++//config: default n + //config: help + //config: Apply a unified diff formatted patch. + +diff -Nur busybox-1.18.1.orig/networking/Config.src busybox-1.18.1/networking/Config.src +--- busybox-1.18.1.orig/networking/Config.src 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/networking/Config.src 2010-12-25 23:20:19.000000000 +0100 +@@ -986,7 +986,7 @@ config WGET bool "wget" diff --git a/package/busybox/patches/004-wget-accept-long-opts.patch b/package/busybox/patches/004-wget-accept-long-opts.patch deleted file mode 100644 index 5d3891db0..000000000 --- a/package/busybox/patches/004-wget-accept-long-opts.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur busybox-1.17.0.orig/networking/wget.c busybox-1.17.0/networking/wget.c ---- busybox-1.17.0.orig/networking/wget.c 2010-06-24 04:40:43.000000000 +0200 -+++ busybox-1.17.0/networking/wget.c 2010-07-16 15:00:51.819609996 +0200 -@@ -542,8 +542,8 @@ - "proxy\0" Required_argument "Y" - "user-agent\0" Required_argument "U" - /* Ignored: */ -- // "tries\0" Required_argument "t" -- // "timeout\0" Required_argument "T" -+ "tries\0" Required_argument "t" -+ "timeout\0" Required_argument "T" - /* Ignored (we always use PASV): */ - "passive-ftp\0" No_argument "\xff" - "header\0" Required_argument "\xfe" -@@ -560,7 +560,7 @@ - #endif - /* server.allocated = target.allocated = NULL; */ - opt_complementary = "-1" IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::"); -- opt = getopt32(argv, "csqO:P:Y:U:" /*ignored:*/ "t:T:", -+ opt = getopt32(argv, "csqO:P:Y:U:t:T:", - &fname_out, &dir_prefix, - &proxy_flag, &user_agent, - NULL, /* -t RETRIES */ diff --git a/package/busybox/patches/005-dot-find.patch b/package/busybox/patches/005-dot-find.patch deleted file mode 100644 index aaa76b77c..000000000 --- a/package/busybox/patches/005-dot-find.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur busybox-1.17.2.orig/scripts/gen_build_files.sh busybox-1.17.2/scripts/gen_build_files.sh ---- busybox-1.17.2.orig/scripts/gen_build_files.sh 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/scripts/gen_build_files.sh 2010-09-28 15:15:51.000000000 +0200 -@@ -48,7 +48,7 @@ - fi - - # (Re)generate */Kbuild and */Config.in --{ cd -- "$srctree" && find -type d; } | while read -r d; do -+{ cd -- "$srctree" && find . -type d; } | while read -r d; do - d="${d#./}" - - src="$srctree/$d/Kbuild.src" diff --git a/package/busybox/patches/006-od-bloat.patch b/package/busybox/patches/006-od-bloat.patch index 8c608ca87..ff501acdb 100644 --- a/package/busybox/patches/006-od-bloat.patch +++ b/package/busybox/patches/006-od-bloat.patch @@ -1,12 +1,12 @@ -diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c ---- busybox-1.17.1.orig/coreutils/od.c 2010-07-06 04:25:53.000000000 +0200 -+++ busybox-1.17.1/coreutils/od.c 2010-08-15 12:50:31.000000000 +0200 -@@ -13,210 +13,5 @@ +diff -Nur busybox-1.18.1.orig/coreutils/od.c busybox-1.18.1/coreutils/od.c +--- busybox-1.18.1.orig/coreutils/od.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/coreutils/od.c 2010-12-25 23:18:48.000000000 +0100 +@@ -13,210 +13,4 @@ #include "libbb.h" -#if ENABLE_DESKTOP - /* This one provides -t (busybox's own build script needs it) */ +-/* This one provides -t (busybox's own build script needs it) */ #include "od_bloaty.c" -#else - @@ -102,7 +102,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - * the offset is changed as well. This isn't pretty, - * but it's easy. - */ --#define TYPE_OFFSET 7 +-#define TYPE_OFFSET 7 - { - char x_or_d; - if (base == 16) { @@ -122,19 +122,19 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c -} - -static const char *const add_strings[] = { -- "16/1 \"%3_u \" \"\\n\"", /* a */ -- "8/2 \" %06o \" \"\\n\"", /* B, o */ -- "16/1 \"%03o \" \"\\n\"", /* b */ -- "16/1 \"%3_c \" \"\\n\"", /* c */ -- "8/2 \" %05u \" \"\\n\"", /* d */ -- "4/4 \" %010u \" \"\\n\"", /* D */ -- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ -- "4/4 \" %14.7e \" \"\\n\"", /* f */ -- "4/4 \" %08x \" \"\\n\"", /* H, X */ -- "8/2 \" %04x \" \"\\n\"", /* h, x */ -- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ -- "8/2 \" %6d \" \"\\n\"", /* i */ -- "4/4 \" %011o \" \"\\n\"", /* O */ +- "16/1 \"%3_u \" \"\\n\"", /* a */ +- "8/2 \" %06o \" \"\\n\"", /* B, o */ +- "16/1 \"%03o \" \"\\n\"", /* b */ +- "16/1 \"%3_c \" \"\\n\"", /* c */ +- "8/2 \" %05u \" \"\\n\"", /* d */ +- "4/4 \" %010u \" \"\\n\"", /* D */ +- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ +- "4/4 \" %14.7e \" \"\\n\"", /* f */ +- "4/4 \" %08x \" \"\\n\"", /* H, X */ +- "8/2 \" %04x \" \"\\n\"", /* h, x */ +- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ +- "8/2 \" %6d \" \"\\n\"", /* i */ +- "4/4 \" %011o \" \"\\n\"", /* O */ -}; - -static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; @@ -166,7 +166,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - bb_dump_add(dumper, "\" \""); - } - bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); -- } else { /* P, p, s, w, or other unhandled */ +- } else { /* P, p, s, w, or other unhandled */ - bb_show_usage(); - } - } diff --git a/package/busybox/patches/007-endianness-check.patch b/package/busybox/patches/007-endianness-check.patch deleted file mode 100644 index d63f8bc6f..000000000 --- a/package/busybox/patches/007-endianness-check.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- busybox-1.17.2/include/platform.h~ Sat Nov 20 18:16:57 2010 -+++ busybox-1.17.2/include/platform.h Sat Nov 20 18:19:34 2010 -@@ -152,29 +152,40 @@ - - #if defined(__digital__) && defined(__unix__) - # include <sex.h> --# define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN) --# define __BYTE_ORDER BYTE_ORDER --#elif defined __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ -+ || defined(__APPLE__) -+# include <sys/time.h> - # include <sys/resource.h> /* rlimit */ - # include <machine/endian.h> - # define bswap_64 __bswap64 - # define bswap_32 __bswap32 - # define bswap_16 __bswap16 --# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) --#elif !defined __APPLE__ -+#else - # include <byteswap.h> - # include <endian.h> - #endif - --#if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ -+#if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN - # define BB_BIG_ENDIAN 1 - # define BB_LITTLE_ENDIAN 0 --#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN -+#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 -+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN - # define BB_BIG_ENDIAN 1 - # define BB_LITTLE_ENDIAN 0 --#elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) -+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN - # define BB_BIG_ENDIAN 0 - # define BB_LITTLE_ENDIAN 1 -+#elif defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN -+# define BB_BIG_ENDIAN 1 -+# define BB_LITTLE_ENDIAN 0 -+#elif defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 -+#elif defined(__386__) -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 - #else - # error "Can't determine endianness" - #endif -@@ -230,7 +241,7 @@ typedef uint32_t bb__aliased_uint32_t FI - /* ---- Compiler dependent settings ------------------------- */ - - #if (defined __digital__ && defined __unix__) \ -- || defined __APPLE__ || defined __FreeBSD__ -+ || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H - #else ---- busybox-1.17.2/include/libbb.h~ Mon Aug 23 00:46:38 2010 -+++ busybox-1.17.2/include/libbb.h Sat Nov 20 18:21:12 2010 -@@ -70,7 +70,7 @@ - # include <shadow.h> - # endif - #endif --#if defined __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - # include <netinet/in.h> - # include <arpa/inet.h> - #elif defined __APPLE__ |