summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-28 19:35:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-28 19:35:59 +0200
commite4531a8290a9a38c6e615f0d0392b86cd53d2a25 (patch)
tree30eb2be4b030d25676378c63a65474572dcb562f /package/busybox
parent68b275d9ba7931f1ed67aac3a751d0b4a7922d98 (diff)
check for uncommitted changes in /etc
When using reboot, halt or poweroff check for uncommittet changes in /etc on a cfgfs enabled system. When installing packages via ipkg, check afterwards if any uncommittet changes left.
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile5
-rw-r--r--package/busybox/patches/001-ipkg.patch523
2 files changed, 272 insertions, 256 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 62e2789ba..cdd0d8538 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.17.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c7fe7533b7fc4018b0b49a05ee0ee601
PKG_DESCR:= Core utilities for embedded systems
PKG_SECTION:= base
@@ -73,6 +73,9 @@ ifeq ($(ADK_DEBUG),y)
${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
$(IDIR_BUSYBOX)/bin/busybox
endif
+ifneq ($(strip ${ADK_PACKAGE_CFGFS}),)
+ cd ${IDIR_BUSYBOX}/sbin && rm -f halt poweroff reboot
+endif
udhcpd-install:
${INSTALL_DIR} ${IDIR_UDHCPD}/etc/
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 555f92188..81f831d54 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,6 +1,6 @@
-diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config.src
---- busybox-1.17.0.orig/archival/Config.src 2010-06-25 01:32:35.000000000 +0200
-+++ busybox-1.17.0/archival/Config.src 2010-07-16 14:45:13.629607777 +0200
+diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config.src
+--- busybox-1.17.1.orig/archival/Config.src 2010-07-25 00:12:56.000000000 +0200
++++ busybox-1.17.1/archival/Config.src 2010-07-28 13:07:49.435987872 +0200
@@ -202,6 +202,12 @@
are actually slower than gzip at equivalent compression ratios
and take up 3.2K of code.
@@ -14,9 +14,9 @@ diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config
config RPM2CPIO
bool "rpm2cpio"
default y
-diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
---- busybox-1.17.0.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/ipkg.c 2010-07-16 14:45:13.649608170 +0200
+diff -Nur busybox-1.17.1.orig/archival/ipkg.c busybox-1.17.1/archival/ipkg.c
+--- busybox-1.17.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/ipkg.c 2010-07-28 13:07:49.439598667 +0200
@@ -0,0 +1,28 @@
+/* ipkg.c - the itsy package management system
+
@@ -46,9 +46,9 @@ diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild.src
---- busybox-1.17.0.orig/archival/Kbuild.src 2010-06-24 04:40:43.000000000 +0200
-+++ busybox-1.17.0/archival/Kbuild.src 2010-07-16 14:45:13.706406936 +0200
+diff -Nur busybox-1.17.1.orig/archival/Kbuild.src busybox-1.17.1/archival/Kbuild.src
+--- busybox-1.17.1.orig/archival/Kbuild.src 2010-07-06 04:25:53.000000000 +0200
++++ busybox-1.17.1/archival/Kbuild.src 2010-07-28 13:07:49.439598667 +0200
@@ -23,6 +23,7 @@
lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o
lib-$(CONFIG_GZIP) += gzip.o bbunzip.o
@@ -57,9 +57,9 @@ diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild
lib-$(CONFIG_UNXZ) += bbunzip.o
lib-$(CONFIG_UNLZMA) += bbunzip.o
-diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/libipkg/args.c
---- busybox-1.17.0.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/args.c 2010-07-16 14:45:13.756293745 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/args.c busybox-1.17.1/archival/libipkg/args.c
+--- busybox-1.17.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/args.c 2010-07-28 13:07:49.443599457 +0200
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -303,9 +303,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/libipkg/args.h
---- busybox-1.17.0.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/args.h 2010-07-16 14:45:13.816520862 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/args.h busybox-1.17.1/archival/libipkg/args.h
+--- busybox-1.17.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/args.h 2010-07-28 13:07:49.443599457 +0200
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -379,9 +379,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archival/libipkg/conffile.c
---- busybox-1.17.0.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile.c 2010-07-16 14:45:13.886566803 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.c busybox-1.17.1/archival/libipkg/conffile.c
+--- busybox-1.17.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/conffile.c 2010-07-28 13:07:49.443599457 +0200
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -448,9 +448,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archival/libipkg/conffile.h
---- busybox-1.17.0.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile.h 2010-07-16 14:45:13.956241799 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile.h busybox-1.17.1/archival/libipkg/conffile.h
+--- busybox-1.17.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/conffile.h 2010-07-28 13:07:49.451597683 +0200
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -482,9 +482,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archiva
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/archival/libipkg/conffile_list.c
---- busybox-1.17.0.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile_list.c 2010-07-16 14:45:14.005935364 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.c busybox-1.17.1/archival/libipkg/conffile_list.c
+--- busybox-1.17.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/conffile_list.c 2010-07-28 13:07:49.451597683 +0200
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -533,9 +533,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/archival/libipkg/conffile_list.h
---- busybox-1.17.0.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/conffile_list.h 2010-07-16 14:45:14.066487403 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/conffile_list.h busybox-1.17.1/archival/libipkg/conffile_list.h
+--- busybox-1.17.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/conffile_list.h 2010-07-28 13:07:49.451597683 +0200
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -573,9 +573,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/ar
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archival/libipkg/file_util.c
---- busybox-1.17.0.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/file_util.c 2010-07-16 14:45:14.116380621 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.c busybox-1.17.1/archival/libipkg/file_util.c
+--- busybox-1.17.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/file_util.c 2010-07-28 13:07:49.455597914 +0200
@@ -0,0 +1,186 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -763,9 +763,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archival/libipkg/file_util.h
---- busybox-1.17.0.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/file_util.h 2010-07-16 14:45:14.166369529 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/file_util.h busybox-1.17.1/archival/libipkg/file_util.h
+--- busybox-1.17.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/file_util.h 2010-07-28 13:07:49.455597914 +0200
@@ -0,0 +1,29 @@
+/* file_util.h - convenience routines for common file operations
+
@@ -796,9 +796,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archiv
+uint8_t *file_md5sum_alloc(const char *file_name);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archival/libipkg/hash_table.c
---- busybox-1.17.0.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/hash_table.c 2010-07-16 14:45:14.226462120 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.c busybox-1.17.1/archival/libipkg/hash_table.c
+--- busybox-1.17.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/hash_table.c 2010-07-28 13:07:49.455597914 +0200
@@ -0,0 +1,155 @@
+/* hash.c - hash tables for ipkg
+
@@ -955,9 +955,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.c busybox-1.17.0/archi
+ }
+}
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archival/libipkg/hash_table.h
---- busybox-1.17.0.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/hash_table.h 2010-07-16 14:45:14.296312488 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/hash_table.h busybox-1.17.1/archival/libipkg/hash_table.h
+--- busybox-1.17.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/hash_table.h 2010-07-28 13:07:49.455597914 +0200
@@ -0,0 +1,44 @@
+/* hash.h - hash tables for ipkg
+
@@ -1003,9 +1003,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archi
+void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data);
+
+#endif /* _HASH_TABLE_H_ */
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archival/libipkg/ipkg_cmd.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c 2010-07-16 14:45:14.346253334 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.1/archival/libipkg/ipkg_cmd.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_cmd.c 2010-07-28 13:07:49.487607300 +0200
@@ -0,0 +1,1366 @@
+/* ipkg_cmd.c - the itsy package management system
+
@@ -2373,9 +2373,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.0/archiva
+}
+
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archival/libipkg/ipkg_cmd.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h 2010-07-16 14:45:14.406043529 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.1/archival/libipkg/ipkg_cmd.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_cmd.h 2010-07-28 13:07:49.491598591 +0200
@@ -0,0 +1,41 @@
+/* ipkg_cmd.h - the itsy package management system
+
@@ -2418,9 +2418,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archiva
+int pkg_mark_provides(pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archival/libipkg/ipkg_conf.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_conf.c 2010-07-16 14:45:14.466584493 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c busybox-1.17.1/archival/libipkg/ipkg_conf.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_conf.c 2010-07-28 13:07:49.495599101 +0200
@@ -0,0 +1,711 @@
+/* ipkg_conf.c - the itsy package management system
+
@@ -3133,9 +3133,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archiv
+ sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename);
+ return root_filename;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archival/libipkg/ipkg_conf.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_conf.h 2010-07-16 14:45:14.547998162 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h busybox-1.17.1/archival/libipkg/ipkg_conf.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_conf.h 2010-07-28 13:07:49.503598444 +0200
@@ -0,0 +1,107 @@
+/* ipkg_conf.h - the itsy package management system
+
@@ -3244,9 +3244,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archiv
+char *root_filename_alloc(ipkg_conf_t *conf, char *filename);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/archival/libipkg/ipkg_configure.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_configure.c 2010-07-16 14:45:14.597998235 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c busybox-1.17.1/archival/libipkg/ipkg_configure.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_configure.c 2010-07-28 13:07:49.503598444 +0200
@@ -0,0 +1,40 @@
+/* ipkg_configure.c - the itsy package management system
+
@@ -3288,9 +3288,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/a
+ return 0;
+}
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/archival/libipkg/ipkg_configure.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_configure.h 2010-07-16 14:45:14.647999187 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h busybox-1.17.1/archival/libipkg/ipkg_configure.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_configure.h 2010-07-28 13:07:49.503598444 +0200
@@ -0,0 +1,25 @@
+/* ipkg_configure.h - the itsy package management system
+
@@ -3317,9 +3317,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/a
+int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/archival/libipkg/ipkg_download.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_download.c 2010-07-16 14:45:14.697999480 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.c busybox-1.17.1/archival/libipkg/ipkg_download.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_download.c 2010-07-28 13:07:49.503598444 +0200
@@ -0,0 +1,195 @@
+/* ipkg_download.c - the itsy package management system
+
@@ -3516,9 +3516,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/ar
+ }
+ return 0;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/archival/libipkg/ipkg_download.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_download.h 2010-07-16 14:45:14.769609415 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_download.h busybox-1.17.1/archival/libipkg/ipkg_download.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_download.h 2010-07-28 13:07:49.503598444 +0200
@@ -0,0 +1,30 @@
+/* ipkg_download.h - the itsy package management system
+
@@ -3550,9 +3550,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/ar
+int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/libipkg/ipkg.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg.h 2010-07-16 14:45:14.818000815 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg.h busybox-1.17.1/archival/libipkg/ipkg.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg.h 2010-07-28 13:07:49.507597557 +0200
@@ -0,0 +1,68 @@
+/* ipkg.h - the itsy package management system
+
@@ -3622,9 +3622,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/li
+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/archival/libipkg/ipkg_includes.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_includes.h 2010-07-16 14:46:37.026220036 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h busybox-1.17.1/archival/libipkg/ipkg_includes.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_includes.h 2010-07-28 13:07:49.507597557 +0200
@@ -0,0 +1,82 @@
+#ifndef IPKG_INCLUDES_H
+#define IPKG_INCLUDES_H
@@ -3708,9 +3708,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/ar
+#include <mntent.h>
+
+#endif /* IPKG_INCLUDES_H */
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/archival/libipkg/ipkg_install.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_install.c 2010-07-16 14:45:14.918001768 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.c busybox-1.17.1/archival/libipkg/ipkg_install.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_install.c 2010-07-28 13:07:49.511600581 +0200
@@ -0,0 +1,1982 @@
+/* ipkg_install.c - the itsy package management system
+
@@ -5694,9 +5694,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.c busybox-1.17.0/arc
+}
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/archival/libipkg/ipkg_install.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_install.h 2010-07-16 14:45:14.957118010 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_install.h busybox-1.17.1/archival/libipkg/ipkg_install.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_install.h 2010-07-28 13:07:49.511600581 +0200
@@ -0,0 +1,35 @@
+/* ipkg_install.h - the itsy package management system
+
@@ -5733,9 +5733,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/arc
+int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/archival/libipkg/ipkg_message.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_message.c 2010-07-16 14:45:15.005966372 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.c busybox-1.17.1/archival/libipkg/ipkg_message.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_message.c 2010-07-28 13:07:49.515599694 +0200
@@ -0,0 +1,35 @@
+/* ipkg_message.c - the itsy package management system
+
@@ -5772,9 +5772,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/arc
+ ipkg_cb_message(conf,level,ts);
+ }
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/archival/libipkg/ipkg_message.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_message.h 2010-07-16 14:45:15.049608234 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_message.h busybox-1.17.1/archival/libipkg/ipkg_message.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_message.h 2010-07-28 13:07:49.515599694 +0200
@@ -0,0 +1,32 @@
+/* ipkg_message.h - the itsy package management system
+
@@ -5808,9 +5808,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/arc
+extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...);
+
+#endif /* _IPKG_MESSAGE_H_ */
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/archival/libipkg/ipkg_remove.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_remove.c 2010-07-16 14:45:15.105856995 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c busybox-1.17.1/archival/libipkg/ipkg_remove.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_remove.c 2010-07-28 13:07:49.515599694 +0200
@@ -0,0 +1,385 @@
+/* ipkg_remove.c - the itsy package management system
+
@@ -6197,9 +6197,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h busybox-1.17.0/archival/libipkg/ipkg_remove.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_remove.h 2010-07-16 14:45:15.156542175 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h busybox-1.17.1/archival/libipkg/ipkg_remove.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_remove.h 2010-07-28 13:07:49.515599694 +0200
@@ -0,0 +1,33 @@
+/* ipkg_remove.h - the itsy package management system
+
@@ -6234,9 +6234,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.h busybox-1.17.0/arch
+
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.0/archival/libipkg/ipkg_upgrade.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.c 2010-07-16 14:45:15.216616661 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.1/archival/libipkg/ipkg_upgrade.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.c 2010-07-28 13:07:49.515599694 +0200
@@ -0,0 +1,79 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6317,9 +6317,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.0/arc
+ new->state_flag |= SF_USER;
+ return ipkg_install_pkg(conf, new,1);
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.0/archival/libipkg/ipkg_upgrade.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.h 2010-07-16 14:45:15.306333688 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.1/archival/libipkg/ipkg_upgrade.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_upgrade.h 2010-07-28 13:07:49.519597690 +0200
@@ -0,0 +1,18 @@
+/* ipkg_upgrade.c - the itsy package management system
+
@@ -6339,9 +6339,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.0/arc
+#include "ipkg.h"
+
+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c busybox-1.17.0/archival/libipkg/ipkg_utils.c
---- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_utils.c 2010-07-16 14:45:15.355860255 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c busybox-1.17.1/archival/libipkg/ipkg_utils.c
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_utils.c 2010-07-28 13:07:49.519597690 +0200
@@ -0,0 +1,185 @@
+/* ipkg_utils.c - the itsy package management system
+
@@ -6528,9 +6528,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.c busybox-1.17.0/archi
+}
+
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h busybox-1.17.0/archival/libipkg/ipkg_utils.h
---- busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/ipkg_utils.h 2010-07-16 14:45:15.406576638 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h busybox-1.17.1/archival/libipkg/ipkg_utils.h
+--- busybox-1.17.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/ipkg_utils.h 2010-07-28 13:07:49.519597690 +0200
@@ -0,0 +1,29 @@
+/* ipkg_utils.h - the itsy package management system
+
@@ -6561,9 +6561,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h busybox-1.17.0/archi
+int line_is_blank(const char *line);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/Kbuild busybox-1.17.0/archival/libipkg/Kbuild
---- busybox-1.17.0.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/Kbuild 2010-07-16 14:45:15.455870929 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/Kbuild busybox-1.17.1/archival/libipkg/Kbuild
+--- busybox-1.17.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/Kbuild 2010-07-28 13:07:49.519597690 +0200
@@ -0,0 +1,60 @@
+# Makefile for busybox
+#
@@ -6625,10 +6625,10 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/Kbuild busybox-1.17.0/archival/li
+IPKG_ARCH:=$(TARGET_ARCH)
+endif
+CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
-diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival/libipkg/libipkg.c
---- busybox-1.17.0.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/libipkg.c 2010-07-16 14:50:02.146220075 +0200
-@@ -0,0 +1,570 @@
+diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.c busybox-1.17.1/archival/libipkg/libipkg.c
+--- busybox-1.17.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/libipkg.c 2010-07-28 18:54:37.592513964 +0200
+@@ -0,0 +1,583 @@
+/* ipkglib.c - the itsy package management system
+
+ Florina Boor
@@ -7119,32 +7119,6 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
+ args.noreadfeedsfile = 1;
+
+
-+ remountroot = 0;
-+ /* check if /dev/root is mounted read-only */
-+ if ((f = setmntent("/proc/mounts", "r")) == NULL)
-+ fprintf (stderr, "Checking /proc/mounts failed\n");
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (strcmp(mnt->mnt_fsname, "/dev/root") == 0 &&
-+ hasmntopt(mnt, MNTOPT_RO) != NULL) {
-+ remountroot = 1;
-+ }
-+ }
-+
-+ endmntent(f);
-+
-+ if (remountroot) {
-+ if ( !strcmp(cmd_name,"install") ||
-+ !strcmp(cmd_name,"update") ||
-+ !strcmp(cmd_name,"upgrade") ||
-+ !strcmp(cmd_name,"flag") ||
-+ !strcmp(cmd_name,"configure") ||
-+ !strcmp(cmd_name,"remove") ) {
-+ /* mount rootfs read-write */
-+ if (mount("","/",0,MS_REMOUNT,0)<0)
-+ fprintf (stderr, "Mounting rootfs read-write failed\n");
-+ }
-+ }
+
+
+ err = ipkg_conf_init (&ipkg_conf, &args);
@@ -7179,6 +7153,33 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
+ args_usage (NULL);
+ }
+
++ remountroot = 0;
++ /* check if /dev/root is mounted read-only */
++ if ((f = setmntent("/proc/mounts", "r")) == NULL)
++ fprintf (stderr, "Checking /proc/mounts failed\n");
++
++ while ((mnt = getmntent(f)) != NULL) {
++ if (strcmp(mnt->mnt_fsname, "/dev/root") == 0 &&
++ hasmntopt(mnt, MNTOPT_RO) != NULL) {
++ remountroot = 1;
++ }
++ }
++
++ endmntent(f);
++
++ if (remountroot) {
++ if ( !strcmp(cmd_name,"install") ||
++ !strcmp(cmd_name,"update") ||
++ !strcmp(cmd_name,"upgrade") ||
++ !strcmp(cmd_name,"flag") ||
++ !strcmp(cmd_name,"configure") ||
++ !strcmp(cmd_name,"remove") ) {
++ /* mount rootfs read-write */
++ if (mount("","/",0,MS_REMOUNT,0)<0)
++ fprintf (stderr, "Mounting rootfs read-write failed\n");
++ }
++ }
++
+ err = ipkg_cmd_exec (cmd, &ipkg_conf, argc - optind_, (const char **) (argv + optind_), NULL);
+
+ ipkg_conf_deinit (&ipkg_conf);
@@ -7197,11 +7198,23 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
+ }
+ }
+
++ /* check if cfgfs exists */
++ if (access("/sbin/cfgfs", X_OK) == 0) {
++ if ( !strcmp(cmd_name,"install") ||
++ !strcmp(cmd_name,"update") ||
++ !strcmp(cmd_name,"upgrade")) {
++ if (system("cfgfs status -q") != 0) {
++ fprintf (stdout, "Updates in /etc, please review changes\n");
++ fprintf (stdout, "You can check via cfgfs status\n");
++ }
++ }
++ }
++
+ return err;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.h busybox-1.17.0/archival/libipkg/libipkg.h
---- busybox-1.17.0.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/libipkg.h 2010-07-16 14:45:15.555913735 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/libipkg.h busybox-1.17.1/archival/libipkg/libipkg.h
+--- busybox-1.17.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/libipkg.h 2010-07-28 13:07:49.523597362 +0200
@@ -0,0 +1,78 @@
+/* ipkglib.h - the itsy package management system
+
@@ -7281,9 +7294,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.h busybox-1.17.0/archival
+extern void free_error_list(struct errlist **errors);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.c busybox-1.17.0/archival/libipkg/nv_pair.c
---- busybox-1.17.0.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/nv_pair.c 2010-07-16 14:45:15.615872635 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.c busybox-1.17.1/archival/libipkg/nv_pair.c
+--- busybox-1.17.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/nv_pair.c 2010-07-28 13:07:49.523597362 +0200
@@ -0,0 +1,40 @@
+/* nv_pair.c - the itsy package management system
+
@@ -7325,9 +7338,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.c busybox-1.17.0/archival
+}
+
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.h busybox-1.17.0/archival/libipkg/nv_pair.h
---- busybox-1.17.0.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/nv_pair.h 2010-07-16 14:45:15.665893931 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair.h busybox-1.17.1/archival/libipkg/nv_pair.h
+--- busybox-1.17.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/nv_pair.h 2010-07-28 13:07:49.523597362 +0200
@@ -0,0 +1,32 @@
+/* nv_pair.h - the itsy package management system
+
@@ -7361,9 +7374,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.h busybox-1.17.0/archival
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c busybox-1.17.0/archival/libipkg/nv_pair_list.c
---- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/nv_pair_list.c 2010-07-16 14:45:15.715867897 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c busybox-1.17.1/archival/libipkg/nv_pair_list.c
+--- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/nv_pair_list.c 2010-07-28 13:07:49.523597362 +0200
@@ -0,0 +1,98 @@
+/* nv_pair_list.c - the itsy package management system
+
@@ -7463,9 +7476,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c busybox-1.17.0/arc
+ }
+ return NULL;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h busybox-1.17.0/archival/libipkg/nv_pair_list.h
---- busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/nv_pair_list.h 2010-07-16 14:45:15.785860379 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h busybox-1.17.1/archival/libipkg/nv_pair_list.h
+--- busybox-1.17.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/nv_pair_list.h 2010-07-28 13:07:49.523597362 +0200
@@ -0,0 +1,60 @@
+/* nv_pair_list.h - the itsy package management system
+
@@ -7527,9 +7540,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h busybox-1.17.0/arc
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.c busybox-1.17.0/archival/libipkg/pkg.c
---- busybox-1.17.0.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg.c 2010-07-16 14:45:15.845860385 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.c busybox-1.17.1/archival/libipkg/pkg.c
+--- busybox-1.17.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg.c 2010-07-28 13:07:49.543596278 +0200
@@ -0,0 +1,1757 @@
+/* pkg.c - the itsy package management system
+
@@ -9288,9 +9301,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.c busybox-1.17.0/archival/lib
+ }
+ return 0;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.c busybox-1.17.0/archival/libipkg/pkg_depends.c
---- busybox-1.17.0.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_depends.c 2010-07-16 14:45:15.895924044 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.c busybox-1.17.1/archival/libipkg/pkg_depends.c
+--- busybox-1.17.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_depends.c 2010-07-28 13:07:49.547597626 +0200
@@ -0,0 +1,1032 @@
+/* pkg_depends.c - the itsy package management system
+
@@ -10324,9 +10337,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.c busybox-1.17.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.h busybox-1.17.0/archival/libipkg/pkg_depends.h
---- busybox-1.17.0.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_depends.h 2010-07-16 14:45:15.978010218 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_depends.h busybox-1.17.1/archival/libipkg/pkg_depends.h
+--- busybox-1.17.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_depends.h 2010-07-28 13:07:49.547597626 +0200
@@ -0,0 +1,105 @@
+/* pkg_depends.h - the itsy package management system
+
@@ -10433,9 +10446,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.h busybox-1.17.0/arch
+int pkg_dependence_satisfied(depend_t *depend);
+
+#endif
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.c busybox-1.17.0/archival/libipkg/pkg_dest.c
---- busybox-1.17.0.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_dest.c 2010-07-16 14:45:16.028014203 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.c busybox-1.17.1/archival/libipkg/pkg_dest.c
+--- busybox-1.17.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_dest.c 2010-07-28 13:07:49.551597019 +0200
@@ -0,0 +1,92 @@
+/* pkg_dest.c - the itsy package management system
+
@@ -10529,9 +10542,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.c busybox-1.17.0/archiva
+
+ dest->root_dir = NULL;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.h busybox-1.17.0/archival/libipkg/pkg_dest.h
---- busybox-1.17.0.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_dest.h 2010-07-16 14:45:16.076098683 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest.h busybox-1.17.1/archival/libipkg/pkg_dest.h
+--- busybox-1.17.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_dest.h 2010-07-28 13:07:49.551597019 +0200
@@ -0,0 +1,38 @@
+/* pkg_dest.h - the itsy package management system
+
@@ -10571,9 +10584,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.h busybox-1.17.0/archiva
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.0/archival/libipkg/pkg_dest_list.c
---- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_dest_list.c 2010-07-16 14:45:16.115906540 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.1/archival/libipkg/pkg_dest_list.c
+--- busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_dest_list.c 2010-07-28 13:07:49.551597019 +0200
@@ -0,0 +1,85 @@
+/* pkg_dest_list.c - the itsy package management system
+
@@ -10660,9 +10673,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.0/ar
+{
+ return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.0/archival/libipkg/pkg_dest_list.h
---- busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_dest_list.h 2010-07-16 14:45:16.168015911 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.1/archival/libipkg/pkg_dest_list.h
+--- busybox-1.17.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_dest_list.h 2010-07-28 13:07:49.551597019 +0200
@@ -0,0 +1,50 @@
+/* pkg_dest_list.h - the itsy package management system
+
@@ -10714,9 +10727,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.0/ar
+
+#endif
+
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.c busybox-1.17.0/archival/libipkg/pkg_extract.c
---- busybox-1.17.0.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_extract.c 2010-07-16 14:45:16.218016333 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.c busybox-1.17.1/archival/libipkg/pkg_extract.c
+--- busybox-1.17.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.17.1/archival/libipkg/pkg_extract.c 2010-07-28 13:07:49.555597807 +0200
@@ -0,0 +1,255 @@
+/* pkg_extract.c - the itsy package management system
+
@@ -10973,9 +10986,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.c busybox-1.17.0/arch
+
+ return 0;
+}
-diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.h busybox-1.17.0/archival/libipkg/pkg_extract.h
---- busybox-1.17.0.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.17.0/archival/libipkg/pkg_extract.h 2010-07-16 14:45:16.268017317 +0200
+diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_extract.h busybox-1.17.1/archival/libipkg/pkg_extract.h
+--- busybox-1.17.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100
+