a lot of lemote finetuning

 * add PCM to mixer init script
 * let ipkg check if rootfs is already rw mounted
 * fix overlapping utilities
 * enable DPMS in Xorg configuration, remove unused stuff
 * set DPMS timeout to 60 seconds via startx,
   disable screen blanking. Mplayer now runs fine without
   any screen blanking
 * enable some more features in vim (f.e. :split)
 * rename mpc package to libmpc
 * fix uvcvideo loading (v4l2 compat again..)
 * add new xset package

19 files changed, 338 insertions, 131 deletions

diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8013ee5aa..e1668520c 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.22
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		f7180316188552ee1e6759a03f1fe98d
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		multimedia
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index bd4ff3be2..0c381ff14 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf amixer
-add_rcconf amixer_volume amixer_volume "75%"
-add_rcconf amixer_mixer amixer_mixer "Master"
+add_rcconf amixer_volume amixer_volume "80%"
+add_rcconf amixer_mixer amixer_mixer "Master PCM"
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index 7f5f37177..f5c21b8c3 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -10,11 +10,15 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	amixer set $amixer_mixer on
-	amixer set $amixer_mixer $amixer_volume
+	for mixer in $amixer_mixer; do
+		amixer set $mixer on
+		amixer set $mixer $amixer_volume
+	done
 	;;
 stop)
-	amixer set $amixer_mixer off
+	for mixer in $amixer_mixer; do
+		amixer set $mixer off
+	done
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 3478eaab5..2aaf7ee9f 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -119,7 +119,7 @@ config BUSYBOX_LOCALE_SUPPORT
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config BUSYBOX_FEATURE_ASSUME_UNICODE
+config BUSYBOX_UNICODE_SUPPORT
 	bool "Support Unicode"
 	default n
 	help
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index 104fb861e..4bfba12c3 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -63,6 +63,13 @@ config BUSYBOX_FEATURE_AR_LONG_FILENAMES
 	  It supports the GNU ar long filename method which moves multiple long
 	  filenames into a the data section of a new ar entry.
 
+config BUSYBOX_FEATURE_AR_CREATE
+	bool "Support archive creation"
+	default n
+	depends on BUSYBOX_AR
+	help
+	  This enables archive creation (-c and -r) with busybox ar.
+
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
 	depends on !ADK_PACKAGE_BZIP2
@@ -93,8 +100,8 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	default n
 	depends on !ADK_PACKAGE_CPIO
+	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
 	  extract contents from archives.
@@ -193,10 +200,8 @@ config BUSYBOX_LZOP_COMPR_HIGH
 
 config BUSYBOX_IPKG
 	bool "ipkg"
+	default y if ADK_TARGET_PACKAGE_IPKG
 	default n
-	select BUSYBOX_MD5SUM
-	depends on BUSYBOX_WGET || ADK_PACKAGE_WGET
-	depends on ADK_TARGET_PACKAGE_IPKG
 	help
 	  ipkg is the itsy package management system.
 
@@ -251,7 +256,7 @@ config BUSYBOX_FEATURE_TAR_FROM
 
 config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 	bool "Support for old tar header format"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created in
@@ -260,7 +265,7 @@ config BUSYBOX_FEATURE_TAR_OLDGNU_COMPATIBILITY
 
 config BUSYBOX_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
-	default N
+	default n
 	depends on BUSYBOX_TAR
 	help
 	  This option is required to unpack archives created by some old
@@ -311,6 +316,7 @@ config BUSYBOX_UNCOMPRESS
 
 config BUSYBOX_UNLZMA
 	bool "unlzma"
+	depends on !ADK_PACKAGE_XZ
 	default n
 	help
 	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -332,6 +338,29 @@ config BUSYBOX_FEATURE_LZMA_FAST
 	  This option reduces decompression time by about 25% at the cost of
 	  a 1K bigger binary.
 
