summaryrefslogtreecommitdiff
path: root/package/busybox/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 21:39:13 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 21:39:13 +0200
commitb08f20692aaa5002fcd1f6a4a8e9f856e445208f (patch)
tree750e765d1feb5b4ad07d94f134f0a150699bf386 /package/busybox/patches
parent82ae0cb11d56c46dd1aa14de98f94106f9dcddbc (diff)
update to latest upstream, cleanup makefile
Diffstat (limited to 'package/busybox/patches')
-rw-r--r--package/busybox/patches/001-ipkg.patch1222
-rw-r--r--package/busybox/patches/003-defaults.patch259
-rw-r--r--package/busybox/patches/003-disable-cflags.patch22
-rw-r--r--package/busybox/patches/013-musl.patch11
-rw-r--r--package/busybox/patches/015-path_h_musl.patch11
-rw-r--r--package/busybox/patches/016-fix-musl-warning.patch12
6 files changed, 625 insertions, 912 deletions
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 1b65a5c90..3925d1e1b 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,23 +1,18 @@
-diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src
---- busybox-1.21.1.orig/archival/Config.src 2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Config.src 2014-04-07 12:36:32.391575261 +0200
-@@ -214,6 +214,12 @@
- are actually slower than gzip at equivalent compression ratios
- and take up 3.2K of code.
-
-+config IPKG
-+ bool "ipkg"
-+ default n
-+ help
-+ ipkg is the itsy package management system.
-+
- config RPM2CPIO
- bool "rpm2cpio"
- default y
-diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
---- busybox-1.21.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/ipkg.c 2014-04-07 12:36:32.391575261 +0200
-@@ -0,0 +1,28 @@
+diff -Nur busybox-1.22.1.orig/Makefile busybox-1.22.1/Makefile
+--- busybox-1.22.1.orig/Makefile 2014-01-20 03:39:28.000000000 +0100
++++ busybox-1.22.1/Makefile 2014-05-23 21:12:06.000000000 +0200
+@@ -466,6 +466,7 @@
+ libs-y := \
+ archival/ \
+ archival/libarchive/ \
++ archival/libipkg/ \
+ console-tools/ \
+ coreutils/ \
+ coreutils/libcoreutils/ \
+diff -Nur busybox-1.22.1.orig/archival/ipkg.c busybox-1.22.1/archival/ipkg.c
+--- busybox-1.22.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/ipkg.c 2014-05-23 21:19:24.000000000 +0200
+@@ -0,0 +1,39 @@
+/* ipkg.c - the itsy package management system
+
+ Florina Boor
@@ -38,6 +33,17 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
+
+*/
+
++//config:config IPKG
++//config: bool "ipkg"
++//config: default n
++//config: help
++//config: ipkg is a tool to install, build, remove and manage
++//config: packages.
++//config:
++
++//applet:IF_IPKG(APPLET(ipkg, BB_DIR_USR_BIN, BB_SUID_DROP))
++//kbuild:lib-$(CONFIG_IPKG) += ipkg.o
++
+#include "libbb.h"
+#include "libipkg/libipkg.h"
+
@@ -46,20 +52,9 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src
---- busybox-1.21.1.orig/archival/Kbuild.src 2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Kbuild.src 2014-04-07 12:36:32.391575261 +0200
-@@ -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.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src
---- busybox-1.21.1.orig/archival/libarchive/Kbuild.src 2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/archival/libarchive/Kbuild.src 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libarchive/Kbuild.src busybox-1.22.1/archival/libarchive/Kbuild.src
+--- busybox-1.22.1.orig/archival/libarchive/Kbuild.src 2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/archival/libarchive/Kbuild.src 2014-05-23 21:12:06.000000000 +0200
@@ -25,14 +25,14 @@
\
data_align.o \
@@ -77,9 +72,73 @@ diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/arch
get_header_tar_bz2.o \
get_header_tar_lzma.o \
-diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c
---- busybox-1.21.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.c 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/Kbuild busybox-1.22.1/archival/libipkg/Kbuild
+--- busybox-1.22.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/Kbuild 2014-05-23 21:12:06.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 += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
+diff -Nur busybox-1.22.1.orig/archival/libipkg/args.c busybox-1.22.1/archival/libipkg/args.c
+--- busybox-1.22.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/args.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -323,9 +382,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h
---- busybox-1.21.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.h 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/args.h busybox-1.22.1/archival/libipkg/args.h
+--- busybox-1.22.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/args.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -399,9 +458,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c
---- busybox-1.21.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.c 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.c busybox-1.22.1/archival/libipkg/conffile.c
+--- busybox-1.22.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/conffile.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -468,9 +527,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h
---- busybox-1.21.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.h 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile.h busybox-1.22.1/archival/libipkg/conffile.h
+--- busybox-1.22.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/conffile.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -502,9 +561,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archiva
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c
---- busybox-1.21.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.c 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.c busybox-1.22.1/archival/libipkg/conffile_list.c
+--- busybox-1.22.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/conffile_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -553,9 +612,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h
---- busybox-1.21.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.h 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/conffile_list.h busybox-1.22.1/archival/libipkg/conffile_list.h
+--- busybox-1.22.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/conffile_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -593,9 +652,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/ar
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c
---- busybox-1.21.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.c 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.c busybox-1.22.1/archival/libipkg/file_util.c
+--- busybox-1.22.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/file_util.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -783,9 +842,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h
---- busybox-1.21.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.h 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/file_util.h busybox-1.22.1/archival/libipkg/file_util.h
+--- busybox-1.22.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/file_util.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -816,9 +875,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c
---- busybox-1.21.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.c 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.c busybox-1.22.1/archival/libipkg/hash_table.c
+--- busybox-1.22.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/hash_table.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -975,9 +1034,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archi
+ }
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h
---- busybox-1.21.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.h 2014-04-07 12:36:32.391575261 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/hash_table.h busybox-1.22.1/archival/libipkg/hash_table.h
+--- busybox-1.22.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/hash_table.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1023,9 +1082,81 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.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.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg.h busybox-1.22.1/archival/libipkg/ipkg.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg.h 2014-05-23 21:12:06.000000000 +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.22.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.22.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_cmd.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,1367 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2394,9 +2525,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archiva
+}
+
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.22.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_cmd.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2439,9 +2570,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.c 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.c busybox-1.22.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_conf.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,739 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3182,9 +3313,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.h 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_conf.h busybox-1.22.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_conf.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3293,9 +3424,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.c 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.c busybox-1.22.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_configure.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3337,9 +3468,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/a
+ return 0;
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.h 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_configure.h busybox-1.22.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_configure.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3366,9 +3497,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.c 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.c busybox-1.22.1/archival/libipkg/ipkg_download.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_download.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3565,9 +3696,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/ar
+ }
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.h 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_download.h busybox-1.22.1/archival/libipkg/ipkg_download.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_download.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3599,81 +3730,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg.h 2014-04-07 12:36:32.411575387 +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.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_includes.h 2014-04-07 12:36:32.411575387 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_includes.h busybox-1.22.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_includes.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,82 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3757,9 +3816,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/ar
+#include <mntent.h>
+
+#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.c busybox-1.22.1/archival/libipkg/ipkg_install.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_install.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5743,9 +5802,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/arc
+}
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_install.h busybox-1.22.1/archival/libipkg/ipkg_install.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_install.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5782,9 +5841,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.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.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.c busybox-1.22.1/archival/libipkg/ipkg_message.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_message.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5821,9 +5880,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_message.h busybox-1.22.1/archival/libipkg/ipkg_message.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_message.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5857,9 +5916,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.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.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.c busybox-1.22.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_remove.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6246,9 +6305,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_remove.h busybox-1.22.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_remove.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6283,9 +6342,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/arch
+
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.22.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_upgrade.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6366,9 +6425,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.22.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_upgrade.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6388,9 +6447,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c
---- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.c busybox-1.22.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_utils.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6577,9 +6636,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archi
+}
+
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h
---- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/ipkg_utils.h busybox-1.22.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.22.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/ipkg_utils.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6610,73 +6669,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archi
+int line_is_blank(const char *line);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild
---- busybox-1.21.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/Kbuild 2014-04-07 12:36:32.415575413 +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.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c
---- busybox-1.21.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.c busybox-1.22.1/archival/libipkg/libipkg.c
+--- busybox-1.22.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/libipkg.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,583 @@
+/* ipkglib.c - the itsy package management system
+
@@ -7261,9 +7256,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival
+
+ return err;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h
---- busybox-1.21.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/libipkg.h busybox-1.22.1/archival/libipkg/libipkg.h
+--- busybox-1.22.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/libipkg.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7343,9 +7338,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c
---- busybox-1.21.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.c busybox-1.22.1/archival/libipkg/nv_pair.c
+--- busybox-1.22.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/nv_pair.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7387,9 +7382,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival
+}
+
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h
---- busybox-1.21.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair.h busybox-1.22.1/archival/libipkg/nv_pair.h
+--- busybox-1.22.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/nv_pair.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7423,9 +7418,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c
---- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.c busybox-1.22.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.22.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/nv_pair_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7525,9 +7520,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/arc
+ }
+ return NULL;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h
---- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/nv_pair_list.h busybox-1.22.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.22.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/nv_pair_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7589,9 +7584,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/arc
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c
---- busybox-1.21.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg.c busybox-1.22.1/archival/libipkg/pkg.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9350,9 +9345,242 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/lib
+ }
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.c 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg.h busybox-1.22.1/archival/libipkg/pkg.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg.h 2014-05-23 21:12:06.000000000 +0200
+@@ -0,0 +1,229 @@
++/* pkg.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 PKG_H
++#define PKG_H
++
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++
++#include "pkg_vec.h"
++#include "str_list.h"
++#include "pkg_src.h"
++#include "pkg_dest.h"
++#include "ipkg_conf.h"
++#include "conffile_list.h"
++
++struct ipkg_conf;
++
++/* I think "Size" is currently the shortest field name */
++#define PKG_MINIMUM_FIELD_NAME_LEN 4
++
++enum pkg_state_want
++{
++ SW_UNKNOWN = 1,
++ SW_INSTALL,
++ SW_DEINSTALL,
++ SW_PURGE,
++ SW_LAST_STATE_WANT
++};
++typedef enum pkg_state_want pkg_state_want_t;
++
++enum pkg_state_flag
++{
++ SF_OK = 0,
++ SF_REINSTREQ = 1,
++ SF_HOLD = 2, /* do not upgrade version */
++ SF_REPLACE = 4, /* replace this package */
++ SF_NOPRUNE = 8, /* do not remove obsolete files */
++ SF_PREFER = 16, /* prefer this version */
++ SF_OBSOLETE = 32, /* old package in upgrade pair */
++ SF_MARKED = 64, /* temporary mark */
++ SF_FILELIST_CHANGED = 128, /* needs filelist written */
++ SF_USER = 256,
++ SF_LAST_STATE_FLAG
++};
++typedef enum pkg_state_flag pkg_state_flag_t;
++#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
++
++enum pkg_state_status
++{
++ SS_NOT_INSTALLED = 1,
++ SS_UNPACKED,
++ SS_HALF_CONFIGURED,
++ SS_INSTALLED,
++ SS_HALF_INSTALLED,
++ SS_CONFIG_FILES,
++ SS_POST_INST_FAILED,
++ SS_REMOVAL_FAILED,
++ SS_LAST_STATE_STATUS
++};
++typedef enum pkg_state_status pkg_state_status_t;
++
++struct abstract_pkg{
++ char * name;
++ int dependencies_checked;
++ pkg_vec_t * pkgs;
++ pkg_state_status_t state_status;
++ pkg_state_flag_t state_flag;
++ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
++ abstract_pkg_vec_t * provided_by;
++ abstract_pkg_vec_t * replaced_by;
++};
++
++#include "pkg_depends.h"
++
++/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
++
++ The 3 version fields should go into a single version struct. (This
++ is especially important since, currently, pkg->version can easily
++ be mistaken for pkg_verson_str_alloc(pkg) although they are very
++ distinct. This has been the source of multiple bugs.
++
++ The 3 state fields could possibly also go into their own struct.
++
++ All fields which deal with lists of packages, (Depends,
++ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
++ be handled by a single struct in pkg_t
++
++ All string fields for which there is a small set of possible
++ values, (section, maintainer, architecture, maybe version?), that
++ are reused among different packages -- for all such packages we
++ should move from "char *"s to some atom datatype to share data
++ storage and use less memory. We might even do reference counting,
++ but probably not since most often we only create new pkg_t structs,
++ we don't often free them. */
++struct pkg
++{
++ char *name;
++ unsigned long epoch;
++ char *version;
++ char *revision;
++ char *familiar_revision;
++ pkg_src_t *src;
++ pkg_dest_t *dest;
++ char *architecture;
++ char *section;
++ char *maintainer;
++ char *description;
++ pkg_state_want_t state_want;
++ pkg_state_flag_t state_flag;
++ pkg_state_status_t state_status;
++ char **depends_str;
++ int depends_count;
++ char **pre_depends_str;
++ int pre_depends_count;
++ char **recommends_str;
++ int recommends_count;
++ char **suggests_str;
++ int suggests_count;
++ compound_depend_t * depends;
++
++ /* Abhaya: new conflicts */
++ char **conflicts_str;
++ compound_depend_t * conflicts;
++ int conflicts_count;
++
++ char **replaces_str;
++ int replaces_count;
++ abstract_pkg_t ** replaces;
++
++ char **provides_str;
++ int provides_count;
++ abstract_pkg_t ** provides;
++
++ abstract_pkg_t *parent;
++
++ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
++
++ char *filename;
++ char *local_filename;
++ char *url;
++ char *tmp_unpack_dir;
++ char *md5sum;
++ char *size;
++ char *installed_size;
++ char *priority;
++ char *source;
++ conffile_list_t conffiles;
++ time_t installed_time;
++ /* As pointer for lazy evaluation */
++ str_list_t *installed_files;
++ /* XXX: CLEANUP: I'd like to perhaps come up with a better
++ mechanism to avoid the problem here, (which is that the
++ installed_files list was being freed from an inner loop while
++ still being used within an outer loop. */
++ int installed_files_ref_cnt;
++ int essential;
++ int arch_priority;
++/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
++ int provided_by_hand;
++};
++
++pkg_t *pkg_new(void);
++int pkg_init(pkg_t *pkg);
++void pkg_deinit(pkg_t *pkg);
++int pkg_init_from_file(pkg_t *pkg, const char *filename);
++abstract_pkg_t *abstract_pkg_new(void);
++int abstract_pkg_init(abstract_pkg_t *ab_pkg);
++
++/*
++ * merges fields from newpkg into oldpkg.
++ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero
++ */
++int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
++
++char *pkg_version_str_alloc(pkg_t *pkg);
++
++int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
++int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
++int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
++
++char * pkg_formatted_info(pkg_t *pkg );
++char * pkg_formatted_field(pkg_t *pkg, const char *field );
++
++void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
++
++void pkg_print_info(pkg_t *pkg, FILE *file);
++void pkg_print_status(pkg_t * pkg, FILE * file);
++void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
++str_list_t *pkg_get_installed_files(pkg_t *pkg);
++int pkg_free_installed_files(pkg_t *pkg);
++int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
++conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
++int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
++ const char *script, const char *args);
++
++/* enum mappings */
++char *pkg_state_want_to_str(pkg_state_want_t sw);
++pkg_state_want_t pkg_state_want_from_str(char *str);
++char *pkg_state_flag_to_str(pkg_state_flag_t sf);
++pkg_state_flag_t pkg_state_flag_from_str(char *str);
++char *pkg_state_status_to_str(pkg_state_status_t ss);
++pkg_state_status_t pkg_state_status_from_str(char *str);
++
++int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
++
++int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_info_preinstall_check(ipkg_conf_t *conf);
++int pkg_free_installed_files(pkg_t *pkg);
++
++int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
++int pkg_write_changed_filelists(ipkg_conf_t *conf);
++
++#endif
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.c busybox-1.22.1/archival/libipkg/pkg_depends.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_depends.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,1032 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10386,9 +10614,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.h 2014-04-07 12:36:32.415575413 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_depends.h busybox-1.22.1/archival/libipkg/pkg_depends.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_depends.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10495,9 +10723,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/arch
+int pkg_dependence_satisfied(depend_t *depend);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.c busybox-1.22.1/archival/libipkg/pkg_dest.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_dest.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10591,9 +10819,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archiva
+
+ dest->root_dir = NULL;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest.h busybox-1.22.1/archival/libipkg/pkg_dest.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_dest.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10633,9 +10861,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archiva
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.22.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_dest_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10722,9 +10950,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/ar
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.22.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_dest_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10776,9 +11004,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/ar
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.c busybox-1.22.1/archival/libipkg/pkg_extract.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_extract.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,255 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11035,9 +11263,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/arch
+
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_extract.h busybox-1.22.1/archival/libipkg/pkg_extract.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_extract.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,32 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -11071,242 +11299,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/arch
+int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h
---- busybox-1.21.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.h 2014-04-07 12:36:32.419575442 +0200
-@@ -0,0 +1,229 @@
-+/* pkg.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 PKG_H
-+#define PKG_H
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+
-+#include "pkg_vec.h"
-+#include "str_list.h"
-+#include "pkg_src.h"
-+#include "pkg_dest.h"
-+#include "ipkg_conf.h"
-+#include "conffile_list.h"
-+
-+struct ipkg_conf;
-+
-+/* I think "Size" is currently the shortest field name */
-+#define PKG_MINIMUM_FIELD_NAME_LEN 4
-+
-+enum pkg_state_want
-+{
-+ SW_UNKNOWN = 1,
-+ SW_INSTALL,
-+ SW_DEINSTALL,
-+ SW_PURGE,
-+ SW_LAST_STATE_WANT
-+};
-+typedef enum pkg_state_want pkg_state_want_t;
-+
-+enum pkg_state_flag
-+{
-+ SF_OK = 0,
-+ SF_REINSTREQ = 1,
-+ SF_HOLD = 2, /* do not upgrade version */
-+ SF_REPLACE = 4, /* replace this package */
-+ SF_NOPRUNE = 8, /* do not remove obsolete files */
-+ SF_PREFER = 16, /* prefer this version */
-+ SF_OBSOLETE = 32, /* old package in upgrade pair */
-+ SF_MARKED = 64, /* temporary mark */
-+ SF_FILELIST_CHANGED = 128, /* needs filelist written */
-+ SF_USER = 256,
-+ SF_LAST_STATE_FLAG
-+};
-+typedef enum pkg_state_flag pkg_state_flag_t;
-+#define SF_NONVOLATILE_FLAGS (SF_HOLD|SF_NOPRUNE|SF_PREFER|SF_OBSOLETE|SF_USER)
-+
-+enum pkg_state_status
-+{
-+ SS_NOT_INSTALLED = 1,
-+ SS_UNPACKED,
-+ SS_HALF_CONFIGURED,
-+ SS_INSTALLED,
-+ SS_HALF_INSTALLED,
-+ SS_CONFIG_FILES,
-+ SS_POST_INST_FAILED,
-+ SS_REMOVAL_FAILED,
-+ SS_LAST_STATE_STATUS
-+};
-+typedef enum pkg_state_status pkg_state_status_t;
-+
-+struct abstract_pkg{
-+ char * name;
-+ int dependencies_checked;
-+ pkg_vec_t * pkgs;
-+ pkg_state_status_t state_status;
-+ pkg_state_flag_t state_flag;
-+ struct abstract_pkg ** depended_upon_by; /* @@@@ this should be abstract_pkg_vec_t -Jamey */
-+ abstract_pkg_vec_t * provided_by;
-+ abstract_pkg_vec_t * replaced_by;
-+};
-+
-+#include "pkg_depends.h"
-+
-+/* XXX: CLEANUP: I'd like to clean up pkg_t in several ways:
-+
-+ The 3 version fields should go into a single version struct. (This
-+ is especially important since, currently, pkg->version can easily
-+ be mistaken for pkg_verson_str_alloc(pkg) although they are very
-+ distinct. This has been the source of multiple bugs.
-+
-+ The 3 state fields could possibly also go into their own struct.
-+
-+ All fields which deal with lists of packages, (Depends,
-+ Pre-Depends, Provides, Suggests, Recommends, Enhances), should each
-+ be handled by a single struct in pkg_t
-+
-+ All string fields for which there is a small set of possible
-+ values, (section, maintainer, architecture, maybe version?), that
-+ are reused among different packages -- for all such packages we
-+ should move from "char *"s to some atom datatype to share data
-+ storage and use less memory. We might even do reference counting,
-+ but probably not since most often we only create new pkg_t structs,
-+ we don't often free them. */
-+struct pkg
-+{
-+ char *name;
-+ unsigned long epoch;
-+ char *version;
-+ char *revision;
-+ char *familiar_revision;
-+ pkg_src_t *src;
-+ pkg_dest_t *dest;
-+ char *architecture;
-+ char *section;
-+ char *maintainer;
-+ char *description;
-+ pkg_state_want_t state_want;
-+ pkg_state_flag_t state_flag;
-+ pkg_state_status_t state_status;
-+ char **depends_str;
-+ int depends_count;
-+ char **pre_depends_str;
-+ int pre_depends_count;
-+ char **recommends_str;
-+ int recommends_count;
-+ char **suggests_str;
-+ int suggests_count;
-+ compound_depend_t * depends;
-+
-+ /* Abhaya: new conflicts */
-+ char **conflicts_str;
-+ compound_depend_t * conflicts;
-+ int conflicts_count;
-+
-+ char **replaces_str;
-+ int replaces_count;
-+ abstract_pkg_t ** replaces;
-+
-+ char **provides_str;
-+ int provides_count;
-+ abstract_pkg_t ** provides;
-+
-+ abstract_pkg_t *parent;
-+
-+ pkg_t *old_pkg; /* during upgrade, points from installee to previously installed */
-+
-+ char *filename;
-+ char *local_filename;
-+ char *url;
-+ char *tmp_unpack_dir;
-+ char *md5sum;
-+ char *size;
-+ char *installed_size;
-+ char *priority;
-+ char *source;
-+ conffile_list_t conffiles;
-+ time_t installed_time;
-+ /* As pointer for lazy evaluation */
-+ str_list_t *installed_files;
-+ /* XXX: CLEANUP: I'd like to perhaps come up with a better
-+ mechanism to avoid the problem here, (which is that the
-+ installed_files list was being freed from an inner loop while
-+ still being used within an outer loop. */
-+ int installed_files_ref_cnt;
-+ int essential;
-+ int arch_priority;
-+/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package, if there are multiple choice */
-+ int provided_by_hand;
-+};
-+
-+pkg_t *pkg_new(void);
-+int pkg_init(pkg_t *pkg);
-+void pkg_deinit(pkg_t *pkg);
-+int pkg_init_from_file(pkg_t *pkg, const char *filename);
-+abstract_pkg_t *abstract_pkg_new(void);
-+int abstract_pkg_init(abstract_pkg_t *ab_pkg);
-+
-+/*
-+ * merges fields from newpkg into oldpkg.
-+ * Forcibly sets oldpkg state_status, state_want and state_flags if set_status is nonzero
-+ */
-+int pkg_merge(pkg_t *oldpkg, pkg_t *newpkg, int set_status);
-+
-+char *pkg_version_str_alloc(pkg_t *pkg);
-+
-+int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
-+int pkg_name_version_and_architecture_compare(pkg_t *a, pkg_t *b);
-+int abstract_pkg_name_compare(abstract_pkg_t *a, abstract_pkg_t *b);
-+
-+char * pkg_formatted_info(pkg_t *pkg );
-+char * pkg_formatted_field(pkg_t *pkg, const char *field );
-+
-+void set_flags_from_control(ipkg_conf_t *conf, pkg_t *pkg);
-+
-+void pkg_print_info(pkg_t *pkg, FILE *file);
-+void pkg_print_status(pkg_t * pkg, FILE * file);
-+void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
-+str_list_t *pkg_get_installed_files(pkg_t *pkg);
-+int pkg_free_installed_files(pkg_t *pkg);
-+int pkg_remove_installed_files_list(ipkg_conf_t *conf, pkg_t *pkg);
-+conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);
-+int pkg_run_script(struct ipkg_conf *conf, pkg_t *pkg,
-+ const char *script, const char *args);
-+
-+/* enum mappings */
-+char *pkg_state_want_to_str(pkg_state_want_t sw);
-+pkg_state_want_t pkg_state_want_from_str(char *str);
-+char *pkg_state_flag_to_str(pkg_state_flag_t sf);
-+pkg_state_flag_t pkg_state_flag_from_str(char *str);
-+char *pkg_state_status_to_str(pkg_state_status_t ss);
-+pkg_state_status_t pkg_state_status_from_str(char *str);
-+
-+int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
-+
-+int pkg_arch_supported(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_info_preinstall_check(ipkg_conf_t *conf);
-+int pkg_free_installed_files(pkg_t *pkg);
-+
-+int pkg_write_filelist(ipkg_conf_t *conf, pkg_t *pkg);
-+int pkg_write_changed_filelists(ipkg_conf_t *conf);
-+
-+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.c busybox-1.22.1/archival/libipkg/pkg_hash.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_hash.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,623 @@
+/* ipkg_hash.c - the itsy package management system
+
@@ -11931,9 +11926,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archiva
+}
+
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_hash.h busybox-1.22.1/archival/libipkg/pkg_hash.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_hash.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,61 @@
+/* pkg_hash.h - the itsy package management system
+
@@ -11996,9 +11991,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archiva
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.c busybox-1.22.1/archival/libipkg/pkg_parse.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_parse.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,368 @@
+/* pkg_parse.c - the itsy package management system
+
@@ -12368,9 +12363,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archiv
+
+ return 0;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_parse.h busybox-1.22.1/archival/libipkg/pkg_parse.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_parse.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,31 @@
+/* pkg_parse.h - the itsy package management system
+
@@ -12403,9 +12398,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archiv
+int pkg_valorize_other_field(pkg_t *pkg, char ***raw);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.c busybox-1.22.1/archival/libipkg/pkg_src.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_src.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,43 @@
+/* pkg_src.c - the itsy package management system
+
@@ -12450,9 +12445,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival
+}
+
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src.h busybox-1.22.1/archival/libipkg/pkg_src.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_src.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,34 @@
+/* pkg_src.h - the itsy package management system
+
@@ -12488,9 +12483,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival
+void pkg_src_deinit(pkg_src_t *src);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.c busybox-1.22.1/archival/libipkg/pkg_src_list.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_src_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,75 @@
+/* pkg_src_list.c - the itsy package management system
+
@@ -12567,9 +12562,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/arc
+{
+ return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_src_list.h busybox-1.22.1/archival/libipkg/pkg_src_list.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_src_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,57 @@
+/* pkg_src_list.h - the itsy package management system
+
@@ -12628,9 +12623,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/arc
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c
---- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.c busybox-1.22.1/archival/libipkg/pkg_vec.c
+--- busybox-1.22.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_vec.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,231 @@
+/* pkg_vec.c - the itsy package management system
+
@@ -12863,9 +12858,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival
+ qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h
---- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/pkg_vec.h busybox-1.22.1/archival/libipkg/pkg_vec.h
+--- busybox-1.22.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/pkg_vec.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,62 @@
+/* pkg_vec.h - the itsy package management system
+
@@ -12929,9 +12924,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival
+void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+#endif
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h
---- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.22.1/archival/libipkg/sprintf_alloc.h
+--- busybox-1.22.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/sprintf_alloc.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,25 @@
+/* sprintf_alloca.c -- like sprintf with memory allocation
+
@@ -12958,9 +12953,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/ar
+#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args)
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c
---- busybox-1.21.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.c busybox-1.22.1/archival/libipkg/str_list.c
+--- busybox-1.22.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/str_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,76 @@
+/* str_list.c - the itsy package management system
+
@@ -13038,9 +13033,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archiva
+ (void *)target_str,
+ (void_list_cmp_t)strcmp);
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h
---- busybox-1.21.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/str_list.h busybox-1.22.1/archival/libipkg/str_list.h
+--- busybox-1.22.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/str_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,51 @@
+/* str_list.h - the itsy package management system
+
@@ -13093,9 +13088,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archiva
+char *str_list_remove_elt(str_list_t *list, const char *target_str);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c
---- busybox-1.21.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.c busybox-1.22.1/archival/libipkg/str_util.c
+--- busybox-1.22.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/str_util.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,69 @@
+/* str_utils.c - the itsy package management system
+
@@ -13166,9 +13161,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archiva
+ return str ? strdup(str) : NULL;
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h
---- busybox-1.21.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/str_util.h busybox-1.22.1/archival/libipkg/str_util.h
+--- busybox-1.22.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/str_util.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,27 @@
+/* str_utils.h - the itsy package management system
+
@@ -13197,9 +13192,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archiva
+char *str_dup_safe(const char *str);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c
---- busybox-1.21.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.c 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/user.c busybox-1.22.1/archival/libipkg/user.c
+--- busybox-1.22.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/user.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,49 @@
+/* user.c - the itsy package management system
+
@@ -13250,9 +13245,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/li
+
+ return response;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h
---- busybox-1.21.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.h 2014-04-07 12:36:32.419575442 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/user.h busybox-1.22.1/archival/libipkg/user.h
+--- busybox-1.22.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/user.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,23 @@
+/* user.c - the itsy package management system
+
@@ -13277,9 +13272,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/li
+
+char *get_user_response(const char *format, ...);
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c
---- busybox-1.21.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.c 2014-04-07 12:36:32.423575470 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.c busybox-1.22.1/archival/libipkg/void_list.c
+--- busybox-1.22.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/void_list.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,194 @@
+/* void_list.c - the itsy package management system
+
@@ -13475,9 +13470,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archiv
+ else
+ return NULL;
+}
-diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h
---- busybox-1.21.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.h 2014-04-07 12:36:32.423575470 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/void_list.h busybox-1.22.1/archival/libipkg/void_list.h
+--- busybox-1.22.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/void_list.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,59 @@
+/* void_list.h - the itsy package management system
+
@@ -13538,9 +13533,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archiv
+void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp);
+
+#endif
-diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c
---- busybox-1.21.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.c 2014-04-07 12:36:32.423575470 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.c busybox-1.22.1/archival/libipkg/xsystem.c
+--- busybox-1.22.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/xsystem.c 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,64 @@
+/* xsystem.c - system(3) with error messages
+
@@ -13606,9 +13601,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival
+ return -1;
+}
+
-diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h
---- busybox-1.21.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.h 2014-04-07 12:36:32.423575470 +0200
+diff -Nur busybox-1.22.1.orig/archival/libipkg/xsystem.h busybox-1.22.1/archival/libipkg/xsystem.h
+--- busybox-1.22.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.22.1/archival/libipkg/xsystem.h 2014-05-23 21:12:06.000000000 +0200
@@ -0,0 +1,34 @@
+/* xsystem.h - system(3) with error messages
+
@@ -13644,10 +13639,10 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival
+
+#endif
+
-diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h
---- busybox-1.21.1.orig/include/applets.src.h 2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/applets.src.h 2014-04-07 12:36:32.423575470 +0200
-@@ -199,6 +199,7 @@
+diff -Nur busybox-1.22.1.orig/include/applets.src.h busybox-1.22.1/include/applets.src.h
+--- busybox-1.22.1.orig/include/applets.src.h 2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/include/applets.src.h 2014-05-23 21:12:06.000000000 +0200
+@@ -194,6 +194,7 @@
IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -13655,9 +13650,9 @@ diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/apple
IF_IPLINK(APPLET(iplink, BB_DIR_SBIN, BB_SUID_DROP))
IF_IPROUTE(APPLET(iproute, BB_DIR_SBIN, BB_SUID_DROP))
IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
-diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h
---- busybox-1.21.1.orig/include/bb_archive.h 2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/bb_archive.h 2014-04-07 12:37:05.279788781 +0200
+diff -Nur busybox-1.22.1.orig/include/bb_archive.h busybox-1.22.1/include/bb_archive.h
+--- busybox-1.22.1.orig/include/bb_archive.h 2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/include/bb_archive.h 2014-05-23 21:12:06.000000000 +0200
@@ -79,7 +79,6 @@
/* Archiver specific. Can make it a union if it ever gets big */
#define PAX_NEXT_FILE 0
@@ -13681,9 +13676,9 @@ diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_arc
/* Temporary storage */
char *dpkg__buffer;
/* How to process any sub archive, e.g. get_header_tar_gz */
-diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h
---- busybox-1.21.1.orig/include/usage.src.h 2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/include/usage.src.h 2014-04-07 12:36:32.423575470 +0200
+diff -Nur busybox-1.22.1.orig/include/usage.src.h busybox-1.22.1/include/usage.src.h
+--- busybox-1.22.1.orig/include/usage.src.h 2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/include/usage.src.h 2014-05-23 21:12:06.000000000 +0200
@@ -19,4 +19,80 @@
#define busybox_notes_usage \
"Hello world!\n"
@@ -13765,14 +13760,3 @@ diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.s
+ "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n"
+
#endif
-diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile
---- busybox-1.21.1.orig/Makefile 2013-06-29 17:00:18.000000000 +0200
-+++ busybox-1.21.1/Makefile 2014-04-07 12:36:32.423575470 +0200
-@@ -466,6 +466,7 @@
- libs-y := \
- archival/ \
- archival/libarchive/ \
-+ archival/libipkg/ \
- console-tools/ \
- coreutils/ \
- coreutils/libcoreutils/ \
diff --git a/package/busybox/patches/003-defaults.patch b/package/busybox/patches/003-defaults.patch
deleted file mode 100644
index 826a0a1a7..000000000
--- a/package/busybox/patches/003-defaults.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src
---- busybox-1.20.2.orig//archival/Config.src 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/archival/Config.src 2012-08-28 11:52:12.000000000 +0200
-@@ -79,7 +79,7 @@
-
- config BUNZIP2
- bool "bunzip2"
-- default y
-+ default n
- help
- bunzip2 is a compression utility using the Burrows-Wheeler block
- sorting text compression algorithm, and Huffman coding. Compression
-@@ -92,7 +92,7 @@
-
- config BZIP2
- bool "bzip2"
-- default y
-+ default n
- help
- bzip2 is a compression utility using the Burrows-Wheeler block
- sorting text compression algorithm, and Huffman coding. Compression
-@@ -105,7 +105,7 @@
-
- config CPIO
- bool "cpio"
-- default y
-+ default n
- help
- cpio is an archival utility program used to create, modify, and
- extract contents from archives.
-@@ -216,19 +216,19 @@
-
- config RPM2CPIO
- bool "rpm2cpio"
-- default y
-+ default n
- help
- Converts a RPM file into a CPIO archive.
-
- config RPM
- bool "rpm"
-- default y
-+ default n
- help
- Mini RPM applet - queries and extracts RPM packages.
-
- config TAR
- bool "tar"
-- default y
-+ default n
- help
- tar is an archiving program. It's commonly used with gzip to
- create compressed archives. It's probably the most widely used
-@@ -335,7 +335,7 @@
-
- config UNLZMA
- bool "unlzma"
-- default y
-+ default n
- help
- unlzma is a compression utility using the Lempel-Ziv-Markov chain
- compression algorithm, and range coding. Compression
-@@ -363,7 +363,7 @@
-
- config UNXZ
- bool "unxz"
-- default y
-+ default n
- help
- unxz is a unlzma successor.
-
-diff -Nur busybox-1.20.2.orig//Config.in busybox-1.20.2/Config.in
---- busybox-1.20.2.orig//Config.in 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/Config.in 2012-08-28 11:52:12.000000000 +0200
-@@ -15,7 +15,7 @@
-
- config DESKTOP
- bool "Enable options for full-blown desktop systems"
-- default y
-+ default n
- help
- Enable options and features which are not essential.
- Select this only if you plan to use busybox on full-blown
-@@ -32,7 +32,7 @@
-
- config INCLUDE_SUSv2
- bool "Enable obsolete features removed before SUSv3"
-- default y
-+ default n
- help
- This option will enable backwards compatibility with SuSv2,
- specifically, old-style numeric options ('command -1 <file>')
-diff -Nur busybox-1.20.2.orig//editors/Config.src busybox-1.20.2/editors/Config.src
---- busybox-1.20.2.orig//editors/Config.src 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/editors/Config.src 2012-08-28 11:52:12.000000000 +0200
-@@ -31,7 +31,7 @@
-
- config DIFF
- bool "diff"
-- default y
-+ default n
- help
- diff compares two files or directories and outputs the
- differences between them in a form that can be given to
-@@ -62,7 +62,7 @@
-
- config SED
- bool "sed"
-- default y
-+ default n
- help
- sed is used to perform text transformations on a file
- or input from a pipeline.
-diff -Nur busybox-1.20.2.orig//editors/patch.c busybox-1.20.2/editors/patch.c
---- busybox-1.20.2.orig//editors/patch.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/editors/patch.c 2012-08-28 11:52:12.000000000 +0200
-@@ -24,7 +24,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.20.2.orig//findutils/find.c busybox-1.20.2/findutils/find.c
---- busybox-1.20.2.orig//findutils/find.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/findutils/find.c 2012-08-28 11:52:12.000000000 +0200
-@@ -55,7 +55,7 @@
-
- //config:config FIND
- //config: bool "find"
--//config: default y
-+//config: default n
- //config: help
- //config: find is used to search your system to find specified files.
- //config:
-diff -Nur busybox-1.20.2.orig//findutils/grep.c busybox-1.20.2/findutils/grep.c
---- busybox-1.20.2.orig//findutils/grep.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/findutils/grep.c 2012-08-28 11:52:12.000000000 +0200
-@@ -26,7 +26,7 @@
-
- //config:config GREP
- //config: bool "grep"
--//config: default y
-+//config: default n
- //config: help
- //config: grep is used to search files for a specified pattern.
- //config:
-diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h
---- busybox-1.20.2.orig//include/applets.src.h 2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/include/applets.src.h 2012-08-28 11:52:12.000000000 +0200
-@@ -242,9 +242,9 @@
- IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
- IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
--IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
-+//IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
- IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
--IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
-+//IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2))
- //IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3))
- IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix))
- IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser))
-diff -Nur busybox-1.20.2.orig//miscutils/Config.src busybox-1.20.2/miscutils/Config.src
---- busybox-1.20.2.orig//miscutils/Config.src 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/miscutils/Config.src 2012-08-28 11:52:12.000000000 +0200
-@@ -362,7 +362,7 @@
-
- config HDPARM
- bool "hdparm"
-- default y
-+ default n
- select PLATFORM_LINUX
- help
- Get/Set hard drive parameters. Primarily intended for ATA
-@@ -600,7 +600,7 @@
-
- config WATCHDOG
- bool "watchdog"
-- default y
-+ default n
- select PLATFORM_LINUX
- help
- The watchdog utility is used with hardware or software watchdog
-diff -Nur busybox-1.20.2.orig//networking/Config.src busybox-1.20.2/networking/Config.src
---- busybox-1.20.2.orig//networking/Config.src 2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/networking/Config.src 2012-08-28 11:52:12.000000000 +0200
-@@ -64,7 +64,7 @@
-
- config BRCTL
- bool "brctl"
-- default y
-+ default n
- select PLATFORM_LINUX
- help
- Manage ethernet bridges.
-@@ -97,7 +97,7 @@
-
- config ETHER_WAKE
- bool "ether-wake"
-- default y
-+ default n
- select PLATFORM_LINUX
- help
- Send a magic packet to wake up sleeping machines.
-@@ -506,7 +506,7 @@
-
- config IP
- bool "ip"
-- default y
-+ default n
- select PLATFORM_LINUX
- help
- The "ip" applet is a TCP/IP interface configuration and routing
-@@ -943,7 +943,7 @@
-
- config WGET
- bool "wget"
-- default y
-+ default n
- help
- wget is a utility for non-interactive download of files from HTTP,
- HTTPS, and FTP servers.
-diff -Nur busybox-1.20.2.orig//util-linux/Config.src busybox-1.20.2/util-linux/Config.src
---- busybox-1.20.2.orig//util-linux/Config.src 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/util-linux/Config.src 2012-08-28 11:52:12.000000000 +0200
-@@ -246,13 +246,6 @@
- check for and attempt to repair any corruption that occurs to a minix
- filesystem.
-
--config MKFS_EXT2
-- bool "mkfs_ext2"
-- default y
-- select PLATFORM_LINUX
-- help
-- Utility to create EXT2 filesystems.
--
- config MKFS_MINIX
- bool "mkfs_minix"
- default y
-@@ -386,7 +379,7 @@
-
- config LSPCI
- bool "lspci"
-- default y
-+ default n
- #select PLATFORM_LINUX
- help
- lspci is a utility for displaying information about PCI buses in the
-@@ -396,7 +389,7 @@
-
- config LSUSB
- bool "lsusb"
-- default y
-+ default n
- #select PLATFORM_LINUX
- help
- lsusb is a utility for displaying information about USB buses in the
diff --git a/package/busybox/patches/003-disable-cflags.patch b/package/busybox/patches/003-disable-cflags.patch
new file mode 100644
index 000000000..83417d119
--- /dev/null
+++ b/package/busybox/patches/003-disable-cflags.patch
@@ -0,0 +1,22 @@
+diff -Nur busybox-1.22.1.orig/Makefile.flags busybox-1.22.1/Makefile.flags
+--- busybox-1.22.1.orig/Makefile.flags 2014-01-09 19:15:44.000000000 +0100
++++ busybox-1.22.1/Makefile.flags 2014-05-23 21:31:04.000000000 +0200
+@@ -61,18 +61,6 @@
+ # be fixed..
+ #CFLAGS += $(call cc-option,-Wconversion,)
+
+-ifneq ($(CONFIG_DEBUG),y)
+-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+-else
+-CFLAGS += $(call cc-option,-g,)
+-#CFLAGS += "-D_FORTIFY_SOURCE=2"
+-ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
+-CFLAGS += $(call cc-option,-O0,)
+-else
+-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+-endif
+-endif
+-
+ # If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
+ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
diff --git a/package/busybox/patches/013-musl.patch b/package/busybox/patches/013-musl.patch
deleted file mode 100644
index af3d05141..000000000
--- a/package/busybox/patches/013-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur busybox-1.20.2.orig/networking/libiproute/iplink.c busybox-1.20.2/networking/libiproute/iplink.c
---- busybox-1.20.2.orig/networking/libiproute/iplink.c 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/networking/libiproute/iplink.c 2013-08-12 13:00:33.000000000 +0200
-@@ -5,7 +5,6 @@
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
- #include <net/if.h>
--#include <net/if_packet.h>
- #include <netpacket/packet.h>
- #include <netinet/if_ether.h>
-
diff --git a/package/busybox/patches/015-path_h_musl.patch b/package/busybox/patches/015-path_h_musl.patch
deleted file mode 100644
index a3e581795..000000000
--- a/package/busybox/patches/015-path_h_musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur busybox-1.20.2.orig/networking/ifplugd.c busybox-1.20.2/networking/ifplugd.c
---- busybox-1.20.2.orig/networking/ifplugd.c 2012-07-02 16:08:25.000000000 +0200
-+++ busybox-1.20.2/networking/ifplugd.c 2013-09-22 11:43:24.000000000 +0200
-@@ -34,6 +34,7 @@
- #include "libbb.h"
-
- #include "fix_u32.h"
-+#include <paths.h>
- #include <linux/if.h>
- #include <linux/mii.h>
- #include <linux/ethtool.h>
diff --git a/package/busybox/patches/016-fix-musl-warning.patch b/package/busybox/patches/016-fix-musl-warning.patch
deleted file mode 100644
index 3f05e8726..000000000
--- a/package/busybox/patches/016-fix-musl-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur busybox-1.21.1.orig/include/libbb.h busybox-1.21.1/include/libbb.h
---- busybox-1.21.1.orig/include/libbb.h 2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/libbb.h 2013-11-02 16:55:04.000000000 +0100
-@@ -37,7 +37,7 @@
- #include <libgen.h> /* dirname,basename */
- #undef basename
- #define basename dont_use_basename
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/socket.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 21:34:42 +0000