fix ipkg update with busybox wget

1 files changed, 633 insertions, 633 deletions

diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 1d10696c6..ca7059acc 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,7 +1,18 @@
-diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config.in
---- busybox-1.12.1.orig/archival/Config.in	2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/Config.in	2008-10-23 11:41:37.000000000 +0200
-@@ -157,6 +157,14 @@
+diff -Nur busybox-1.13.4.orig/Makefile busybox-1.13.4/Makefile
+--- busybox-1.13.4.orig/Makefile	2009-04-15 02:11:01.000000000 +0200
++++ busybox-1.13.4/Makefile	2009-05-31 15:40:37.158023800 +0200
+@@ -444,6 +444,7 @@
+ 
+ libs-y		:= \
+ 		archival/ \
++		archival/libipkg/ \
+ 		archival/libunarchive/ \
+ 		console-tools/ \
+ 		coreutils/ \
+diff -Nur busybox-1.13.4.orig/archival/Config.in busybox-1.13.4/archival/Config.in
+--- busybox-1.13.4.orig/archival/Config.in	2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/Config.in	2009-05-31 15:40:36.993689729 +0200
+@@ -158,6 +158,14 @@
  	  gzip is used to compress files.
  	  It's probably the most widely used UNIX compression program.
  
@@ -16,10 +27,21 @@ diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config.
  config RPM2CPIO
  	bool "rpm2cpio"
  	default n
-diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c
---- busybox-1.12.1.orig/archival/dpkg.c	2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/dpkg.c	2008-10-23 11:53:33.000000000 +0200
-@@ -1481,16 +1481,7 @@
+diff -Nur busybox-1.13.4.orig/archival/Kbuild busybox-1.13.4/archival/Kbuild
+--- busybox-1.13.4.orig/archival/Kbuild	2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/Kbuild	2009-05-31 15:40:36.997989438 +0200
+@@ -16,6 +16,7 @@
+ lib-$(CONFIG_DPKG_DEB)		+= dpkg_deb.o
+ lib-$(CONFIG_GUNZIP)		+= bbunzip.o
+ lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
++lib-$(CONFIG_IPKG)		+= ipkg.o
+ lib-$(CONFIG_RPM2CPIO)		+= rpm2cpio.o
+ lib-$(CONFIG_RPM)		+= rpm.o
+ lib-$(CONFIG_TAR)		+= tar.o
+diff -Nur busybox-1.13.4.orig/archival/dpkg.c busybox-1.13.4/archival/dpkg.c
+--- busybox-1.13.4.orig/archival/dpkg.c	2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/dpkg.c	2009-05-31 15:40:36.993689729 +0200
+@@ -1485,16 +1485,7 @@
  	return ar_handle->sub_archive->buffer;
  }
  