+config BUSYBOX_LZMA
+	bool "Provide lzma alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNLZMA
+	help
+	  Enable this option if you want commands like "lzma -d" to work.
+	  IOW: you'll get lzma applet, but it will always require -d option.
+
+config BUSYBOX_UNXZ
+	bool "unxz"
+	depends on !ADK_PACKAGE_XZ
+	default n
+	help
+	  unxz is a unlzma successor.
+
+config BUSYBOX_XZ
+	bool "Provide xz alias which supports only unpacking"
+	default n
+	depends on BUSYBOX_UNXZ
+	help
+	  Enable this option if you want commands like "xz -d" to work.
+	  IOW: you'll get xz applet, but it will always require -d option.
+
 config BUSYBOX_UNZIP
 	bool "unzip"
 	default n
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 015c2de5c..85d4342e5 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -823,7 +823,7 @@ config BUSYBOX_WHO
 
 config BUSYBOX_WHOAMI
 	bool "whoami"
-	default n
+	default y
 	help
 	  whoami is used to print the username of the current
 	  user id (same as id -un).
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index d755490c7..9049edd92 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -952,8 +952,8 @@ config BUSYBOX_VCONFIG
 
 config BUSYBOX_WGET
 	bool "wget"
-	default y
 	depends on !ADK_PACKAGE_WGET
+	default y
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
 	  HTTPS, and FTP servers.
@@ -961,21 +961,21 @@ config BUSYBOX_WGET
 config BUSYBOX_FEATURE_WGET_STATUSBAR
 	bool "Enable a nifty process meter (+2k)"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Enable the transfer progress bar for wget transfers.
 
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
-	depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET
+	depends on BUSYBOX_WGET
 	help
 	  Support authenticated HTTP transfers.
 
 config BUSYBOX_FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
-	default n
-	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS && !ADK_PACKAGE_WGET
+	default y
+	depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS
 	help
 	  Support long options for the wget applet.
 
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch
index 80f3564db..507fd5d19 100644
--- a/package/busybox/patches/001-ipkg.patch
+++ b/package/busybox/patches/001-ipkg.patch
@@ -1,15 +1,13 @@
 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-08 12:04:28.571001869 +0200
-@@ -202,6 +202,14 @@
++++ busybox-1.17.0/archival/Config.src	2010-07-16 00:06:51.575859707 +0200
+@@ -202,6 +202,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
  
 +config IPKG
 +	bool "ipkg"
 +	default n
-+	select MD5SUM
-+	select WGET
 +	help
 +	  ipkg is the itsy package management system.
 +
@@ -18,7 +16,7 @@ diff -Nur busybox-1.17.0.orig/archival/Config.src busybox-1.17.0/archival/Config
  	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-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/ipkg.c	2010-07-15 21:53:14.569608030 +0200
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -50,7 +48,7 @@ diff -Nur busybox-1.17.0.orig/archival/ipkg.c busybox-1.17.0/archival/ipkg.c
 +}
 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-08 12:02:53.135001644 +0200
++++ busybox-1.17.0/archival/Kbuild.src	2010-07-15 21:53:14.636101678 +0200
 @@ -23,6 +23,7 @@
  lib-$(CONFIG_LZOP_COMPR_HIGH)	+= lzo1x_9x.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -61,7 +59,7 @@ diff -Nur busybox-1.17.0.orig/archival/Kbuild.src busybox-1.17.0/archival/Kbuild
  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-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/args.c	2010-07-15 21:53:14.717767584 +0200
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -307,7 +305,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.c busybox-1.17.0/archival/li
 +}
 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-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/args.h	2010-07-15 21:53:14.778358426 +0200
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -383,7 +381,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/args.h busybox-1.17.0/archival/li
 +#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-08 12:01:56.199003930 +0200
