From e4531a8290a9a38c6e615f0d0392b86cd53d2a25 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Jul 2010 19:35:59 +0200 Subject: 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. --- package/base-files/src/etc/banner | 1 + package/base-files/src/etc/init.d/rcK | 3 - package/busybox/Makefile | 5 +- package/busybox/patches/001-ipkg.patch | 523 +++++++++++++++--------------- package/cfgfs/Makefile | 5 +- package/cfgfs/src/fwcf.sh | 16 +- package/lsof/patches/patch-Configure.orig | 30 -- 7 files changed, 285 insertions(+), 298 deletions(-) delete mode 100644 package/lsof/patches/patch-Configure.orig (limited to 'package') diff --git a/package/base-files/src/etc/banner b/package/base-files/src/etc/banner index 49dbb9685..cc967559a 100644 --- a/package/base-files/src/etc/banner +++ b/package/base-files/src/etc/banner @@ -1 +1,2 @@ Linux created with OpenADK + diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK index e94d1a296..20c47f5db 100755 --- a/package/base-files/src/etc/init.d/rcK +++ b/package/base-files/src/etc/init.d/rcK @@ -1,8 +1,6 @@ #!/bin/sh export PATH=/bin:/sbin:/usr/bin:/usr/sbin -busybox reboot -d 60 -f & # just in case… { - [[ -f /proc/diag/led/power ]] && echo f >/proc/diag/led/power test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ @@ -17,5 +15,4 @@ busybox reboot -d 60 -f & # just in case… esac ${shebang:-/bin/sh} ${line%%:*} autostop 2>&1 done - [[ -f /proc/diag/led/power ]] && echo 0 >/proc/diag/led/power } | logger -s -p 6 -t '' 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 + +#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 ++++ busybox-1.17.1/archival/libipkg/pkg_extract.h 2010-07-28 13:07:49.555597807 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11009,9 +11022,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.h busybox-1.17.0/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.h busybox-1.17.0/archival/libipkg/pkg.h ---- busybox-1.17.0.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg.h 2010-07-16 14:45:16.318017216 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg.h busybox-1.17.1/archival/libipkg/pkg.h +--- busybox-1.17.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg.h 2010-07-28 13:07:49.555597807 +0200 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11242,9 +11255,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.h busybox-1.17.0/archival/lib +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.c busybox-1.17.0/archival/libipkg/pkg_hash.c ---- busybox-1.17.0.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_hash.c 2010-07-16 14:45:16.368018250 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.c busybox-1.17.1/archival/libipkg/pkg_hash.c +--- busybox-1.17.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_hash.c 2010-07-28 13:07:49.555597807 +0200 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11869,9 +11882,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.c busybox-1.17.0/archiva +} + + -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.h busybox-1.17.0/archival/libipkg/pkg_hash.h ---- busybox-1.17.0.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_hash.h 2010-07-16 14:45:16.418019147 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_hash.h busybox-1.17.1/archival/libipkg/pkg_hash.h +--- busybox-1.17.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_hash.h 2010-07-28 13:07:49.563598547 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11934,9 +11947,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.h busybox-1.17.0/archiva + +#endif + -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.c busybox-1.17.0/archival/libipkg/pkg_parse.c ---- busybox-1.17.0.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_parse.c 2010-07-16 14:45:16.475967111 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.c busybox-1.17.1/archival/libipkg/pkg_parse.c +--- busybox-1.17.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_parse.c 2010-07-28 13:07:49.603597497 +0200 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12306,9 +12319,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.c busybox-1.17.0/archiv + + return 0; +} -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.h busybox-1.17.0/archival/libipkg/pkg_parse.h ---- busybox-1.17.0.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_parse.h 2010-07-16 14:45:16.517118157 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_parse.h busybox-1.17.1/archival/libipkg/pkg_parse.h +--- busybox-1.17.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_parse.h 2010-07-28 13:07:49.607598006 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12341,9 +12354,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.h busybox-1.17.0/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.c busybox-1.17.0/archival/libipkg/pkg_src.c ---- busybox-1.17.0.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_src.c 2010-07-16 14:45:16.558020529 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.c busybox-1.17.1/archival/libipkg/pkg_src.c +--- busybox-1.17.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_src.c 2010-07-28 13:07:49.607598006 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12388,9 +12401,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.c busybox-1.17.0/archival +} + + -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.h busybox-1.17.0/archival/libipkg/pkg_src.h ---- busybox-1.17.0.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_src.h 2010-07-16 14:45:16.608020995 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src.h busybox-1.17.1/archival/libipkg/pkg_src.h +--- busybox-1.17.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_src.h 2010-07-28 13:07:49.611599074 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12426,9 +12439,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.h busybox-1.17.0/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c busybox-1.17.0/archival/libipkg/pkg_src_list.c ---- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_src_list.c 2010-07-16 14:45:16.656033705 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.c busybox-1.17.1/archival/libipkg/pkg_src_list.c +--- busybox-1.17.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_src_list.c 2010-07-28 13:07:49.611599074 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12505,9 +12518,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c busybox-1.17.0/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h busybox-1.17.0/archival/libipkg/pkg_src_list.h ---- busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_src_list.h 2010-07-16 14:45:16.705865996 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_src_list.h busybox-1.17.1/archival/libipkg/pkg_src_list.h +--- busybox-1.17.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_src_list.h 2010-07-28 13:07:49.660190465 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12566,9 +12579,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h busybox-1.17.0/arc + +#endif + -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.c busybox-1.17.0/archival/libipkg/pkg_vec.c ---- busybox-1.17.0.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_vec.c 2010-07-16 14:45:16.745865955 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.c busybox-1.17.1/archival/libipkg/pkg_vec.c +--- busybox-1.17.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_vec.c 2010-07-28 13:07:49.660190465 +0200 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12801,9 +12814,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.c busybox-1.17.0/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.h busybox-1.17.0/archival/libipkg/pkg_vec.h ---- busybox-1.17.0.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/pkg_vec.h 2010-07-16 14:45:16.796544368 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/pkg_vec.h busybox-1.17.1/archival/libipkg/pkg_vec.h +--- busybox-1.17.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/pkg_vec.h 2010-07-28 13:07:49.663598721 +0200 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12867,9 +12880,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.h busybox-1.17.0/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.0/archival/libipkg/sprintf_alloc.h ---- busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/sprintf_alloc.h 2010-07-16 14:45:16.846154965 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.1/archival/libipkg/sprintf_alloc.h +--- busybox-1.17.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/sprintf_alloc.h 2010-07-28 13:07:49.663598721 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12896,9 +12909,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.0/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.c busybox-1.17.0/archival/libipkg/str_list.c ---- busybox-1.17.0.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/str_list.c 2010-07-16 14:45:16.905860157 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.c busybox-1.17.1/archival/libipkg/str_list.c +--- busybox-1.17.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/str_list.c 2010-07-28 13:07:49.667598672 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -12976,9 +12989,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.c busybox-1.17.0/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.h busybox-1.17.0/archival/libipkg/str_list.h ---- busybox-1.17.0.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/str_list.h 2010-07-16 14:45:16.945860092 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/str_list.h busybox-1.17.1/archival/libipkg/str_list.h +--- busybox-1.17.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/str_list.h 2010-07-28 13:07:49.667598672 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13031,9 +13044,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.h busybox-1.17.0/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.c busybox-1.17.0/archival/libipkg/str_util.c ---- busybox-1.17.0.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/str_util.c 2010-07-16 14:45:16.996024988 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.c busybox-1.17.1/archival/libipkg/str_util.c +--- busybox-1.17.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/str_util.c 2010-07-28 13:07:49.671598344 +0200 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13104,9 +13117,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.c busybox-1.17.0/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.h busybox-1.17.0/archival/libipkg/str_util.h ---- busybox-1.17.0.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/str_util.h 2010-07-16 14:45:17.046338652 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/str_util.h busybox-1.17.1/archival/libipkg/str_util.h +--- busybox-1.17.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/str_util.h 2010-07-28 13:07:49.671598344 +0200 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13135,9 +13148,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.h busybox-1.17.0/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/user.c busybox-1.17.0/archival/libipkg/user.c ---- busybox-1.17.0.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/user.c 2010-07-16 14:45:17.106069026 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/user.c busybox-1.17.1/archival/libipkg/user.c +--- busybox-1.17.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/user.c 2010-07-28 13:07:49.671598344 +0200 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13188,9 +13201,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/user.c busybox-1.17.0/archival/li + + return response; +} -diff -Nur busybox-1.17.0.orig/archival/libipkg/user.h busybox-1.17.0/archival/libipkg/user.h ---- busybox-1.17.0.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/user.h 2010-07-16 14:45:17.146036094 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/user.h busybox-1.17.1/archival/libipkg/user.h +--- busybox-1.17.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/user.h 2010-07-28 13:07:49.675598296 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13215,9 +13228,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/user.h busybox-1.17.0/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.c busybox-1.17.0/archival/libipkg/void_list.c ---- busybox-1.17.0.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/void_list.c 2010-07-16 14:45:17.206049751 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.c busybox-1.17.1/archival/libipkg/void_list.c +--- busybox-1.17.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/void_list.c 2010-07-28 13:07:49.675598296 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13413,9 +13426,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.c busybox-1.17.0/archiv + else + return NULL; +} -diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.h busybox-1.17.0/archival/libipkg/void_list.h ---- busybox-1.17.0.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/void_list.h 2010-07-16 14:45:17.247118189 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/void_list.h busybox-1.17.1/archival/libipkg/void_list.h +--- busybox-1.17.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/void_list.h 2010-07-28 13:07:49.675598296 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13476,9 +13489,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.h busybox-1.17.0/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.c busybox-1.17.0/archival/libipkg/xsystem.c ---- busybox-1.17.0.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/xsystem.c 2010-07-16 14:45:17.296015041 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.c busybox-1.17.1/archival/libipkg/xsystem.c +--- busybox-1.17.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/xsystem.c 2010-07-28 13:07:49.675598296 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13544,9 +13557,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.c busybox-1.17.0/archival + return -1; +} + -diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.h busybox-1.17.0/archival/libipkg/xsystem.h ---- busybox-1.17.0.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.0/archival/libipkg/xsystem.h 2010-07-16 14:45:17.335862137 +0200 +diff -Nur busybox-1.17.1.orig/archival/libipkg/xsystem.h busybox-1.17.1/archival/libipkg/xsystem.h +--- busybox-1.17.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.17.1/archival/libipkg/xsystem.h 2010-07-28 13:07:49.675598296 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13582,9 +13595,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.h busybox-1.17.0/archival + +#endif + -diff -Nur busybox-1.17.0.orig/archival/libunarchive/Kbuild.src busybox-1.17.0/archival/libunarchive/Kbuild.src ---- busybox-1.17.0.orig/archival/libunarchive/Kbuild.src 2010-07-06 02:15:46.000000000 +0200 -+++ busybox-1.17.0/archival/libunarchive/Kbuild.src 2010-07-16 14:45:17.385857294 +0200 +diff -Nur busybox-1.17.1.orig/archival/libunarchive/Kbuild.src busybox-1.17.1/archival/libunarchive/Kbuild.src +--- busybox-1.17.1.orig/archival/libunarchive/Kbuild.src 2010-07-06 04:25:53.000000000 +0200 ++++ busybox-1.17.1/archival/libunarchive/Kbuild.src 2010-07-28 13:07:49.675598296 +0200 @@ -43,6 +43,7 @@ lib-$(CONFIG_DPKG) += $(DPKG_FILES) lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) @@ -13593,9 +13606,9 @@ diff -Nur busybox-1.17.0.orig/archival/libunarchive/Kbuild.src busybox-1.17.0/ar lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o lib-$(CONFIG_TAR) += get_header_tar.o -diff -Nur busybox-1.17.0.orig/include/applets.src.h busybox-1.17.0/include/applets.src.h ---- busybox-1.17.0.orig/include/applets.src.h 2010-06-24 04:40:43.000000000 +0200 -+++ busybox-1.17.0/include/applets.src.h 2010-07-16 14:45:17.435860440 +0200 +diff -Nur busybox-1.17.1.orig/include/applets.src.h busybox-1.17.1/include/applets.src.h +--- busybox-1.17.1.orig/include/applets.src.h 2010-07-25 00:12:43.000000000 +0200 ++++ busybox-1.17.1/include/applets.src.h 2010-07-28 13:07:49.679607187 +0200 @@ -209,6 +209,7 @@ IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) @@ -13604,9 +13617,9 @@ diff -Nur busybox-1.17.0.orig/include/applets.src.h busybox-1.17.0/include/apple IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP)) -diff -Nur busybox-1.17.0.orig/include/unarchive.h busybox-1.17.0/include/unarchive.h ---- busybox-1.17.0.orig/include/unarchive.h 2010-07-03 13:18:17.000000000 +0200 -+++ busybox-1.17.0/include/unarchive.h 2010-07-16 14:45:17.486389646 +0200 +diff -Nur busybox-1.17.1.orig/include/unarchive.h busybox-1.17.1/include/unarchive.h +--- busybox-1.17.1.orig/include/unarchive.h 2010-07-06 04:25:54.000000000 +0200 ++++ busybox-1.17.1/include/unarchive.h 2010-07-28 13:07:49.679607187 +0200 @@ -76,7 +76,7 @@ off_t offset; @@ -13625,9 +13638,9 @@ diff -Nur busybox-1.17.0.orig/include/unarchive.h busybox-1.17.0/include/unarchi /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.17.0.orig/include/usage.src.h busybox-1.17.0/include/usage.src.h ---- busybox-1.17.0.orig/include/usage.src.h 2010-07-03 13:18:17.000000000 +0200 -+++ busybox-1.17.0/include/usage.src.h 2010-07-16 14:45:17.555889367 +0200 +diff -Nur busybox-1.17.1.orig/include/usage.src.h busybox-1.17.1/include/usage.src.h +--- busybox-1.17.1.orig/include/usage.src.h 2010-07-25 00:12:43.000000000 +0200 ++++ busybox-1.17.1/include/usage.src.h 2010-07-28 13:07:49.683599037 +0200 @@ -1556,6 +1556,82 @@ "$ ls -la /tmp/busybox*\n" \ "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" @@ -13711,9 +13724,9 @@ diff -Nur busybox-1.17.0.orig/include/usage.src.h busybox-1.17.0/include/usage.s #define halt_trivial_usage \ "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") #define halt_full_usage "\n\n" \ -diff -Nur busybox-1.17.0.orig/Makefile busybox-1.17.0/Makefile ---- busybox-1.17.0.orig/Makefile 2010-07-06 04:16:45.000000000 +0200 -+++ busybox-1.17.0/Makefile 2010-07-16 14:45:17.608032062 +0200 +diff -Nur busybox-1.17.1.orig/Makefile busybox-1.17.1/Makefile +--- busybox-1.17.1.orig/Makefile 2010-07-25 00:13:44.000000000 +0200 ++++ busybox-1.17.1/Makefile 2010-07-28 13:07:49.683599037 +0200 @@ -459,6 +459,7 @@ libs-y := \ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 96e297cfb..a67ad4329 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.7 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base @@ -30,5 +30,8 @@ do-install: ${INSTALL_BIN} ${WRKBUILD}/fwcf.sh ${IDIR_CFGFS}/sbin/cfgfs ${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out \ ${IDIR_CFGFS}/sbin/cfgfs.helper + cd ${IDIR_CFGFS}/sbin; for tgt in halt reboot poweroff; do \ + ln cfgfs $$tgt; \ + done include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index ea07ff247..6c1cce7ec 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -69,11 +69,11 @@ case $0 in esac if [[ $me != cfgfs ]]; then - integer dflag=0 dval= - integer fflag=0 - integer nocfgfs=0 - integer nflag=0 + dflag=0 + fflag=0 + nocfgfs=0 + nflag=0 while getopts ":d:Ffn" ch; do case $ch in (d) dflag=1; dval=$OPTARG ;; @@ -85,7 +85,7 @@ if [[ $me != cfgfs ]]; then done shift $((OPTIND - 1)) - (( nocfgfs == 0 && fflag == 0 )) && if ! cfgfs status -q; then + [[ $nocfgfs -eq 0 ]] && [[ $fflag -eq 0 ]] && if ! cfgfs status -q; then echo "error: will not $me: unsaved changes in /etc found!" echo "Either run 'cfgfs commit' before trying to $me" echo "or retry with '$me -F${*+ }$*' to force a ${me}." @@ -93,9 +93,9 @@ if [[ $me != cfgfs ]]; then exit 2 fi - (( fflag )) && me="$me -f" - (( nflag )) && me="$me -n" - (( dflag )) && me="$me -d '$dval'" + [[ $fflag -eq 1 ]] && me="$me -f" + [[ $nflag -eq 1 ]] && me="$me -n" + [[ $dflag -eq 1 ]] && me="$me -d '$dval'" eval exec busybox $me fi diff --git a/package/lsof/patches/patch-Configure.orig b/package/lsof/patches/patch-Configure.orig deleted file mode 100644 index 934d2f7fe..000000000 --- a/package/lsof/patches/patch-Configure.orig +++ /dev/null @@ -1,30 +0,0 @@ ---- lsof_4.83_src.orig/Configure 2010-01-18 20:01:14.000000000 +0100 -+++ lsof_4.83_src/Configure 2010-07-28 15:37:18.304500970 +0200 -@@ -2735,27 +2735,6 @@ return(0); } - then - LSOF_CFGF="$LSOF_CFGF -DHASIPv6" - fi # } -- -- # Test for SELinux support. -- -- LSOF_TMP1=0 -- if test "X$LINUX_HASSELINUX" = "X" # { -- then -- if test -r ${LSOF_INCLUDE}/selinux/selinux.h # { -- then -- LSOF_TMP1=1 -- fi # } -- else -- if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # { -- then -- LSOF_TMP1=1 -- fi # } -- fi # } -- if test $LSOF_TMP1 -eq 1 # { -- then -- LSOF_CFGF="$LSOF_CFGF -DHASSELINUX" -- LSOF_CFGL="$LSOF_CFGL -lselinux" -- fi # } - LSOF_DIALECT_DIR="linux" - LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" - ;; -- cgit v1.2.3