@@ -37,9 +59,9 @@ diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c
  
  static void unpack_package(deb_file_t *deb_file)
  {
-diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c
---- busybox-1.12.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/ipkg.c	2008-10-23 12:14:28.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/ipkg.c busybox-1.13.4/archival/ipkg.c
+--- busybox-1.13.4.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/ipkg.c	2009-05-31 15:40:36.993689729 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -69,20 +91,73 @@ diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c
 +{
 +	return ipkg_op(argc, argv);
 +}
-diff -Nur busybox-1.12.1.orig/archival/Kbuild busybox-1.12.1/archival/Kbuild
---- busybox-1.12.1.orig/archival/Kbuild	2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/Kbuild	2008-10-23 11:41:37.000000000 +0200
-@@ -16,6 +16,7 @@
- lib-$(CONFIG_DPKG_DEB)		+= dpkg_deb.o
- lib-$(CONFIG_GUNZIP)		+= bbunzip.o
- lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
-+lib-$(CONFIG_IPKG)		+= ipkg.o
- lib-$(CONFIG_RPM2CPIO)		+= rpm2cpio.o
- lib-$(CONFIG_RPM)		+= rpm.o
- lib-$(CONFIG_TAR)		+= tar.o
-diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/libipkg/args.c
---- busybox-1.12.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/args.c	2008-10-23 15:00:11.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/Kbuild busybox-1.13.4/archival/libipkg/Kbuild
+--- busybox-1.13.4.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/Kbuild	2009-05-31 15:40:37.069994700 +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 += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
+diff -Nur busybox-1.13.4.orig/archival/libipkg/args.c busybox-1.13.4/archival/libipkg/args.c
+--- busybox-1.13.4.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/args.c	2009-05-31 15:40:36.997989438 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -326,9 +401,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/li
 +{
 +	bb_error_msg("version %s\n", IPKG_VERSION);
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/libipkg/args.h
---- busybox-1.12.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/args.h	2008-10-23 14:59:44.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/args.h busybox-1.13.4/archival/libipkg/args.h
+--- busybox-1.13.4.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/args.h	2009-05-31 15:40:36.997989438 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -402,9 +477,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/li
 +void args_usage(const char *complaint);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archival/libipkg/conffile.c
---- busybox-1.12.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile.c	2008-10-23 12:48:24.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.c busybox-1.13.4/archival/libipkg/conffile.c
+--- busybox-1.13.4.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile.c	2009-05-31 15:40:36.997989438 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -471,9 +546,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archiva
 +
 +    return ret;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archival/libipkg/conffile.h
---- busybox-1.12.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile.h	2008-10-23 12:40:12.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.h busybox-1.13.4/archival/libipkg/conffile.h
+--- busybox-1.13.4.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile.h	2009-05-31 15:40:36.997989438 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -505,9 +580,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archiva
 +
 +#endif
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/archival/libipkg/conffile_list.c
---- busybox-1.12.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile_list.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.c busybox-1.13.4/archival/libipkg/conffile_list.c
+--- busybox-1.13.4.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile_list.c	2009-05-31 15:40:37.001989668 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -556,9 +631,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/ar
 +    return nv_pair_list_pop(list);
 +}
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/archival/libipkg/conffile_list.h
---- busybox-1.12.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile_list.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.h busybox-1.13.4/archival/libipkg/conffile_list.h
+--- busybox-1.13.4.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile_list.h	2009-05-31 15:40:37.005990736 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -596,9 +671,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/ar
 +
 +#endif
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archival/libipkg/file_util.c
---- busybox-1.12.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/file_util.c	2008-10-23 12:34:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.c busybox-1.13.4/archival/libipkg/file_util.c
+--- busybox-1.13.4.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/file_util.c	2009-05-31 15:40:37.005990736 +0200
 @@ -0,0 +1,132 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -732,9 +807,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archiv
 +    return hash_file(file_name, HASH_MD5);
 +}
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.h busybox-1.12.1/archival/libipkg/file_util.h
---- busybox-1.12.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/file_util.h	2008-10-23 12:30:58.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.h busybox-1.13.4/archival/libipkg/file_util.h
+--- busybox-1.13.4.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/file_util.h	2009-05-31 15:40:37.005990736 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -765,9 +840,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.h busybox-1.12.1/archiv
 +uint8_t *file_md5sum_alloc(const char *file_name);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.c busybox-1.12.1/archival/libipkg/hash_table.c