++++ busybox-1.17.0/archival/libipkg/conffile.c	2010-07-15 21:53:14.827854501 +0200
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -452,7 +450,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.c busybox-1.17.0/archiva
 +}
 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile.h	2010-07-15 21:53:14.868358189 +0200
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -486,7 +484,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile.h busybox-1.17.0/archiva
 +
 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile_list.c	2010-07-15 21:53:14.908357825 +0200
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -537,7 +535,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.c busybox-1.17.0/ar
 +
 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/conffile_list.h	2010-07-15 21:53:14.967045150 +0200
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -577,7 +575,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/conffile_list.h busybox-1.17.0/ar
 +
 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/file_util.c	2010-07-15 21:53:15.086069590 +0200
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -767,7 +765,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.c busybox-1.17.0/archiv
 +
 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/file_util.h	2010-07-15 21:53:15.795859120 +0200
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -800,7 +798,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/file_util.h busybox-1.17.0/archiv
 +#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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/hash_table.c	2010-07-15 21:53:15.845858632 +0200
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -959,7 +957,7 @@ 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-08 12:01:56.203011424 +0200
++++ busybox-1.17.0/archival/libipkg/hash_table.h	2010-07-15 21:53:15.905858755 +0200
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1007,7 +1005,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/hash_table.h busybox-1.17.0/archi
 +#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-08 12:01:56.206999641 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.c	2010-07-15 21:53:15.965858850 +0200
 @@ -0,0 +1,1366 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2377,7 +2375,7 @@ 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-08 12:01:56.206999641 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_cmd.h	2010-07-15 21:53:16.045859465 +0200
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2422,7 +2420,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.0/archiva
 +#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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.c	2010-07-15 21:53:16.105858435 +0200
 @@ -0,0 +1,711 @@
 +/* ipkg_conf.c - the itsy package management system
 +
@@ -3137,7 +3135,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.c busybox-1.17.0/archiv
 +}
 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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_conf.h	2010-07-15 21:53:16.175858692 +0200
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3248,7 +3246,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_conf.h busybox-1.17.0/archiv
 +#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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.c	2010-07-15 21:53:16.225858869 +0200
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3292,7 +3290,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.c busybox-1.17.0/a
 +
 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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_configure.h	2010-07-15 21:53:16.275858348 +0200
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3321,7 +3319,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_configure.h busybox-1.17.0/a
 +#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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_download.c	2010-07-15 21:53:16.345858594 +0200
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3520,7 +3518,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.c busybox-1.17.0/ar
 +}
 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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_download.h	2010-07-15 21:53:16.406244872 +0200
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3554,7 +3552,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_download.h busybox-1.17.0/ar
 +#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-08 12:01:56.211000430 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg.h	2010-07-15 21:53:16.506386988 +0200
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3626,7 +3624,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg.h busybox-1.17.0/archival/li
 +#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-08 12:01:56.214999822 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_includes.h	2010-07-15 21:53:16.575858691 +0200
 @@ -0,0 +1,81 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3711,7 +3709,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_includes.h busybox-1.17.0/ar
 +#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-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_install.c	2010-07-15 21:53:16.645858623 +0200
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5697,7 +5695,7 @@ 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-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_install.h	2010-07-15 21:53:16.705858734 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5736,7 +5734,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_install.h busybox-1.17.0/arc
 +#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-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_message.c	2010-07-15 21:53:16.765858774 +0200
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5775,7 +5773,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.c busybox-1.17.0/arc
 +}
 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-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_message.h	2010-07-15 21:53:16.815858747 +0200
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5811,7 +5809,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_message.h busybox-1.17.0/arc
 +#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-08 12:01:56.219000332 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.c	2010-07-15 21:53:16.865858801 +0200
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6200,7 +6198,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_remove.c busybox-1.17.0/arch
 +}
 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-08 12:01:56.223000282 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_remove.h	2010-07-15 21:53:16.915858471 +0200
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6237,7 +6235,7 @@ 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-08 12:01:56.223000282 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.c	2010-07-15 21:53:16.975859007 +0200
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6320,7 +6318,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.0/arc
 +}
 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-08 12:01:56.223000282 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_upgrade.h	2010-07-15 21:53:17.045908173 +0200
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6342,7 +6340,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.0/arc
 +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-08 12:01:56.227000792 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.c	2010-07-15 21:53:17.106749166 +0200
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6531,7 +6529,7 @@ 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-08 12:01:56.227000792 +0200
++++ busybox-1.17.0/archival/libipkg/ipkg_utils.h	2010-07-15 21:53:17.166689441 +0200
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6564,7 +6562,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/ipkg_utils.h busybox-1.17.0/archi
 +#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-08 12:01:56.227000792 +0200
++++ busybox-1.17.0/archival/libipkg/Kbuild	2010-07-15 21:53:17.247190505 +0200
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6628,8 +6626,8 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/Kbuild busybox-1.17.0/archival/li
 +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-08 12:01:56.231000184 +0200
-@@ -0,0 +1,550 @@
++++ busybox-1.17.0/archival/libipkg/libipkg.c	2010-07-15 23:20:48.266532316 +0200
+@@ -0,0 +1,568 @@
 +/* ipkglib.c - the itsy package management system
 +
 +   Florina Boor
@@ -7082,7 +7080,9 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
 +	ipkg_cmd_t *cmd;
 +	ipkg_conf_t ipkg_conf;
 +	const char *message = "ipkg must have one sub-command argument";
-+
++	FILE *f;
++	struct mntent *mnt;
++	int remountroot;
 +
 +	args_init (&args);
 +
@@ -7118,15 +7118,29 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
 +           args.noreadfeedsfile = 1;
 +
 +
-+        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") ) {
++	/* 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");
++	   }
 +	}
 +	
 +
@@ -7166,23 +7180,25 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.c busybox-1.17.0/archival
 +
 +	ipkg_conf_deinit (&ipkg_conf);
 +
-+        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") ) {
-+		sync();
-+		/* mount rootfs read-only */
-+		if (mount("","/",0,MS_REMOUNT|MS_RDONLY,0)<0)
-+			fprintf (stderr, "Mounting rootfs read-only failed\n");
++	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") ) {
++			sync();
++			/* mount rootfs read-only */
++			if (mount("","/",0,MS_REMOUNT|MS_RDONLY,0)<0)
++				fprintf (stderr, "Mounting rootfs read-only failed\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-08 12:01:56.231000184 +0200
++++ busybox-1.17.0/archival/libipkg/libipkg.h	2010-07-15 21:53:17.408358605 +0200
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7264,7 +7280,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/libipkg.h busybox-1.17.0/archival
 +#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-08 12:01:56.231000184 +0200
++++ busybox-1.17.0/archival/libipkg/nv_pair.c	2010-07-15 21:53:17.465860022 +0200
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7308,7 +7324,7 @@ 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-08 12:01:56.231000184 +0200
++++ busybox-1.17.0/archival/libipkg/nv_pair.h	2010-07-15 21:53:17.526477558 +0200
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7344,7 +7360,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair.h busybox-1.17.0/archival
 +
 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-08 12:01:56.231000184 +0200
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.c	2010-07-15 21:53:17.636164506 +0200
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7446,7 +7462,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.c busybox-1.17.0/arc
 +}
 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-08 12:01:56.235001811 +0200
