summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO4
-rw-r--r--package/Config.in2
-rw-r--r--package/Depends.mk1
-rw-r--r--package/Makefile2
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/extra/etc/banner1
-rw-r--r--package/base-files/extra/etc/functions.sh (renamed from package/base-files/files/etc/functions.sh)0
-rw-r--r--package/base-files/extra/etc/group (renamed from package/base-files/files/etc/group)0
-rw-r--r--package/base-files/extra/etc/hosts (renamed from package/base-files/files/etc/hosts)0
-rw-r--r--package/base-files/extra/etc/init.d/boot (renamed from package/base-files/files/etc/init.d/boot)0
-rw-r--r--package/base-files/extra/etc/init.d/done (renamed from package/base-files/files/etc/init.d/done)0
-rwxr-xr-xpackage/base-files/extra/etc/init.d/rcK (renamed from package/base-files/files/etc/init.d/rcK)0
-rwxr-xr-xpackage/base-files/extra/etc/init.d/rcS (renamed from package/base-files/files/etc/init.d/rcS)0
-rw-r--r--package/base-files/extra/etc/inittab (renamed from package/base-files/files/etc/inittab)0
-rw-r--r--package/base-files/extra/etc/ipkg.conf3
-rw-r--r--package/base-files/extra/etc/mdev.conf (renamed from package/base-files/files/etc/mdev.conf)0
-rw-r--r--package/base-files/extra/etc/modules (renamed from package/base-files/files/etc/modules)0
-rw-r--r--package/base-files/extra/etc/network/interfaces (renamed from package/base-files/files/etc/network/interfaces)0
-rw-r--r--package/base-files/extra/etc/passwd (renamed from package/base-files/files/etc/passwd)0
-rw-r--r--package/base-files/extra/etc/profile (renamed from package/base-files/files/etc/profile)0
-rw-r--r--package/base-files/extra/etc/protocols (renamed from package/base-files/files/etc/protocols)0
-rw-r--r--package/base-files/extra/etc/rc.conf (renamed from package/base-files/files/etc/rc.conf)0
-rw-r--r--package/base-files/extra/etc/shadow (renamed from package/base-files/files/etc/shadow)0
-rw-r--r--package/base-files/extra/etc/sysctl.conf (renamed from package/base-files/files/etc/sysctl.conf)0
-rwxr-xr-xpackage/base-files/extra/init (renamed from package/base-files/files/init)0
-rw-r--r--package/base-files/extra/lib/mdev/init (renamed from package/base-files/files/lib/mdev/init)0
-rwxr-xr-xpackage/base-files/extra/usr/share/udhcpc/default.script (renamed from package/base-files/files/usr/share/udhcpc/default.script)0
-rw-r--r--package/base-files/files/etc/banner3
-rw-r--r--package/base-files/files/etc/ipkg.conf3
-rw-r--r--package/busybox/patches/001-ipkg.patch1266
-rw-r--r--package/cfgfs/src/fwcf.sh11
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/dropbear/files/dropbear.postinst2
-rw-r--r--package/libX11/Makefile5
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in18
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in.orig12
-rw-r--r--package/libXfont/Config.in3
-rw-r--r--package/libXfont/Makefile1
-rw-r--r--package/mplayer/Config.in2
-rw-r--r--package/mplayer/Makefile41
-rw-r--r--package/popt/Makefile3
-rw-r--r--package/rdate/rdate.init14
-rw-r--r--package/xf86-video-geode/Config.in1
-rw-r--r--package/xf86-video-geode/Makefile13
-rw-r--r--package/xkbcomp/Config.in6
-rw-r--r--package/xkbcomp/Makefile28
-rw-r--r--package/xkeyboard-config/Config.in6
-rw-r--r--package/xkeyboard-config/Makefile28
-rw-r--r--package/xorg-server/Config.in3
-rw-r--r--package/xorg-server/Makefile22
-rwxr-xr-xscripts/install.sh51
-rw-r--r--target/Config.in1
-rw-r--r--target/alix1c/files/etc/mdev.conf1
-rw-r--r--target/alix1c/kernel.config78
54 files changed, 900 insertions, 739 deletions
diff --git a/TODO b/TODO
index 4c16d17fc..d404ef186 100644
--- a/TODO
+++ b/TODO
@@ -2,14 +2,10 @@
- squid package update
- check mips -mno-abicalls
- check ac_cv_func_setpgrp_void=no
-- remove glib1
-- rename glib2, gdbm, lib?
-- update mt-daapd / rename
- remove $Id$ lines
- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e.
- eglibc support
- rescue initramfs image (more archs, generic kernel config )
- - replace ibm x40
- usb boot via stick
- kernel 2.6.30
- bind isc 9.6.1
diff --git a/package/Config.in b/package/Config.in
index 84b8e4e68..7122921dc 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -473,6 +473,8 @@ source "package/libXpm/Config.in"
source "package/libXt/Config.in"
source "package/pixman/Config.in"
source "package/xf86dga/Config.in"
+source "package/xkbcomp/Config.in"
+source "package/xkeyboard-config/Config.in"
endmenu
endmenu
diff --git a/package/Depends.mk b/package/Depends.mk
index 81a31af4d..bb5191b78 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -229,6 +229,7 @@ endif
wx200d-compile: postgresql-compile
xfsprogs-compile: e2fsprogs-compile
libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile
+xf86-video-geode-compile: xorg-server-compile
xf86dga-compile: libXxf86dga-compile
xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \
damageproto-compile scrnsaverproto-compile resourceproto-compile \
diff --git a/package/Makefile b/package/Makefile
index 2b107a79a..8a26c7113 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -397,6 +397,8 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
package-$(ADK_PACKAGE_XINETD) += xinetd
package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
+package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp
+package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config
package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
package-$(ADK_PACKAGE_XF86DGA) += xf86dga
package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 52b82b79e..1fdcc39a5 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
do-install:
- $(CP) ./files/* $(IDIR_BASE_FILES)
+ $(CP) ./extra/* $(IDIR_BASE_FILES)
$(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES)
$(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
diff --git a/package/base-files/extra/etc/banner b/package/base-files/extra/etc/banner
new file mode 100644
index 000000000..49dbb9685
--- /dev/null
+++ b/package/base-files/extra/etc/banner
@@ -0,0 +1 @@
+ Linux created with OpenADK
diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/extra/etc/functions.sh
index 4d225b882..4d225b882 100644
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/extra/etc/functions.sh
diff --git a/package/base-files/files/etc/group b/package/base-files/extra/etc/group
index 1f444a8bf..1f444a8bf 100644
--- a/package/base-files/files/etc/group
+++ b/package/base-files/extra/etc/group
diff --git a/package/base-files/files/etc/hosts b/package/base-files/extra/etc/hosts
index 87d837fc7..87d837fc7 100644
--- a/package/base-files/files/etc/hosts
+++ b/package/base-files/extra/etc/hosts
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/extra/etc/init.d/boot
index f71e46240..f71e46240 100644
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/extra/etc/init.d/boot
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/extra/etc/init.d/done
index e5b655bb6..e5b655bb6 100644
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/extra/etc/init.d/done
diff --git a/package/base-files/files/etc/init.d/rcK b/package/base-files/extra/etc/init.d/rcK
index e94d1a296..e94d1a296 100755
--- a/package/base-files/files/etc/init.d/rcK
+++ b/package/base-files/extra/etc/init.d/rcK
diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/extra/etc/init.d/rcS
index fd56feebf..fd56feebf 100755
--- a/package/base-files/files/etc/init.d/rcS
+++ b/package/base-files/extra/etc/init.d/rcS
diff --git a/package/base-files/files/etc/inittab b/package/base-files/extra/etc/inittab
index 960ea77d8..960ea77d8 100644
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/extra/etc/inittab
diff --git a/package/base-files/extra/etc/ipkg.conf b/package/base-files/extra/etc/ipkg.conf
new file mode 100644
index 000000000..6c9242620
--- /dev/null
+++ b/package/base-files/extra/etc/ipkg.conf
@@ -0,0 +1,3 @@
+src openadk http://www.openadk.org/packages/@TARGET@
+dest root /
+dest ram /tmp
diff --git a/package/base-files/files/etc/mdev.conf b/package/base-files/extra/etc/mdev.conf
index 61b818523..61b818523 100644
--- a/package/base-files/files/etc/mdev.conf
+++ b/package/base-files/extra/etc/mdev.conf
diff --git a/package/base-files/files/etc/modules b/package/base-files/extra/etc/modules
index 014f40f2b..014f40f2b 100644
--- a/package/base-files/files/etc/modules
+++ b/package/base-files/extra/etc/modules
diff --git a/package/base-files/files/etc/network/interfaces b/package/base-files/extra/etc/network/interfaces
index f1bd92ed2..f1bd92ed2 100644
--- a/package/base-files/files/etc/network/interfaces
+++ b/package/base-files/extra/etc/network/interfaces
diff --git a/package/base-files/files/etc/passwd b/package/base-files/extra/etc/passwd
index 87eee84af..87eee84af 100644
--- a/package/base-files/files/etc/passwd
+++ b/package/base-files/extra/etc/passwd
diff --git a/package/base-files/files/etc/profile b/package/base-files/extra/etc/profile
index 55002b01f..55002b01f 100644
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/extra/etc/profile
diff --git a/package/base-files/files/etc/protocols b/package/base-files/extra/etc/protocols
index dfe58ed22..dfe58ed22 100644
--- a/package/base-files/files/etc/protocols
+++ b/package/base-files/extra/etc/protocols
diff --git a/package/base-files/files/etc/rc.conf b/package/base-files/extra/etc/rc.conf
index 024007589..024007589 100644
--- a/package/base-files/files/etc/rc.conf
+++ b/package/base-files/extra/etc/rc.conf
diff --git a/package/base-files/files/etc/shadow b/package/base-files/extra/etc/shadow
index 3683d71ea..3683d71ea 100644
--- a/package/base-files/files/etc/shadow
+++ b/package/base-files/extra/etc/shadow
diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/extra/etc/sysctl.conf
index e69de29bb..e69de29bb 100644
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/extra/etc/sysctl.conf
diff --git a/package/base-files/files/init b/package/base-files/extra/init
index 567993cbb..567993cbb 100755
--- a/package/base-files/files/init
+++ b/package/base-files/extra/init
diff --git a/package/base-files/files/lib/mdev/init b/package/base-files/extra/lib/mdev/init
index d2ae13e9c..d2ae13e9c 100644
--- a/package/base-files/files/lib/mdev/init
+++ b/package/base-files/extra/lib/mdev/init
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/extra/usr/share/udhcpc/default.script
index 02e4a7a3c..02e4a7a3c 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/extra/usr/share/udhcpc/default.script
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
deleted file mode 100644
index bdee76e22..000000000
--- a/package/base-files/files/etc/banner
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Linux created with OpenADK
- --- build from revision $R ---
diff --git a/package/base-files/files/etc/ipkg.conf b/package/base-files/files/etc/ipkg.conf
deleted file mode 100644
index 6f3a8be2d..000000000
--- a/package/base-files/files/etc/ipkg.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-src openadk http://waldemar-brodkorb.de/openadk/downloads/@TARGET@/packages
-dest root /
-dest ram /tmp
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 1d10696c6..ca7059acc 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,7 +1,18 @@
-diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config.in
---- busybox-1.12.1.orig/archival/Config.in 2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/Config.in 2008-10-23 11:41:37.000000000 +0200
-@@ -157,6 +157,14 @@
+diff -Nur busybox-1.13.4.orig/Makefile busybox-1.13.4/Makefile
+--- busybox-1.13.4.orig/Makefile 2009-04-15 02:11:01.000000000 +0200
++++ busybox-1.13.4/Makefile 2009-05-31 15:40:37.158023800 +0200
+@@ -444,6 +444,7 @@
+
+ libs-y := \
+ archival/ \
++ archival/libipkg/ \
+ archival/libunarchive/ \
+ console-tools/ \
+ coreutils/ \
+diff -Nur busybox-1.13.4.orig/archival/Config.in busybox-1.13.4/archival/Config.in
+--- busybox-1.13.4.orig/archival/Config.in 2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/Config.in 2009-05-31 15:40:36.993689729 +0200
+@@ -158,6 +158,14 @@
gzip is used to compress files.
It's probably the most widely used UNIX compression program.
@@ -16,10 +27,21 @@ diff -Nur busybox-1.12.1.orig/archival/Config.in busybox-1.12.1/archival/Config.
config RPM2CPIO
bool "rpm2cpio"
default n
-diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c
---- busybox-1.12.1.orig/archival/dpkg.c 2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/dpkg.c 2008-10-23 11:53:33.000000000 +0200
-@@ -1481,16 +1481,7 @@
+diff -Nur busybox-1.13.4.orig/archival/Kbuild busybox-1.13.4/archival/Kbuild
+--- busybox-1.13.4.orig/archival/Kbuild 2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/Kbuild 2009-05-31 15:40:36.997989438 +0200
+@@ -16,6 +16,7 @@
+ lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
+ lib-$(CONFIG_GUNZIP) += bbunzip.o
+ lib-$(CONFIG_GZIP) += gzip.o bbunzip.o
++lib-$(CONFIG_IPKG) += ipkg.o
+ lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
+ lib-$(CONFIG_RPM) += rpm.o
+ lib-$(CONFIG_TAR) += tar.o
+diff -Nur busybox-1.13.4.orig/archival/dpkg.c busybox-1.13.4/archival/dpkg.c
+--- busybox-1.13.4.orig/archival/dpkg.c 2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.4/archival/dpkg.c 2009-05-31 15:40:36.993689729 +0200
+@@ -1485,16 +1485,7 @@
return ar_handle->sub_archive->buffer;
}
@@ -37,9 +59,9 @@ diff -Nur busybox-1.12.1.orig/archival/dpkg.c busybox-1.12.1/archival/dpkg.c
static void unpack_package(deb_file_t *deb_file)
{
-diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c
---- busybox-1.12.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/ipkg.c 2008-10-23 12:14:28.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/ipkg.c busybox-1.13.4/archival/ipkg.c
+--- busybox-1.13.4.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/ipkg.c 2009-05-31 15:40:36.993689729 +0200
@@ -0,0 +1,28 @@
+/* ipkg.c - the itsy package management system
+
@@ -69,20 +91,73 @@ diff -Nur busybox-1.12.1.orig/archival/ipkg.c busybox-1.12.1/archival/ipkg.c
+{
+ return ipkg_op(argc, argv);
+}
-diff -Nur busybox-1.12.1.orig/archival/Kbuild busybox-1.12.1/archival/Kbuild
---- busybox-1.12.1.orig/archival/Kbuild 2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1/archival/Kbuild 2008-10-23 11:41:37.000000000 +0200
-@@ -16,6 +16,7 @@
- lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
- lib-$(CONFIG_GUNZIP) += bbunzip.o
- lib-$(CONFIG_GZIP) += gzip.o bbunzip.o
-+lib-$(CONFIG_IPKG) += ipkg.o
- lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
- lib-$(CONFIG_RPM) += rpm.o
- lib-$(CONFIG_TAR) += tar.o
-diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/libipkg/args.c
---- busybox-1.12.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/args.c 2008-10-23 15:00:11.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/Kbuild busybox-1.13.4/archival/libipkg/Kbuild
+--- busybox-1.13.4.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/Kbuild 2009-05-31 15:40:37.069994700 +0200
+@@ -0,0 +1,60 @@
++# Makefile for busybox
++#
++# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
++# Copyright (C) 2006 OpenWrt.org
++#
++# Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
++
++LIBIPKG_CORE_OBJS:= \
++ args.o \
++ libipkg.o \
++ user.o \
++
++LIBIPKG_CMD_OBJS:= \
++ ipkg_cmd.o \
++ ipkg_configure.o \
++ ipkg_download.o \
++ ipkg_install.o \
++ ipkg_remove.o \
++ ipkg_upgrade.o \
++
++LIBIPKG_DB_OBJS:= \
++ hash_table.o \
++ ipkg_conf.o \
++ ipkg_utils.o \
++ pkg.o \
++ pkg_depends.o \
++ pkg_extract.o \
++ pkg_hash.o \
++ pkg_parse.o \
++ pkg_vec.o \
++
++LIBIPKG_LIST_OBJS:= \
++ conffile.o \
++ conffile_list.o \
++ nv_pair.o \
++ nv_pair_list.o \
++ pkg_dest.o \
++ pkg_dest_list.o \
++ pkg_src.o \
++ pkg_src_list.o \
++ str_list.o \
++ void_list.o \
++
++LIBIPKG_UTIL_OBJS:= \
++ file_util.o \
++ ipkg_message.o \
++ str_util.o \
++ xsystem.o \
++
++lib-y :=
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CORE_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_CMD_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_DB_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_LIST_OBJS)
++lib-$(CONFIG_IPKG) += $(LIBIPKG_UTIL_OBJS)
++
++ifeq ($(strip $(IPKG_ARCH)),)
++IPKG_ARCH:=$(TARGET_ARCH)
++endif
++CFLAGS += -DIPKG_LIB -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
+diff -Nur busybox-1.13.4.orig/archival/libipkg/args.c busybox-1.13.4/archival/libipkg/args.c
+--- busybox-1.13.4.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/args.c 2009-05-31 15:40:36.997989438 +0200
@@ -0,0 +1,242 @@
+/* args.c - parse command-line args
+
@@ -326,9 +401,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.c busybox-1.12.1/archival/li
+{
+ bb_error_msg("version %s\n", IPKG_VERSION);
+}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/libipkg/args.h
---- busybox-1.12.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/args.h 2008-10-23 14:59:44.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/args.h busybox-1.13.4/archival/libipkg/args.h
+--- busybox-1.13.4.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/args.h 2009-05-31 15:40:36.997989438 +0200
@@ -0,0 +1,72 @@
+/* args.h - parse command-line args
+
@@ -402,9 +477,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/args.h busybox-1.12.1/archival/li
+void args_usage(const char *complaint);
+
+#endif
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archival/libipkg/conffile.c
---- busybox-1.12.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile.c 2008-10-23 12:48:24.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.c busybox-1.13.4/archival/libipkg/conffile.c
+--- busybox-1.13.4.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile.c 2009-05-31 15:40:36.997989438 +0200
@@ -0,0 +1,65 @@
+/* conffile.c - the itsy package management system
+
@@ -471,9 +546,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.c busybox-1.12.1/archiva
+
+ return ret;
+}
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archival/libipkg/conffile.h
---- busybox-1.12.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile.h 2008-10-23 12:40:12.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile.h busybox-1.13.4/archival/libipkg/conffile.h
+--- busybox-1.13.4.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile.h 2009-05-31 15:40:36.997989438 +0200
@@ -0,0 +1,30 @@
+/* conffile.h - the itsy package management system
+
@@ -505,9 +580,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile.h busybox-1.12.1/archiva
+
+#endif
+
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/archival/libipkg/conffile_list.c
---- busybox-1.12.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile_list.c 2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.c busybox-1.13.4/archival/libipkg/conffile_list.c
+--- busybox-1.13.4.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile_list.c 2009-05-31 15:40:37.001989668 +0200
@@ -0,0 +1,47 @@
+/* conffile_list.c - the itsy package management system
+
@@ -556,9 +631,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.c busybox-1.12.1/ar
+ return nv_pair_list_pop(list);
+}
+
-diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/archival/libipkg/conffile_list.h
---- busybox-1.12.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/conffile_list.h 2008-10-23 11:41:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/conffile_list.h busybox-1.13.4/archival/libipkg/conffile_list.h
+--- busybox-1.13.4.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/conffile_list.h 2009-05-31 15:40:37.005990736 +0200
@@ -0,0 +1,36 @@
+/* conffile_list.h - the itsy package management system
+
@@ -596,9 +671,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/conffile_list.h busybox-1.12.1/ar
+
+#endif
+
-diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archival/libipkg/file_util.c
---- busybox-1.12.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/file_util.c 2008-10-23 12:34:37.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.c busybox-1.13.4/archival/libipkg/file_util.c
+--- busybox-1.13.4.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.13.4/archival/libipkg/file_util.c 2009-05-31 15:40:37.005990736 +0200
@@ -0,0 +1,132 @@
+/* file_util.c - convenience routines for common stat operations
+
@@ -732,9 +807,9 @@ diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.c busybox-1.12.1/archiv
+ return hash_file(file_name, HASH_MD5);
+}
+
-diff -Nur busybox-1.12.1.orig/archival/libipkg/file_util.h busybox-1.12.1/archival/libipkg/file_util.h
---- busybox-1.12.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.12.1/archival/libipkg/file_util.h 2008-10-23 12:30:58.000000000 +0200
+diff -Nur busybox-1.13.4.orig/archival/libipkg/file_util.h busybox-1.13.4/archival/libipkg/file_util.h
+--- busybox-1.13.4.orig/archival/libipkg/file_util.h 1970-0