---- busybox-1.12.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/hash_table.c	2008-10-23 16:12:57.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/hash_table.c busybox-1.13.4/archival/libipkg/hash_table.c
+--- busybox-1.13.4.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/hash_table.c	2009-05-31 15:40:37.005990736 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -924,9 +999,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.c busybox-1.12.1/archi
 +    }
 +}
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.h busybox-1.12.1/archival/libipkg/hash_table.h
---- busybox-1.12.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/hash_table.h	2008-10-23 16:13:18.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/hash_table.h busybox-1.13.4/archival/libipkg/hash_table.h
+--- busybox-1.13.4.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/hash_table.h	2009-05-31 15:40:37.005990736 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -972,9 +1047,79 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/hash_table.h busybox-1.12.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.12.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.12.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_cmd.c	2008-10-23 15:06:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg.h busybox-1.13.4/archival/libipkg/ipkg.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg.h	2009-05-31 15:40:37.037992297 +0200
+@@ -0,0 +1,66 @@
++/* 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;
++
++#endif
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.c busybox-1.13.4/archival/libipkg/ipkg_cmd.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_cmd.c	2009-05-31 15:40:37.013991196 +0200
 @@ -0,0 +1,1433 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2409,9 +2554,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.12.1/archiva
 +}
 +
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.12.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_cmd.h	2008-10-23 13:46:55.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.h busybox-1.13.4/archival/libipkg/ipkg_cmd.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_cmd.h	2009-05-31 15:40:37.021990539 +0200
 @@ -0,0 +1,46 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2459,9 +2604,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.12.1/archiva
 +int pkg_mark_provides(pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c busybox-1.12.1/archival/libipkg/ipkg_conf.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_conf.c	2008-10-23 13:45:16.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_conf.c busybox-1.13.4/archival/libipkg/ipkg_conf.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_conf.c	2009-05-31 15:40:37.021990539 +0200
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3174,9 +3319,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.c busybox-1.12.1/archiv
 +     sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
 +     return root_filename;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h busybox-1.12.1/archival/libipkg/ipkg_conf.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_conf.h	2008-10-23 13:41:34.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_conf.h busybox-1.13.4/archival/libipkg/ipkg_conf.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_conf.h	2009-05-31 15:40:37.025991328 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3285,9 +3430,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_conf.h busybox-1.12.1/archiv
 +char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c busybox-1.12.1/archival/libipkg/ipkg_configure.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_configure.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_configure.c busybox-1.13.4/archival/libipkg/ipkg_configure.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_configure.c	2009-05-31 15:40:37.025991328 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3329,9 +3474,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.c busybox-1.12.1/a
 +    return 0;
 +}
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h busybox-1.12.1/archival/libipkg/ipkg_configure.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_configure.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_configure.h busybox-1.13.4/archival/libipkg/ipkg_configure.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_configure.h	2009-05-31 15:40:37.025991328 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3358,9 +3503,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_configure.h busybox-1.12.1/a
 +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/archival/libipkg/ipkg_download.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_download.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_download.c busybox-1.13.4/archival/libipkg/ipkg_download.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_download.c	2009-05-31 15:42:41.497770134 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3433,8 +3578,8 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/ar
 +    }
 +
 +    /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ 
-+    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
-+		  (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
++    sprintf_alloc(&cmd, "wget %s %s%s %s%s %s -P %s %s",
++		  (conf->http_proxy || conf->ftp_proxy) ? "-Y on" : "",
 +		  conf->proxy_user ? "--proxy-user=" : "",
 +		  conf->proxy_user ? conf->proxy_user : "",
 +		  conf->proxy_passwd ? "--proxy-passwd=" : "",
@@ -3557,9 +3702,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.c busybox-1.12.1/ar
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.h busybox-1.12.1/archival/libipkg/ipkg_download.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_download.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_download.h busybox-1.13.4/archival/libipkg/ipkg_download.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_download.h	2009-05-31 15:40:37.033992625 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3591,79 +3736,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_download.h busybox-1.12.1/ar
 +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg.h busybox-1.12.1/archival/libipkg/ipkg.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg.h	2008-10-23 13:40:24.000000000 +0200
-@@ -0,0 +1,66 @@
-+/* 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;
-+
-+#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h busybox-1.12.1/archival/libipkg/ipkg_includes.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_includes.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_includes.h busybox-1.13.4/archival/libipkg/ipkg_includes.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_includes.h	2009-05-31 15:40:37.041993644 +0200
 @@ -0,0 +1,79 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3744,9 +3819,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_includes.h busybox-1.12.1/ar
 +#endif
 +
 +#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.c busybox-1.12.1/archival/libipkg/ipkg_install.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_install.c	2008-10-23 15:07:04.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_install.c busybox-1.13.4/archival/libipkg/ipkg_install.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_install.c	2009-05-31 15:40:37.045994712 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5730,9 +5805,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.c busybox-1.12.1/arc
 +}
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.h busybox-1.12.1/archival/libipkg/ipkg_install.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_install.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_install.h busybox-1.13.4/archival/libipkg/ipkg_install.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_install.h	2009-05-31 15:40:37.049992428 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5769,9 +5844,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_install.h busybox-1.12.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.12.1.orig/archival/libipkg/ipkg_message.c busybox-1.12.1/archival/libipkg/ipkg_message.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_message.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_message.c busybox-1.13.4/archival/libipkg/ipkg_message.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_message.c	2009-05-31 15:40:37.053992938 +0200
 @@ -0,0 +1,61 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5834,9 +5909,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.c busybox-1.12.1/arc
 +	}
 +}
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.h busybox-1.12.1/archival/libipkg/ipkg_message.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_message.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_message.h busybox-1.13.4/archival/libipkg/ipkg_message.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_message.h	2009-05-31 15:40:37.057994007 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5870,9 +5945,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_message.h busybox-1.12.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.12.1.orig/archival/libipkg/ipkg_remove.c busybox-1.12.1/archival/libipkg/ipkg_remove.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_remove.c	2008-10-23 14:42:08.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_remove.c busybox-1.13.4/archival/libipkg/ipkg_remove.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_remove.c	2009-05-31 15:40:37.061994238 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6259,9 +6334,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.c busybox-1.12.1/arch
 +
 +    return 0;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h busybox-1.12.1/archival/libipkg/ipkg_remove.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_remove.h	2008-10-23 14:42:20.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_remove.h busybox-1.13.4/archival/libipkg/ipkg_remove.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_remove.h	2009-05-31 15:40:37.061994238 +0200
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6296,9 +6371,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_remove.h busybox-1.12.1/arch
 +
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.12.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_upgrade.c	2008-10-23 14:43:14.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.c busybox-1.13.4/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_upgrade.c	2009-05-31 15:40:37.061994238 +0200
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6379,9 +6454,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.12.1/arc
 +     new->state_flag |= SF_USER;
 +     return ipkg_install_pkg(conf, new,1);
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.12.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_upgrade.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.h busybox-1.13.4/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_upgrade.h	2009-05-31 15:40:37.061994238 +0200
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6401,9 +6476,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.12.1/arc
 +#include "ipkg.h"
 +
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c busybox-1.12.1/archival/libipkg/ipkg_utils.c
---- busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_utils.c	2008-10-23 14:44:05.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_utils.c busybox-1.13.4/archival/libipkg/ipkg_utils.c
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_utils.c	2009-05-31 15:40:37.065994189 +0200
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6590,9 +6665,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.c busybox-1.12.1/archi
 +}
 +
 +       
-diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h busybox-1.12.1/archival/libipkg/ipkg_utils.h
---- busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/ipkg_utils.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/ipkg_utils.h busybox-1.13.4/archival/libipkg/ipkg_utils.h
+--- busybox-1.13.4.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/ipkg_utils.h	2009-05-31 15:40:37.065994189 +0200
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6623,73 +6698,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/ipkg_utils.h busybox-1.12.1/archi
 +int line_is_blank(const char *line);
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/Kbuild busybox-1.12.1/archival/libipkg/Kbuild
---- busybox-1.12.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/Kbuild	2008-10-23 11:41:37.000000000 +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 += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.c busybox-1.12.1/archival/libipkg/libipkg.c
---- busybox-1.12.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/libipkg.c	2008-10-23 14:59:01.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/libipkg.c busybox-1.13.4/archival/libipkg/libipkg.c
+--- busybox-1.13.4.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/libipkg.c	2009-05-31 15:40:37.069994700 +0200
 @@ -0,0 +1,532 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7223,9 +7234,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.c busybox-1.12.1/archival
 +}
 +
 +#endif /* IPKG_LIB */
-diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.h busybox-1.12.1/archival/libipkg/libipkg.h
---- busybox-1.12.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/libipkg.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/libipkg.h busybox-1.13.4/archival/libipkg/libipkg.h
+--- busybox-1.13.4.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/libipkg.h	2009-05-31 15:40:37.069994700 +0200
 @@ -0,0 +1,87 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7314,9 +7325,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/libipkg.h busybox-1.12.1/archival
 +
 +
 +#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.c busybox-1.12.1/archival/libipkg/nv_pair.c
---- busybox-1.12.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/nv_pair.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair.c busybox-1.13.4/archival/libipkg/nv_pair.c
+--- busybox-1.13.4.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/nv_pair.c	2009-05-31 15:40:37.073994372 +0200
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7358,9 +7369,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.c busybox-1.12.1/archival
 +}
 +
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.h busybox-1.12.1/archival/libipkg/nv_pair.h
---- busybox-1.12.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/nv_pair.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair.h busybox-1.13.4/archival/libipkg/nv_pair.h
+--- busybox-1.13.4.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/nv_pair.h	2009-05-31 15:40:37.073994372 +0200
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7394,9 +7405,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair.h busybox-1.12.1/archival
 +
 +#endif
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c busybox-1.12.1/archival/libipkg/nv_pair_list.c
---- busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/nv_pair_list.c	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair_list.c busybox-1.13.4/archival/libipkg/nv_pair_list.c
+--- busybox-1.13.4.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/nv_pair_list.c	2009-05-31 15:40:37.073994372 +0200
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7496,9 +7507,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.c busybox-1.12.1/arc
 +     }    
 +     return NULL;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h busybox-1.12.1/archival/libipkg/nv_pair_list.h
---- busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/nv_pair_list.h	2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/nv_pair_list.h busybox-1.13.4/archival/libipkg/nv_pair_list.h
+--- busybox-1.13.4.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/nv_pair_list.h	2009-05-31 15:40:37.085996181 +0200
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7560,9 +7571,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/nv_pair_list.h busybox-1.12.1/arc
 +
 +#endif
 +
-diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg.c busybox-1.12.1/archival/libipkg/pkg.c
---- busybox-1.12.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/pkg.c	2008-10-23 15:02:19.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg.c busybox-1.13.4/archival/libipkg/pkg.c
+--- busybox-1.13.4.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/pkg.c	2009-05-31 15:40:37.089995574 +0200
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9321,9 +9332,242 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg.c busybox-1.12.1/archival/lib
 +     }
 +     return 0;
 +}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/pkg_depends.c busybox-1.12.1/archival/libipkg/pkg_depends.c
---- busybox-1.12.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/pkg_depends.c	2008-10-23 15:05:10.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/pkg.h busybox-1.13.4/archival/libipkg/pkg.h
+--- busybox-1.13.4.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/pkg.h	2009-05-31 15:40:37.109997565 +0200
+@@ -0,0 +1,229 @@
++/* pkg.h - the itsy pack