++++ busybox-1.17.0/archival/libipkg/nv_pair_list.h	2010-07-15 21:53:17.715950659 +0200
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7510,7 +7526,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/nv_pair_list.h busybox-1.17.0/arc
 +
 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-08 12:01:56.239000923 +0200
++++ busybox-1.17.0/archival/libipkg/pkg.c	2010-07-15 21:53:17.787221929 +0200
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9271,7 +9287,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.c busybox-1.17.0/archival/lib
 +}
 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-08 12:01:56.239000923 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_depends.c	2010-07-15 21:53:17.848375755 +0200
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10307,7 +10323,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.c busybox-1.17.0/arch
 +}
 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-08 12:01:56.239000923 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_depends.h	2010-07-15 21:53:17.896612955 +0200
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10416,7 +10432,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_depends.h busybox-1.17.0/arch
 +#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-08 12:01:56.239000923 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_dest.c	2010-07-15 21:53:17.966509602 +0200
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10512,7 +10528,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.c busybox-1.17.0/archiva
 +}
 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-08 12:01:56.239000923 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_dest.h	2010-07-15 21:53:18.056081396 +0200
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10554,7 +10570,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest.h busybox-1.17.0/archiva
 +
 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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.c	2010-07-15 21:53:18.125859108 +0200
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10643,7 +10659,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.0/ar
 +}
 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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_dest_list.h	2010-07-15 21:53:18.185858992 +0200
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10697,7 +10713,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.0/ar
 +
 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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_extract.c	2010-07-15 21:53:18.235859123 +0200
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10956,7 +10972,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.c busybox-1.17.0/arch
 +}
 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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_extract.h	2010-07-15 21:53:18.285858724 +0200
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -10992,7 +11008,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_extract.h busybox-1.17.0/arch
 +#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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg.h	2010-07-15 21:53:18.345858659 +0200
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11225,7 +11241,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg.h busybox-1.17.0/archival/lib
 +#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-08 12:01:56.243001712 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_hash.c	2010-07-15 21:53:18.405858501 +0200
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11852,7 +11868,7 @@ 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-08 12:01:56.327000396 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_hash.h	2010-07-15 21:53:18.465858583 +0200
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11917,7 +11933,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_hash.h busybox-1.17.0/archiva
 +
 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-08 12:01:56.343005785 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_parse.c	2010-07-15 21:53:18.525861517 +0200
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12289,7 +12305,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.c busybox-1.17.0/archiv
 +}
 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-08 12:01:56.343005785 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_parse.h	2010-07-15 21:53:18.585858787 +0200
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12324,7 +12340,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_parse.h busybox-1.17.0/archiv
 +#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-08 12:01:56.343005785 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_src.c	2010-07-15 21:53:18.645858878 +0200
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12371,7 +12387,7 @@ 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-08 12:01:56.343005785 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_src.h	2010-07-15 21:53:18.705858062 +0200
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12409,7 +12425,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src.h busybox-1.17.0/archival
 +#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-08 12:01:56.359001397 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.c	2010-07-15 21:53:18.765858954 +0200
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12488,7 +12504,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.c busybox-1.17.0/arc
 +}
 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-08 12:01:56.359001397 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_src_list.h	2010-07-15 21:53:18.825858971 +0200
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12549,7 +12565,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_src_list.h busybox-1.17.0/arc
 +
 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-08 12:01:56.367001298 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_vec.c	2010-07-15 21:53:18.875858745 +0200
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12784,7 +12800,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.c busybox-1.17.0/archival
 +
 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-08 12:01:56.367001298 +0200
