summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-01 22:42:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-01 22:42:20 +0100
commitd9730197219dda09ba7a0d5321c399e0d11d23e7 (patch)
tree25e92753ba3a5beeb2785fe9508bdafa11538ea2 /package/busybox
parentb252f7521306c28b8c46f3981cf4ea26d7993625 (diff)
fix ipkg and ipkg tools, consolidate mdev.conf
cpio under macosx or bsd creates tar archives via stdin while using find . with leading ./. heirloom cpio shipped with OpenADK does remove the leading ./. Adopt ipkg busybox applet to work without ./. Fix ipkg-build to be faster and to use included cpio for inner tar creation. Dependency to GNU tar can now be dropped.
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/patches/001-ipkg.patch1210
2 files changed, 606 insertions, 606 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index b6ddc2363..d4b9e8c6a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.17.2
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 7360b7138b899ee7fc885791c740c3c3
PKG_DESCR:= Core utilities for embedded systems
PKG_SECTION:= base
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 81f831d54..10519636b 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,17 @@
-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-28 13:07:49.435987872 +0200
+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 @@
+
+ libs-y := \
+ archival/ \
++ 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
@@ -202,6 +202,12 @@
are actually slower than gzip at equivalent compression ratios
and take up 3.2K of code.
@@ -14,9 +25,20 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config
config RPM2CPIO
bool "rpm2cpio"
default y
-diff -Nur busybox-1.17.1.orig/archival/ipkg.c busybox-1.17.1/archival/ipkg.c
---- busybox-1.17.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/ipkg.c 2010-07-28 13:07:49.439598667 +0200
+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
+ 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
@@ -0,0 +1,28 @@
+/* ipkg.c - the itsy package management system
+
@@ -46,20 +68,73 @@ diff -Nur busybox-1.17.1.orig/archival/ipkg.c busybox-1.17.1/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.17.1.orig/archival/Kbuild.src busybox-1.17.1/archival/Kbuild.src
---- busybox-1.17.1.orig/archival/Kbuild.src 2010-07-06 04:25:53.000000000 +0200
-+++ busybox-1.17.1/archival/Kbuild.src 2010-07-28 13:07:49.439598667 +0200
-@@ -23,6 +23,7 @@
- lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.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.1.orig/archival/libipkg/args.c busybox-1.17.1/archival/libipkg/args.c
---- busybox-1.17.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/args.c 2010-07-28 13:07:49.443599457 +0200
+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
+@@ -0,0 +1,60 @@
++# Makefile for busybox
++#
++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
++# Copyright (C) 2006 OpenWrt.org
++#
++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
++
++LIBIPKG_CORE_OBJS:= \
++ args.o \
++ libipkg.o \
++ user.o \
++
++LIBIPKG_CMD_OBJS:= \
++ ipkg_cmd.o \
++ ipkg_configure.o \
++ ipkg_download.o \
++ ipkg_install.o \
++ ipkg_remove.o \
++ ipkg_upgrade.o \
++
++LIBIPKG_DB_OBJS:= \
++ hash_table.o \
++ ipkg_conf.o \
++ ipkg_utils.o \
++ pkg.o \
++ pkg_depends.o \
++ pkg_extract.o \
++ pkg_hash.o \
++ pkg_parse.o \
++ pkg_vec.o \
++
++LIBIPKG_LIST_OBJS:= \
++ conffile.o \
++ conffile_list.o \
++ nv_pair.o \
++ nv_pair_list.o \
++ pkg_dest.o \
++ pkg_dest_list.o \
++ pkg_src.o \
++ pkg_src_list.o \
++ str_list.o \
++ void_list.o \
++
++LIBIPKG_UTIL_OBJS:= \
++ file_util.o \
++ ipkg_message.o \
++ str_util.o \
++ xsystem.o \
++
++lib-y :=
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
++
++ifeq ($(strip $(IPKG_ARCH)),)
++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
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -303,9 +378,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/args.c busybox-1.17.1/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/args.h busybox-1.17.1/archival/libipkg/args.h
---- busybox-1.17.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/args.h 2010-07-28 13:07:49.443599457 +0200
+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
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -379,9 +454,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/args.h busybox-1.17.1/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.c busybox-1.17.1/archival/libipkg/conffile.c
---- busybox-1.17.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile.c 2010-07-28 13:07:49.443599457 +0200
+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
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -448,9 +523,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.c busybox-1.17.1/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.h busybox-1.17.1/archival/libipkg/conffile.h
---- busybox-1.17.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile.h 2010-07-28 13:07:49.451597683 +0200
+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
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -482,9 +557,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.h busybox-1.17.1/archiva
+
+#endif
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.c busybox-1.17.1/archival/libipkg/conffile_list.c
---- busybox-1.17.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile_list.c 2010-07-28 13:07:49.451597683 +0200
+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
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -533,9 +608,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.c busybox-1.17.1/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.h busybox-1.17.1/archival/libipkg/conffile_list.h
---- busybox-1.17.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/conffile_list.h 2010-07-28 13:07:49.451597683 +0200
+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
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -573,9 +648,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.h busybox-1.17.1/ar
+
+#endif
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.c busybox-1.17.1/archival/libipkg/file_util.c
---- busybox-1.17.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/file_util.c 2010-07-28 13:07:49.455597914 +0200
+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
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -763,9 +838,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.c busybox-1.17.1/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.h busybox-1.17.1/archival/libipkg/file_util.h
---- busybox-1.17.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/file_util.h 2010-07-28 13:07:49.455597914 +0200
+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
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -796,9 +871,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.h busybox-1.17.1/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.c busybox-1.17.1/archival/libipkg/hash_table.c
---- busybox-1.17.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/hash_table.c 2010-07-28 13:07:49.455597914 +0200
+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
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -955,9 +1030,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.c busybox-1.17.1/archi
+ }
+}
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.h busybox-1.17.1/archival/libipkg/hash_table.h
---- busybox-1.17.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/hash_table.h 2010-07-28 13:07:49.455597914 +0200
+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
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1003,9 +1078,81 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.h busybox-1.17.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.17.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_cmd.c 2010-07-28 13:07:49.487607300 +0200
+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
+@@ -0,0 +1,68 @@
++/* ipkg.h - the itsy package management system
++
++ Carl D. Worth
++
++ Copyright (C) 2001 University of Southern California
++
++ This program is free software; you can redistribute it and/or
++ modify it under the terms of the GNU General Public License as
++ published by the Free Software Foundation; either version 2, or (at
++ your option) any later version.
++
++ This program is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++*/
++
++#ifndef IPKG_H
++#define IPKG_H
++
++#include "libbb.h"
++
++#include "ipkg_includes.h"
++#include "ipkg_conf.h"
++#include "ipkg_message.h"
++
++#define IPKG_PKG_EXTENSION ".ipk"
++#define DPKG_PKG_EXTENSION ".deb"
++
++#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
++#define IPKG_PKG_VERSION_SEP_CHAR '_'
++
++#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
++#define IPKG_LISTS_DIR_SUFFIX "lists"
++#define IPKG_INFO_DIR_SUFFIX "info"
++#define IPKG_STATUS_FILE_SUFFIX "status"
++
++#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
++
++#define IPKG_LIST_DESCRIPTION_LENGTH 128
++
++#define IPKG_VERSION "1.00"
++
++
++enum ipkg_error {
++ IPKG_SUCCESS = 0,
++ IPKG_PKG_DEPS_UNSATISFIED,
++ IPKG_PKG_IS_ESSENTIAL,
++ IPKG_PKG_HAS_DEPENDENTS,
++ IPKG_PKG_HAS_NO_CANDIDATE
++};
++typedef enum ipkg_error ipkg_error_t;
++
++extern int ipkg_state_changed;
++
++
++struct errlist {
++ char * errmsg;
++ struct errlist * next;
++} ;
++
++extern struct errlist* error_list;
++
++extern ipkg_conf_t *global_conf;
++
++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
@@ -0,0 +1,1366 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2373,9 +2520,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.1/archiva
+}
+
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_cmd.h 2010-07-28 13:07:49.491598591 +0200
+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
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2418,9 +2565,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.1/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c busybox-1.17.1/archival/libipkg/ipkg_conf.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_conf.c 2010-07-28 13:07:49.495599101 +0200
+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
@@ -0,0 +1,711 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3133,9 +3280,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c busybox-1.17.1/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h busybox-1.17.1/archival/libipkg/ipkg_conf.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_conf.h 2010-07-28 13:07:49.503598444 +0200
+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
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3244,9 +3391,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h busybox-1.17.1/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c busybox-1.17.1/archival/libipkg/ipkg_configure.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_configure.c 2010-07-28 13:07:49.503598444 +0200
+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
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3288,9 +3435,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c busybox-1.17.1/a
+ return 0;
+}
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h busybox-1.17.1/archival/libipkg/ipkg_configure.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_configure.h 2010-07-28 13:07:49.503598444 +0200
+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
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3317,9 +3464,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h busybox-1.17.1/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.c busybox-1.17.1/archival/libipkg/ipkg_download.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_download.c 2010-07-28 13:07:49.503598444 +0200
+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
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3516,9 +3663,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.c busybox-1.17.1/ar
+ }
+ return 0;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.h busybox-1.17.1/archival/libipkg/ipkg_download.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_download.h 2010-07-28 13:07:49.503598444 +0200
+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
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3550,81 +3697,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.h busybox-1.17.1/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg.h busybox-1.17.1/archival/libipkg/ipkg.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg.h 2010-07-28 13:07:49.507597557 +0200
-@@ -0,0 +1,68 @@
-+/* ipkg.h - the itsy package management system
-+
-+ Carl D. Worth
-+
-+ Copyright (C) 2001 University of Southern California
-+
-+ This program is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License as
-+ published by the Free Software Foundation; either version 2, or (at
-+ your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+*/
-+
-+#ifndef IPKG_H
-+#define IPKG_H
-+
-+#include "libbb.h"
-+
-+#include "ipkg_includes.h"
-+#include "ipkg_conf.h"
-+#include "ipkg_message.h"
-+
-+#define IPKG_PKG_EXTENSION ".ipk"
-+#define DPKG_PKG_EXTENSION ".deb"
-+
-+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-+#define IPKG_PKG_VERSION_SEP_CHAR '_'
-+
-+#define IPKG_STATE_DIR_PREFIX IPKGLIBDIR"/ipkg"
-+#define IPKG_LISTS_DIR_SUFFIX "lists"
-+#define IPKG_INFO_DIR_SUFFIX "info"
-+#define IPKG_STATUS_FILE_SUFFIX "status"
-+
-+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-+
-+#define IPKG_LIST_DESCRIPTION_LENGTH 128
-+
-+#define IPKG_VERSION "1.00"
-+
-+
-+enum ipkg_error {
-+ IPKG_SUCCESS = 0,
-+ IPKG_PKG_DEPS_UNSATISFIED,
-+ IPKG_PKG_IS_ESSENTIAL,
-+ IPKG_PKG_HAS_DEPENDENTS,
-+ IPKG_PKG_HAS_NO_CANDIDATE
-+};
-+typedef enum ipkg_error ipkg_error_t;
-+
-+extern int ipkg_state_changed;
-+
-+
-+struct errlist {
-+ char * errmsg;
-+ struct errlist * next;
-+} ;
-+
-+extern struct errlist* error_list;
-+
-+extern ipkg_conf_t *global_conf;
-+
-+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
-+
-+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h busybox-1.17.1/archival/libipkg/ipkg_includes.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_includes.h 2010-07-28 13:07:49.507597557 +0200
+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
@@ -0,0 +1,82 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3708,9 +3783,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h busybox-1.17.1/ar
+#include <mntent.h>
+
+#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.c busybox-1.17.1/archival/libipkg/ipkg_install.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_install.c 2010-07-28 13:07:49.511600581 +0200
+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
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5694,9 +5769,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.c busybox-1.17.1/arc
+}
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.h busybox-1.17.1/archival/libipkg/ipkg_install.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_install.h 2010-07-28 13:07:49.511600581 +0200
+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
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5733,9 +5808,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.h busybox-1.17.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.17.1.orig/archival/libipkg/ipkg_message.c busybox-1.17.1/archival/libipkg/ipkg_message.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_message.c 2010-07-28 13:07:49.515599694 +0200
+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
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5772,9 +5847,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.c busybox-1.17.1/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.h busybox-1.17.1/archival/libipkg/ipkg_message.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_message.h 2010-07-28 13:07:49.515599694 +0200
+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
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5808,9 +5883,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.h busybox-1.17.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.17.1.orig/archival/libipkg/ipkg_remove.c busybox-1.17.1/archival/libipkg/ipkg_remove.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_remove.c 2010-07-28 13:07:49.515599694 +0200
+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
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6197,9 +6272,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c busybox-1.17.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h busybox-1.17.1/archival/libipkg/ipkg_remove.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_remove.h 2010-07-28 13:07:49.515599694 +0200
+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
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6234,9 +6309,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h busybox-1.17.1/arch
+
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.c 2010-07-28 13:07:49.515599694 +0200
+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
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6317,9 +6392,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.1/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.h 2010-07-28 13:07:49.519597690 +0200
+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
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6339,9 +6414,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.1/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c busybox-1.17.1/archival/libipkg/ipkg_utils.c
---- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_utils.c 2010-07-28 13:07:49.519597690 +0200
+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
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6528,9 +6603,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c busybox-1.17.1/archi
+}
+
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h busybox-1.17.1/archival/libipkg/ipkg_utils.h
---- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/ipkg_utils.h 2010-07-28 13:07:49.519597690 +0200
+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
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6561,73 +6636,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h busybox-1.17.1/archi
+int line_is_blank(const char *line);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/Kbuild busybox-1.17.1/archival/libipkg/Kbuild
---- busybox-1.17.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/Kbuild 2010-07-28 13:07:49.519597690 +0200
-@@ -0,0 +1,60 @@
-+# Makefile for busybox
-+#
-+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
-+# Copyright (C) 2006 OpenWrt.org
-+#
-+# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
-+
-+LIBIPKG_CORE_OBJS:= \
-+ args.o \
-+ libipkg.o \
-+ user.o \
-+
-+LIBIPKG_CMD_OBJS:= \
-+ ipkg_cmd.o \
-+ ipkg_configure.o \
-+ ipkg_download.o \
-+ ipkg_install.o \
-+ ipkg_remove.o \
-+ ipkg_upgrade.o \
-+
-+LIBIPKG_DB_OBJS:= \
-+ hash_table.o \
-+ ipkg_conf.o \
-+ ipkg_utils.o \
-+ pkg.o \
-+ pkg_depends.o \
-+ pkg_extract.o \
-+ pkg_hash.o \
-+ pkg_parse.o \
-+ pkg_vec.o \
-+
-+LIBIPKG_LIST_OBJS:= \
-+ conffile.o \
-+ conffile_list.o \
-+ nv_pair.o \
-+ nv_pair_list.o \
-+ pkg_dest.o \
-+ pkg_dest_list.o \
-+ pkg_src.o \
-+ pkg_src_list.o \
-+ str_list.o \
-+ void_list.o \
-+
-+LIBIPKG_UTIL_OBJS:= \
-+ file_util.o \
-+ ipkg_message.o \
-+ str_util.o \
-+ xsystem.o \
-+
-+lib-y :=
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
-+lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
-+
-+ifeq ($(strip $(IPKG_ARCH)),)
-+IPKG_ARCH:=$(TARGET_ARCH)
-+endif
-+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.c busybox-1.17.1/archival/libipkg/libipkg.c
---- busybox-1.17.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/libipkg.c 2010-07-28 18:54:37.592513964 +0200
+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
@@ -0,0 +1,583 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7212,9 +7223,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.c busybox-1.17.1/archival
+
+ return err;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.h busybox-1.17.1/archival/libipkg/libipkg.h
---- busybox-1.17.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/libipkg.h 2010-07-28 13:07:49.523597362 +0200
+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
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7294,9 +7305,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.h busybox-1.17.1/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.c busybox-1.17.1/archival/libipkg/nv_pair.c
---- busybox-1.17.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair.c 2010-07-28 13:07:49.523597362 +0200
+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
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7338,9 +7349,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.c busybox-1.17.1/archival
+}
+
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.h busybox-1.17.1/archival/libipkg/nv_pair.h
---- busybox-1.17.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair.h 2010-07-28 13:07:49.523597362 +0200
+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
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7374,9 +7385,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.h busybox-1.17.1/archival
+
+#endif
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c busybox-1.17.1/archival/libipkg/nv_pair_list.c
---- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair_list.c 2010-07-28 13:07:49.523597362 +0200
+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
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7476,9 +7487,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c busybox-1.17.1/arc
+ }
+ return NULL;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h busybox-1.17.1/archival/libipkg/nv_pair_list.h
---- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/nv_pair_list.h 2010-07-28 13:07:49.523597362 +0200
+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
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7540,9 +7551,9 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h busybox-1.17.1/arc
+
+#endif
+
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.c busybox-1.17.1/archival/libipkg/pkg.c
---- busybox-1.17.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg.c 2010-07-28 13:07:49.543596278 +0200
+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
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9301,9 +9312,242 @@ diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.c busybox-1.17.1/archival/lib
+ }
+ return 0;
+}
-diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.c busybox-1.17.1/archival/libipkg/pkg_depends.c
---- busybox-1.17.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.1/archival/libipkg/pkg_depends.c 2010-07-28 13:07:49.547597626 +0200
+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
+@@ -0,0 +1,229 @@
++/* pkg.h - the itsy package management system
++
++ Carl D. Worth