++++ busybox-1.17.0/archival/libipkg/pkg_vec.h	2010-07-15 21:53:18.935858471 +0200
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12850,7 +12866,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/pkg_vec.h busybox-1.17.0/archival
 +
 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-08 12:01:56.375003713 +0200
++++ busybox-1.17.0/archival/libipkg/sprintf_alloc.h	2010-07-15 21:53:18.995858549 +0200
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12879,7 +12895,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.0/ar
 +#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-08 12:01:56.375003713 +0200
++++ busybox-1.17.0/archival/libipkg/str_list.c	2010-07-15 21:53:19.055858313 +0200
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -12959,7 +12975,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.c busybox-1.17.0/archiva
 +}
 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-08 12:01:56.375003713 +0200
++++ busybox-1.17.0/archival/libipkg/str_list.h	2010-07-15 21:53:19.115858933 +0200
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13014,7 +13030,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_list.h busybox-1.17.0/archiva
 +#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-08 12:01:56.375003713 +0200
++++ busybox-1.17.0/archival/libipkg/str_util.c	2010-07-15 21:53:19.165858466 +0200
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13087,7 +13103,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.c busybox-1.17.0/archiva
 +
 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-08 12:01:56.391000442 +0200
++++ busybox-1.17.0/archival/libipkg/str_util.h	2010-07-15 21:53:19.215858689 +0200
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13118,7 +13134,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/str_util.h busybox-1.17.0/archiva
 +#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-08 12:01:56.391000442 +0200
++++ busybox-1.17.0/archival/libipkg/user.c	2010-07-15 21:53:19.275857337 +0200
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13171,7 +13187,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/user.c busybox-1.17.0/archival/li
 +}
 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-08 12:01:56.391000442 +0200
++++ busybox-1.17.0/archival/libipkg/user.h	2010-07-15 21:53:19.355858716 +0200
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13198,7 +13214,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/user.h busybox-1.17.0/archival/li
 +
 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-08 12:01:56.407001361 +0200
++++ busybox-1.17.0/archival/libipkg/void_list.c	2010-07-15 21:53:19.405860568 +0200
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13396,7 +13412,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.c busybox-1.17.0/archiv
 +}
 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-08 12:01:56.407001361 +0200
++++ busybox-1.17.0/archival/libipkg/void_list.h	2010-07-15 21:53:19.505858606 +0200
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13459,7 +13475,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/void_list.h busybox-1.17.0/archiv
 +#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-08 12:01:56.407001361 +0200
++++ busybox-1.17.0/archival/libipkg/xsystem.c	2010-07-15 21:53:19.555858540 +0200
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13527,7 +13543,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.c busybox-1.17.0/archival
 +	 
 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-08 12:01:56.407001361 +0200
++++ busybox-1.17.0/archival/libipkg/xsystem.h	2010-07-15 21:53:19.625858705 +0200
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13565,7 +13581,7 @@ diff -Nur busybox-1.17.0.orig/archival/libipkg/xsystem.h busybox-1.17.0/archival
 +	 
 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-08 12:03:29.499017277 +0200
++++ busybox-1.17.0/archival/libunarchive/Kbuild.src	2010-07-15 21:53:19.675857936 +0200
 @@ -43,6 +43,7 @@
  lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
  lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
@@ -13576,7 +13592,7 @@ diff -Nur busybox-1.17.0.orig/archival/libunarchive/Kbuild.src busybox-1.17.0/ar
  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-08 12:04:57.087012849 +0200
++++ busybox-1.17.0/include/applets.src.h	2010-07-15 21:53:19.765858931 +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))
@@ -13587,7 +13603,7 @@ diff -Nur busybox-1.17.0.orig/include/applets.src.h busybox-1.17.0/include/apple
  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-08 12:01:56.422999486 +0200
++++ busybox-1.17.0/include/unarchive.h	2010-07-15 21:53:19.815859093 +0200
 @@ -76,7 +76,7 @@
  	off_t offset;
  
@@ -13608,7 +13624,7 @@ diff -Nur busybox-1.17.0.orig/include/unarchive.h busybox-1.17.0/include/unarchi
  	/* 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-08 12:07:04.099000968 +0200
++++ busybox-1.17.0/include/usage.src.h	2010-07-15 21:53:19.825859052 +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"
@@ -13694,7 +13710,7 @@ diff -Nur busybox-1.17.0.orig/include/usage.src.h busybox-1.17.0/include/usage.s
  #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-08 12:01:56.455000212 +0200
++++ busybox-1.17.0/Makefile	2010-07-15 21:53:19.896241138 +0200
 @@ -459,6 +459,7 @@
  
  libs-y		:= \
diff --git a/package/busybox/patches/003-defaults-no.patch b/package/busybox/patches/003-defaults-no.patch
new file mode 100644
index 000000000..7385616e1
--- /dev/null
+++ b/package/busybox/patches/003-defaults-no.patch
@@ -0,0 +1,120 @@
+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 02:06:58.336016174 +0200
+@@ -39,7 +39,7 @@
+ 
+ config AR
+ 	bool "ar"
+-	default y
++	default n
+ 	help
+ 	  ar is an archival utility program used to create, modify, and
+ 	  extract contents from archives. An archive is a single file holding
+@@ -79,7 +79,7 @@
+ 
+ config BUNZIP2
+ 	bool "bunzip2"
+-	default y
++	default n
+ 	help
+ 	  bunzip2 is a compression utility using the Burrows-Wheeler block
+ 	  sorting text compression algorithm, and Huffman coding. Compression
+@@ -92,7 +92,7 @@
+ 
+ config BZIP2
+ 	bool "bzip2"
+-	default y
++	default n
+ 	help
+ 	  bzip2 is a compression utility using the Burrows-Wheeler block
+ 	  sorting text compression algorithm, and Huffman coding. Compression
+@@ -105,7 +105,7 @@
+ 
+ config CPIO
+ 	bool "cpio"
+-	default y
++	default n
+ 	help
+ 	  cpio is an archival utility program used to create, modify, and
+ 	  extract contents from archives.
+@@ -204,19 +204,19 @@
+ 
+ config RPM2CPIO
+ 	bool "rpm2cpio"
+-	default y
++	default n
+ 	help
+ 	  Converts an RPM file into a CPIO archive.
+ 
+ config RPM
+ 	bool "rpm"
+-	default y
++	default n
+ 	help
+ 	  Mini RPM applet - queries and extracts RPM packages.
+ 
+ config TAR
+ 	bool "tar"
+-	default y
++	default n
+ 	help
+ 	  tar is an archiving program. It's commonly used with gzip to
+ 	  create compressed archives. It's probably the most widely used
+@@ -323,7 +323,7 @@
+ 
+ config UNLZMA
+ 	bool "unlzma"
+-	default y
++	default n
+ 	help
+ 	  unlzma is a compression utility using the Lempel-Ziv-Markov chain
+ 	  compression algorithm, and range coding. Compression
+@@ -354,7 +354,7 @@
+ 
+ config UNXZ
+ 	bool "unxz"
+-	default y
++	default n
+ 	help
+ 	  unxz is a unlzma successor.
+ 
+diff -Nur busybox-1.17.0.orig/editors/Config.src busybox-1.17.0/editors/Config.src
+--- busybox-1.17.0.orig/editors/Config.src	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0/editors/Config.src	2010-07-16 02:05:47.485881936 +0200
+@@ -31,7 +31,7 @@
+ 
+ config DIFF
+ 	bool "diff"
+-	default y
++	default n
+ 	help
+ 	  diff compares two files or directories and outputs the
+ 	  differences between them in a form that can be given to
+@@ -62,13 +62,13 @@
+ 
+ config PATCH
+ 	bool "patch"
+-	default y
++	default n
+ 	help
+ 	  Apply a unified diff formatted patch.
+ 
+ config SED
+ 	bool "sed"
+-	default y
++	default n
+ 	help
+ 	  sed is used to perform text transformations on a file
+ 	  or input from a pipeline.
+diff -Nur busybox-1.17.0.orig/networking/Config.src busybox-1.17.0/networking/Config.src
+--- busybox-1.17.0.orig/networking/Config.src	2010-06-27 04:21:56.000000000 +0200
++++ busybox-1.17.0/networking/Config.src	2010-07-16 02:05:16.665861002 +0200
+@@ -961,7 +961,7 @@
+ 
+ config WGET
+ 	bool "wget"
+-	default y
++	default n
+ 	help
+ 	  wget is a utility for non-interactive download of files from HTTP,
+ 	  HTTPS, and FTP servers.
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index d64cdbac5..4b737e303 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -89,5 +89,7 @@ eglibc-dev-install:
 	$(MAKE) -C $(WRKBUILD) \
 		install-headers install-bootstrap-headers=yes
 	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
+	# conflicts with libiconv
+	find $(IDIR_EGLIBC_DEV) -name iconv.h -exec rm {} \;
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpc/Makefile b/package/libmpc/Makefile
index ef82baa7c..ef82baa7c 100644
--- a/package/mpc/Makefile
+++ b/package/libmpc/Makefile
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index d1ea2621a..883c04a87 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -33,5 +33,6 @@ INSTALL_STYLE:=		manual
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib
 	${CP} ${STAGING_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib
+	cd $(IDIR_LIBPTHREAD)/lib && ln -sf libpthread.so.0 libpthread.so
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 875f61c07..0c9e3945c 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-31648
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		eeb9219f9015e0e0dfbf4a70efefb751
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -110,6 +110,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-dvdread-internal \
 			--disable-libdvdcss-internal \
 			--disable-freetype \
+			--disable-mpg123 \
 			--disable-tremor-internal \
 			--disable-arts \
 			--disable-esd \
@@ -123,6 +124,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-pnm \
 			--disable-md5sum \
 			--disable-liblzo \
+			--disable-sdl \
 			--disable-xinerama \
 			--disable-vidix \
 			--disable-gl \
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
index aabaf8282..711488515 100644
--- a/package/mplayer/patches/patch-configure
+++ b/package/mplayer/patches/patch-configure
@@ -1,6 +1,6 @@
---- mplayer-1.0-29987.orig/configure	2009-12-10 13:18:20.000000000 +0100
-+++ mplayer-1.0-29987/configure	2010-06-13 22:58:34.756925268 +0200
-@@ -4141,7 +4141,7 @@ dfb_version() {
+--- mplayer-1.0-31648.orig/configure	2010-07-09 11:54:31.000000000 +0200
++++ mplayer-1.0-31648/configure	2010-07-15 19:03:13.247109421 +0200
+@@ -4304,7 +4304,7 @@ dfb_version() {
  
  if test "$_directfb" = yes; then
    cat > $TMPC << EOF
diff --git a/package/tar/Makefile b/package/tar/Makefile
index b6a0813c0..1575c73a4 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -4,14 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tar
-PKG_VERSION:=		1.22
+PKG_VERSION:=		1.23
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		efafad1b256e3de410f4fce5335d9c9d
+PKG_MD5SUM:=		fe81d950b61cb2f45619e1fcef97ce60
 PKG_DESCR:=		GNU tar
 PKG_SECTION:=		archive
-PKG_URL:=		http://mirrors.kernel.org/gnu/tar
-PKG_SITES:=		ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \
-                	http://mirrors.kernel.org/gnu/tar/
+PKG_URL:=		http://mirrors.kernel.org/gnu/tar/
+PKG_SITES:=		http://mirrors.kernel.org/gnu/tar/
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/vim/Makefile b/package/vim/Makefile
index f3ad2cc3d..cc3bb6e4d 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -5,13 +5,13 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME=		vim
 PKG_VERSION=		7.2
-PKG_RELEASE=		1
+PKG_RELEASE=		2
 PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM=		f0901284b338e448bfd79ccca0041254
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
-PKG_URL:=		http://www.vim.org
+PKG_URL:=		http://www.vim.org/
 PKG_SITES=		ftp://ftp.vim.org/pub/vim/unix/
 
 DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -47,8 +47,7 @@ CONFIGURE_ARGS+=	--disable-darwin \
 			--disable-gui \
 			--disable-acl \
 			--disable-gpm \
-			--disable-nls \
-			--with-features=tiny \
+			--with-features=small \
 			--with-compiledby=OpenADK \
 			--without-x \
 			--with-tlib=ncurses \
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index ef20573e5..6a1461826 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinit
 PKG_VERSION:=		1.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7ad82221ebd6600a8d33712ec3b62efb
 PKG_DESCR:=		X Window System initializer
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		xorg-server mcookie xauth
+PKG_DEPENDS:=		xorg-server mcookie xauth xset
 PKG_BUILDDEP+=		xorg-server
 PKG_URL:=		http://xorg.freedesktop.org
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
diff --git a/package/xinit/patches/patch-startx_cpp b/package/xinit/patches/patch-startx_cpp
new file mode 100644
index 000000000..911346c59
--- /dev/null
+++ b/package/xinit/patches/patch-startx_cpp
@@ -0,0 +1,11 @@
+--- xinit-1.2.1.orig/startx.cpp	2010-03-15 23:35:56.000000000 +0100
++++ xinit-1.2.1/startx.cpp	2010-07-15 21:25:44.458413180 +0200
+@@ -347,5 +347,8 @@ screenrestore
+ kbd_mode -a
+ #endif
+ 
++xset dpms 0 0 60
++xset s 0
++
+ exit $retval
+ 
diff --git a/package/xset/Makefile b/package/xset/Makefile
new file mode 100644
index 000000000..d97cba4a7
--- /dev/null
+++ b/package/xset/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xset
+PKG_VERSION:=		1.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		65774f3d4e7f65a7fe07294a86b8e104
+PKG_DESCR:=		X set utility
+PKG_SECTION:=		x11/apps
+PKG_URL:=		http://xorg.freedesktop.org/
+PKG_SITES:=		http://www.x.org/releases/X11R7.5/src/app/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XSET,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_XSET)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xset \
+		$(IDIR_XSET)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk