Merge branch 'master' of git+ssh://openadk.org/git/openadk

28 files changed, 339 insertions, 175 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 77500a403..da70549a0 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		60
+PKG_RELEASE:=		61
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/etc/init.d/mount b/package/base-files/src/etc/init.d/mount
index f0df597e5..6c59d7bab 100644
--- a/package/base-files/src/etc/init.d/mount
+++ b/package/base-files/src/etc/init.d/mount
@@ -1,5 +1,5 @@
 #!/bin/sh
-#INIT 99
+#INIT 60
 [[ $1 = autostart ]] || exit 0
 
 # any lvm volumes to activate?
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 93f5fba55..e2f2ed3cb 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 
-PKG_ARCH_DEPENDS:=	!avr32
+PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
@@ -21,11 +21,6 @@ PKG_SUBPKGS:=		BOOST BOOST_DEV
 PKGSD_BOOST_DEV:=	boost header files
 PKGSC_BOOST_DEV:=	devel
 
-PKG_CHOICES_BOOST:=	SHARED STATIC BOTH
-PKGCD_STATIC:=		install static libs
-PKGCD_SHARED:=		install shared libs
-PKGCD_BOTH:=		install static and shared libs
-
 PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
 
 PKGFD_date_time:=	with date-time
@@ -76,7 +71,7 @@ endif
 ifeq (${ADK_PACKAGE_BOOST_GRAPH},)
 	CONFIGURE_ARGS+=--without-graph
 endif
-ifeq (${ADK_PACKAGE_BOOST_math},)
+ifeq (${ADK_PACKAGE_BOOST_MATH},)
 	CONFIGURE_ARGS+=--without-math
 endif
 ifeq (${ADK_PACKAGE_BOOST_PROGRAM_OPTIONS},)
@@ -146,16 +141,7 @@ endif
 
 boost-install:
 	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
-ifneq (${ADK_PACKAGE_BOOST_SHARED},)
 	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-endif
-ifneq (${ADK_PACKAGE_BOOST_STATIC},)
-	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
-endif
-ifneq (${ADK_PACKAGE_BOOST_BOTH},)
-	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
-	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
-endif
 
 boost-dev-install:
 	${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index ffba6e89b..9abe2774d 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -21,3 +21,173 @@ endmenu
 config ADK_PACKAGE_UDHCPD
 	boolean
 	default BUSYBOX_APP_UDHCPD
+
+# disable busybox applets, when full programs are choosen
+config BUSYBOX_DISABLE_MOUNT
+	boolean
+	default y if ADK_PACKAGE_MOUNT
+	depends on ADK_PACKAGE_MOUNT
+	default n
+
+config BUSYBOX_DISABLE_UMOUNT
+	boolean
+	default y if ADK_PACKAGE_MOUNT
+	depends on ADK_PACKAGE_MOUNT
+	default n
+
+config BUSYBOX_DISABLE_TAR
+	boolean
+	default y if ADK_PACKAGE_TAR
+	depends on ADK_PACKAGE_TAR
+	default n
+
+config BUSYBOX_DISABLE_RPM
+	boolean
+	default y if ADK_PACKAGE_RPM
+	depends on ADK_PACKAGE_RPM
+	default n
+
+config BUSYBOX_DISABLE_BZIP2
+	boolean
+	default y if ADK_PACKAGE_BZIP2
+	depends on ADK_PACKAGE_BZIP2
+	default n
+
+config BUSYBOX_DISABLE_IP
+	boolean
+	default y if ADK_PACKAGE_IP
+	depends on ADK_PACKAGE_IP
+	default n
+
+config BUSYBOX_DISABLE_PATCH
+	boolean
+	default y if ADK_PACKAGE_PATCH
+	depends on ADK_PACKAGE_PATCH
+	default n
+
+config BUSYBOX_DISABLE_DIFF
+	boolean
+	default y if ADK_PACKAGE_DIFFUTILS
+	depends on ADK_PACKAGE_DIFFUTILS
+	default n
+
+config BUSYBOX_DISABLE_ED
+	boolean
+	default y if ADK_PACKAGE_ED
+	depends on ADK_PACKAGE_ED
+	default n
+
+config BUSYBOX_DISABLE_SED
+	boolean
+	default y if ADK_PACKAGE_SED
+	depends on ADK_PACKAGE_SED
+	default n
+
+config BUSYBOX_DISABLE_LESS
+	boolean
+	default y if ADK_PACKAGE_LESS
+	depends on ADK_PACKAGE_LESS
+	default n
+
+config BUSYBOX_DISABLE_HDPARM
+	boolean
+	default y if ADK_PACKAGE_HDPARM
+	depends on ADK_PACKAGE_HDPARM
+	default n
+
+config BUSYBOX_DISABLE_WATCHDOG
+	boolean
+	default y if ADK_PACKAGE_WATCHDOG
+	depends on ADK_PACKAGE_WATCHDOG
+	default n
+
+config BUSYBOX_DISABLE_PAM
+	boolean
+	default y if ADK_PACKAGE_PAM
+	depends on ADK_PACKAGE_PAM
+	default n
+
+config BUSYBOX_DISABLE_BRCTL
+	boolean
+	default y if ADK_PACKAGE_BRIDGE_UTILS
+	depends on ADK_PACKAGE_BRIDGE_UTILS
+	default n
+
+config BUSYBOX_DISABLE_ETHER_WAKE
+	boolean
+	default y if ADK_PACKAGE_ETHER_WAKE
+	depends on ADK_PACKAGE_ETHER_WAKE
+	default n
+
+config BUSYBOX_DISABLE_NTPD
+	boolean
+	default y if ADK_PACKAGE_OPENNTPD
+	depends on ADK_PACKAGE_OPENNTPD
+	default n
+
+config BUSYBOX_DISABLE_WGET
+	boolean
+	default y if ADK_PACKAGE_WGET
+	depends on ADK_PACKAGE_WGET
+	default n
+
+config BUSYBOX_DISABLE_AR
+	boolean
+	default y if ADK_PACKAGE_BINUTILS
+	depends on ADK_PACKAGE_BINUTILS
+	default n
+
+config BUSYBOX_DISABLE_CPIO
+	boolean
+	default y if ADK_PACKAGE_CPIO
+	depends on ADK_PACKAGE_CPIO
+	default n
+
+config BUSYBOX_DISABLE_XZ
+	boolean
+	default y if ADK_PACKAGE_XZ
+	depends on ADK_PACKAGE_XZ
+	default n
+
+config BUSYBOX_DISABLE_UNXZ
+	boolean
+	default y if ADK_PACKAGE_XZ
+	depends on ADK_PACKAGE_XZ
+	default n
+
+config BUSYBOX_DISABLE_UNZIP
+	boolean
+	default y if ADK_PACKAGE_UNZIP
+	depends on ADK_PACKAGE_UNZIP
+	default n
+
+config BUSYBOX_DISABLE_FBSET
+	boolean
+	default y if ADK_PACKAGE_FBSET
+	depends on ADK_PACKAGE_FBSET
+	default n
+
+config BUSYBOX_DISABLE_LSPCI
+	boolean
+	default y if ADK_PACKAGE_PCIUTILS
+	depends on ADK_PACKAGE_PCIUTILS
+	default n
+
+config BUSYBOX_DISABLE_LSUSB
+	boolean
+	default y if ADK_PACKAGE_LSUSB
+	depends on ADK_PACKAGE_LSUSB
+	default n
+
+config BUSYBOX_DISABLE_GREP
+	boolean
+	default y if ADK_PACKAGE_GREP
+	depends on ADK_PACKAGE_GREP
+	default n
+
+config BUSYBOX_DISABLE_FIND
+	boolean
+	default y if ADK_PACKAGE_FINDUTILS
+	depends on ADK_PACKAGE_FINDUTILS
+	default n
+
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4a8e8ea68..bda0c0165 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.20.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e025414bc6cd79579cc7a32a45d3ae1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
@@ -43,17 +43,17 @@ else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif
 
-# XXX: Although this looks like all new symbols are enabled when 'make oldconfig' runs, they're not.
-#      In fact, you can pipe "yes ''" as well as "yes n", each time leading to the default value being
-#      chosen for each unknown symbol.
-#      A real solution for that task (disabling everything that's unknown, as we know better) is to
-#      upgrade ${TOPDIR}/config so it understands the oldnoconfig target, and using that to update
-#      the busybox config before compiling.
-#      The workaround for now is to patch all busybox symbols to default n inside the busybox source
-#      which do depend on non-existance of other packages outside the busybox source.
 do-configure:
+	# get all symbols from top level config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${WRKBUILD}/.config
+	# remove all disabled symbols
+	for i in $$(grep "BUSYBOX_DISABLE" $(TOPDIR)/.config);do \
+		test -s "$$i" || continue; \
+		grep -v $${i#BUSYBOX_DISABLE} ${WRKBUILD}/.config > \
+		${WRKBUILD}/.config.tmp; \
+		cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \
+	done
 	$(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config
 	yes '' | $(MAKE) ${BB_MAKE_FLAGS} oldconfig $(MAKE_TRACE)
 
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in
index eaa576bff..e13da8c0e 100644
--- a/package/busybox/config/archival/Config.in
+++ b/package/busybox/config/archival/Config.in
@@ -39,7 +39,7 @@ config BUSYBOX_FEATURE_SEAMLESS_Z
 
 config BUSYBOX_AR
 	bool "ar"
-	depends on !ADK_PACKAGE_BINUTILS
+	depends on !BUSYBOX_DISABLE_AR
 	default n  # needs to be improved to be able to replace binutils ar
 	help
 	  ar is an archival utility program used to create, modify, and
@@ -80,7 +80,7 @@ config BUSYBOX_FEATURE_AR_CREATE
 
 config BUSYBOX_BUNZIP2
 	bool "bunzip2"
-	depends on !ADK_PACKAGE_BZIP2
+	depends on !BUSYBOX_DISABLE_BZIP2
 	default n
 	help
 	  bunzip2 is a compression utility using the Burrows-Wheeler block
@@ -94,7 +94,7 @@ config BUSYBOX_BUNZIP2
 
 config BUSYBOX_BZIP2
 	bool "bzip2"
-	depends on !ADK_PACKAGE_BZIP2
+	depends on !BUSYBOX_DISABLE_BZIP2
 	default n
 	help
 	  bzip2 is a compression utility using the Burrows-Wheeler block
@@ -108,7 +108,7 @@ config BUSYBOX_BZIP2
 
 config BUSYBOX_CPIO
 	bool "cpio"
-	depends on !ADK_PACKAGE_CPIO
+	depends on !BUSYBOX_DISABLE_CPIO
 	default n
 	help
 	  cpio is an archival utility program used to create, modify, and
@@ -220,28 +220,27 @@ config BUSYBOX_LZOP_COMPR_HIGH
 
 config BUSYBOX_IPKG
 	bool "ipkg"
-	default y if ADK_TARGET_PACKAGE_IPKG
 	default n
 	help
 	  ipkg is the itsy package management system.
 
 config BUSYBOX_RPM2CPIO
 	bool "rpm2cpio"
-	depends on !ADK_PACKAGE_RPM
+	depends on !BUSYBOX_DISABLE_RPM
 	default n
 	help
 	  Converts a RPM file into a CPIO archive.
 
 config BUSYBOX_RPM
 	bool "rpm"
-	depends on !ADK_PACKAGE_RPM
+	depends on !BUSYBOX_DISABLE_RPM
 	default n
 	help
 	  Mini RPM applet - queries and extracts RPM packages.
 
 config BUSYBOX_TAR
 	bool "tar"
-	depends on !ADK_PACKAGE_TAR
+	depends on !BUSYBOX_DISABLE_TAR
 	default y
 	help
 	  tar is an archiving program. It's commonly used with gzip to
@@ -377,14 +376,14 @@ config BUSYBOX_LZMA
 
 config BUSYBOX_UNXZ
 	bool "unxz"
-	depends on !ADK_PACKAGE_XZ
+	depends on !BUSYBOX_DISABLE_UNXZ
 	default n
 	help
 	  unxz is a unlzma successor.
 
 config BUSYBOX_XZ
 	bool "Provide xz alias which supports only unpacking"
-	depends on !ADK_PACKAGE_XZ
+	depends on !BUSYBOX_DISABLE_XZ
 	default n
 	depends on BUSYBOX_UNXZ
 	help
@@ -393,6 +392,7 @@ config BUSYBOX_XZ
 
 config BUSYBOX_UNZIP
 	bool "unzip"
+	depends on !BUSYBOX_DISABLE_UNZIP
 	default n
 	help
 	  unzip will list or extract files from a ZIP archive,
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index f6e29ac34..21aaa090d 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -8,10 +8,11 @@ menu "Editors"
 
 config BUSYBOX_PATCH
 	bool "patch"
-	depends on !ADK_PACKAGE_PATCH
+	depends on !BUSYBOX_DISABLE_PATCH
 	default n
 	help
 	  Apply a unified diff formatted patch.
+
 config BUSYBOX_VI
 	bool "vi"
 	default y
@@ -160,8 +161,8 @@ config BUSYBOX_CMP
 
 config BUSYBOX_DIFF
 	bool "diff"
-	depends on !ADK_PACKAGE_DIFFUTILS
-	default n
+	depends on !BUSYBOX_DISABLE_DIFF
+	default y
 	help
 	  diff compares two files or directories and outputs the
 	  differences between them in a form that can be given to
@@ -184,6 +185,7 @@ config BUSYBOX_FEATURE_DIFF_DIR
 
 config BUSYBOX_ED
 	bool "ed"
+	depends on !BUSYBOX_DISABLE_ED
 	default y
 	help
 	  The original 1970's Unix text editor, from the days of teletypes.
@@ -192,7 +194,7 @@ config BUSYBOX_ED
 
 config BUSYBOX_SED
 	bool "sed"
-	depends on !ADK_PACKAGE_SED
+	depends on !BUSYBOX_DISABLE_SED
 	default y
 	help
 	  sed is used to perform text transformations on a file
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 072f01bfc..25d925288 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -8,7 +8,7 @@ menu "Finding Utilities"
 
 config BUSYBOX_FIND
 	bool "find"
-	depends on !ADK_PACKAGE_FINDUTILS
+	depends on !BUSYBOX_DISABLE_FIND
 	default y
 	help
 	  find is used to search your system to find specified files.
@@ -187,9 +187,10 @@ config BUSYBOX_FEATURE_FIND_LINKS
 	depends on BUSYBOX_FIND
 	help
 	  Support the 'find -links' option for matching number of links.
+
 config BUSYBOX_GREP
 	bool "grep"
-	depends on !ADK_PACKAGE_GREP
+	depends on !BUSYBOX_DISABLE_GREP
 	default y
 	help
 	  grep is used to search files for a specified pattern.
diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 1c36631f9..5538f0139 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -229,7 +229,7 @@ config BUSYBOX_LOGIN_SESSION_AS_CHILD
 
 config BUSYBOX_PAM
 	bool "Support for PAM (Pluggable Authentication Modules)"
-	depends on !ADK_PACKAGE_PAM
+	depends on !BUSYBOX_DISABLE_PAM
 	default n
 	depends on BUSYBOX_LOGIN
 	help
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 2e8404f0f..0a837cb64 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -15,9 +15,10 @@ config BUSYBOX_CONSPY
 	  example:  conspy NUM      shared access to console num
 	  or        conspy -nd NUM  screenshot of console num
 	  or        conspy -cs NUM  poor man's GNU screen like
+
 config BUSYBOX_LESS
 	bool "less"
-	depends on !ADK_PACKAGE_LESS
+	depends on !BUSYBOX_DISABLE_LESS
 	default y
 	help
 	  'less' is a pager, meaning that it displays text files. It possesses
@@ -508,7 +509,7 @@ endchoice
 config BUSYBOX_HDPARM
 	bool "hdparm"
 	default n
-	depends on !ADK_PACKAGE_HDPARM
+	depends on !BUSYBOX_DISABLE_HDPARM
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
@@ -747,7 +748,7 @@ config BUSYBOX_WALL
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
 	default n
-	depends on !ADK_PACKAGE_WATCHDOG
+	depends on !BUSYBOX_DISABLE_WATCHDOG
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  The watchdog utility is used with hardware or software watchdog
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index fcd6c33ea..74069af13 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -157,7 +157,7 @@ config BUSYBOX_ARPING
 
 config BUSYBOX_BRCTL
 	bool "brctl"
-	depends on !ADK_PACKAGE_BRIDGE_UTILS
+	depends on !BUSYBOX_DISABLE_BRCTL
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -191,7 +191,7 @@ config BUSYBOX_DNSD
 
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake"
-	depends on !ADK_PACKAGE_ETHER_WAKE
+	depends on !BUSYBOX_DISABLE_ETHER_WAKE
 	default n
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -601,7 +601,7 @@ config BUSYBOX_FEATURE_INETD_RPC
 
 config BUSYBOX_IP
 	bool "ip"
-	depends on !ADK_PACKAGE_IP
+	depends on !BUSYBOX_DISABLE_IP
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -747,7 +747,7 @@ config BUSYBOX_NSLOOKUP
 
 config BUSYBOX_NTPD
 	bool "ntpd"
-	depends on !ADK_PACKAGE_OPENNTPD
+	depends on !BUSYBOX_DISABLE_NTPD
 	default y
 	select BUSYBOX_PLATFORM_LINUX
 	help
@@ -1040,7 +1040,7 @@ config BUSYBOX_VCONFIG
 
 config BUSYBOX_WGET
 	bool "wget"
-	depends on !ADK_PACKAGE_WGET
+	depends on !BUSYBOX_DISABLE_WGET
 	default y
 	help
 	  wget is a utility for non-interactive download of files from HTTP,
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index e9ee30431..c3c297492 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -11,6 +11,7 @@ config BUSYBOX_BLOCKDEV
 	default n
 	help
 	  Performs some ioctls with block devices.
+
 config BUSYBOX_MDEV
 	bool "mdev"
 	default y
@@ -150,7 +151,7 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
 
 config BUSYBOX_FBSET
 	bool "fbset"
-	depends on !ADK_PACKAGE_FBSET
+	depends on !BUSYBOX_DISABLE_FBSET
 	default y if ADK_TARGET_WITH_VGA
 	default n
 	select BUSYBOX_PLATFORM_LINUX
@@ -450,7 +451,7 @@ config BUSYBOX_LOSETUP
 
 config BUSYBOX_LSPCI
 	bool "lspci"
-	depends on !ADK_PACKAGE_PCIUTILS
+	depends on !BUSYBOX_DISABLE_LSPCI
 	default y if ADK_TARGET_WITH_PCI
 	default y if ADK_TARGET_WITH_MINIPCI
 	default n
@@ -463,7 +464,7 @@ config BUSYBOX_LSPCI
 
 config BUSYBOX_LSUSB
 	bool "lsusb"
-	depends on !ADK_PACKAGE_LSUSB
+	depends on !BUSYBOX_DISABLE_LSUSB
 	default y if ADK_TARGET_WITH_USB
 	default n
 	#select PLATFORM_LINUX
@@ -506,6 +507,7 @@ config BUSYBOX_MORE
 config BUSYBOX_MOUNT
 	bool "mount"
 	default y
+	depends on !BUSYBOX_DISABLE_MOUNT
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  All files and filesystems in Unix are arranged into one big directory
@@ -698,6 +700,7 @@ config BUSYBOX_SWITCH_ROOT
 config BUSYBOX_UMOUNT
 	bool "umount"
 	default y
+	depends on !BUSYBOX_DISABLE_UMOUNT
 	select BUSYBOX_PLATFORM_LINUX
 	help
 	  When you want to remove a mounted filesystem from its current mount
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 159bd229b..271827704 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -4,13 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
-PKG_VERSION:=		1.0.9
-PKG_RELEASE:=		6
+PKG_VERSION:=		1.0.10
+PKG_RELEASE:=		1
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
 
 PKG_CFLINE_CFGFS:=	select BUSYBOX_COMM@
+PKG_CFLINE_CFGFS:=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
diff --git a/package/cfgfs/src/defs.h b/package/cfgfs/src/defs.h
index c099ffb5a..5a70d8c14 100644
--- a/package/cfgfs/src/defs.h
+++ b/package/cfgfs/src/defs.h
@@ -10,7 +10,7 @@
 #define DEFS_H
 
 #define DEF_FLASHBLOCK	65536		/* size of a flash block */
-#define DEF_FLASHPART	4194304		/* max size of the partition */
+#define DEF_FLASHPART	16777215	/* max size of the partition */
 
 #define FWCF_VER	0x01		/* major version of spec used */
 
diff --git a/package/cfgfs/src/wraps.c b/package/cfgfs/src/wraps.c
index 288f6dbab..0364c7b71 100644
--- a/package/cfgfs/src/wraps.c
+++ b/package/cfgfs/src/wraps.c
@@ -77,6 +77,14 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz)
 
 	/* 12 bytes header, padding to 4-byte boundary, 4 bytes trailer */
 	k = ((j + 19) / 4) * 4;
+
+#if DEF_FLASHPART > 0xFFFFFF
+# error DEF_FLASHPART too large
+#endif
+       if (k > DEF_FLASHPART)
+               errx(1, "%lu bytes too large for flash partition of %lu KiB",
+                   (u_long)k, DEF_FLASHPART / 1024UL);
+
 	/* padded to size of flash block */
 #if (DEF_FLASHBLOCK & 3)
 # error DEF_FLASHBLOCK must be dword-aligned
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 77095eeac..306b027ca 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
 PKG_VERSION:=		6.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
 PKG_DESCR:=		CIFS utilities
 PKG_SECTION:=		net/fs
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=	--disable-cifsupcall \
 			--disable-systemd
 
 cifs-utils-install:
-	$(INSTALL_DIR) $(IDIR_CIFS_UTILS)/usr/sbin
+	$(INSTALL_DIR) $(IDIR_CIFS_UTILS)/sbin
 	$(INSTALL_BIN) $(WRKINST)/sbin/mount.cifs \
-		$(IDIR_CIFS_UTILS)/usr/sbin
+		$(IDIR_CIFS_UTILS)/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 310a0086d..40522c030 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
 PKG_VERSION:=		3.10.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		45fb5427fc723a0001c72b92c931ba02
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		route
@@ -51,9 +51,9 @@ XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
 CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:
-	${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin}
+	${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,bin}
 	${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/
-	${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip
+	${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip
 
 tc-install:
 	${INSTALL_DIR} ${IDIR_TC}/{usr/sbin,usr/lib/tc}
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index c14529ab5..5b211bb30 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.17.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		d0da6a6a1d9cf1e8710b6082f6ef7849
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
@@ -120,6 +120,7 @@ CONFIGURE_ARGS+=	--disable-httpd-output \
 			--disable-sqlite \
 			--disable-mpg123 \
 			--disable-soundcloud \
+			--enable-inotify \
 			--with-zeroconf=no
 
 ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
@@ -207,7 +208,7 @@ CONFIGURE_ARGS+=	--disable-lsr
 endif
 
 mpd-install:
-	${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc
+	${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc/mpd/playlists
 	${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin
 	${INSTALL_DATA} ./files/mpd.conf ${IDIR_MPD}/etc/mpd.conf
 
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index ee3565c15..d022a3069 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -1,10 +1,10 @@
 # An example configuration file for MPD
-user				"mpd"
+user				"root"
 auto_update			"no"
 music_directory			"/music"
 playlist_directory		"/etc/mpd/playlists"
 state_file			"/etc/mpd/state"
-db_file				"/etc/mpd/database"
+db_file				"/data/mpd/database"
 pid_file			"/var/run/mpd.pid"
 log_file			"syslog"
 filesystem_charset		"UTF-8"
diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init
index 8ff050b73..2e39cf82e 100644
--- a/package/mpd/files/mpd.init
+++ b/package/mpd/files/mpd.init
@@ -11,16 +11,6 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	# check group membership
-	id mpd | grep audio >/dev/null 2>&1
-	if [ $? -ne 0 ];then
-		echo "mpd user must be in group audio."
-		exit 1
-	fi
-	if [ ! -d /etc/mpd/playlists ];then
-		mkdir -p /etc/mpd/playlists
-		chown -R mpd:mpd /etc/mpd
-	fi
 	mpd
 	;;
 stop)
diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst
index a635ccae7..9eb855abe 100644
--- a/package/mpd/files/mpd.postinst
+++ b/package/mpd/files/mpd.postinst
@@ -1,6 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group mpd $gid
-add_user mpd $(get_next_uid) $gid /music
 add_rcconf mpd
diff --git a/package/mpd/patches/patch-src_db_simple_db_plugin_c b/package/mpd/patches/patch-src_db_simple_db_plugin_c
index 4158c5b8e..55ebba670 100644
--- a/package/mpd/patches/patch-src_db_simple_db_plugin_c
+++ b/package/mpd/patches/patch-src_db_simple_db_plugin_c
@@ -1,9 +1,87 @@
---- mpd-0.17.5.orig/src/db/simple_db_plugin.c	2013-08-01 09:15:41.000000000 +0200
-+++ mpd-0.17.5/src/db/simple_db_plugin.c	2013-10-08 15:28:10.000000000 +0200
-@@ -338,6 +338,8 @@ simple_db_save(struct db *_db, GError **
+--- mpd-0.17.6.orig/src/db/simple_db_plugin.c	2013-08-01 09:15:41.000000000 +0200
++++ mpd-0.17.6/src/db/simple_db_plugin.c	2013-10-17 17:51:34.000000000 +0200
+@@ -28,6 +28,9 @@
+ #include "conf.h"
+ #include "directory.h"
+ 
++#include <sys/mount.h> 
++#include <mntent.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -128,8 +131,8 @@ simple_db_check(struct simple_db *db, GE
+ 			return false;
+ 		}
+ 
+-		/* Check if we can write to the directory */
+-		if (access(dirPath, X_OK | W_OK)) {
++		/* Check if we can change into the directory */
++		if (access(dirPath, X_OK)) {
+ 			g_set_error(error_r, simple_db_quark(), errno,
+ 				    "Can't create db file in \"%s\": %s",
+ 				    dirPath, g_strerror(errno));
+@@ -159,9 +162,9 @@ simple_db_check(struct simple_db *db, GE
+ 	}
+ 
+ 	/* And check that we can write to it */
+-	if (access(db->path, R_OK | W_OK)) {
++	if (access(db->path, R_OK)) {
+ 		g_set_error(error_r, simple_db_quark(), errno,
+-			    "Can't open db file \"%s\" for reading/writing: %s",
++			    "Can't open db file \"%s\" for reading: %s",
+ 			    db->path, g_strerror(errno));
+ 		return false;
+ 	}
+@@ -305,6 +308,9 @@ simple_db_save(struct db *_db, GError **
+ {
+ 	struct simple_db *db = (struct simple_db *)_db;
+ 	struct directory *music_root = db->root;
++	struct mntent *mnt;
++	int remount;
++	FILE *f;
+ 
+ 	db_lock();
+ 
+@@ -317,6 +323,26 @@ simple_db_save(struct db *_db, GError **
+ 	db_unlock();
+ 
+ 	g_debug("writing DB");
++	
++	remount = 0;
++	/* check if /data is mounted read-only */
++	if ((f = setmntent("/proc/mounts", "r")) == NULL)
++		g_message("Checking /proc/mounts failed");
++
++	while ((mnt = getmntent(f)) != NULL) {
++		if (strcmp(mnt->mnt_dir, "/data") == 0 &&
++			hasmntopt(mnt, MNTOPT_RO) != NULL) {
++			remount = 1;
++		}
++	}
++	endmntent(f);
++
++	if (remount) {		
++		if (mount("","/data",0,MS_REMOUNT,0)<0) {
++			g_error("Remounting /data rw failed");
++		}
++		g_message("Mounted /data successfully in read-write mode"); 
++	}
+ 
+ 	FILE *fp = fopen(db->path, "w");
+ 	if (!fp) {
+@@ -338,6 +364,16 @@ simple_db_save(struct db *_db, GError **
  
  	fclose(fp);
  
++	if (remount) {
++		sync();
++		if (mount("","/data",0,MS_REMOUNT|MS_RDONLY,0)<0) {
++			g_error("Remounting /data ro failed");
++		}
++		g_message("Mounted /data successfully in read-only mode");
++	}
++
 +	g_message("Successfully written database to file: %s", db->path);	
 +
  	struct stat st;
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index b489a8434..284036ece 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		7b2d9dd75b5cf267ea1737ec75500316
 PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl
-PKG_DEPENDS:=		zlib libopenssl libpthread
+PKG_DEPENDS:=		zlib libopenssl libpthread libgcc
 PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
 PKG_MULTI:=		1
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 2f1213e0e..5d9f9329f 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -5,7 +5,7 @@
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 +"linux-embedded","gcc:-DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-embedded-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-embedded-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
  
  # Android: linux-* but without -DTERMIO and pointers to headers and libs.
  "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/package/tar/Makefile b/package/tar/Makefile
index d8b6df756..a7e4d32fd 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		00d1e769c6af702c542cca54b728920d
 PKG_DESCR:=		GNU archiving application
 PKG_SECTION:=		archive
+PKG_DEPENDS:=		libgcc
 PKG_URL:=		http://mirrors.kernel.org/gnu/tar/
 PKG_SITES:=		http://mirrors.kernel.org/gnu/tar/
 
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 76d482629..2f84a4d63 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
 PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
 PKG_DESCR:=		Linux utilities
 PKG_SECTION:=		fs
@@ -18,13 +18,15 @@ PKG_ARCH_DEPENDS:=	!m68k
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 PKG_SUBPKGS:=		FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBUUID_DEV
+PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBUUID_DEV LIBMOUNT
 PKGSD_LIBUUID:=		UUID library
 PKGSC_LIBUUID:=		libs
 PKGSD_LIBUUID_DEV:=	UUID headers
 PKGSC_LIBUUID_DEV:=	devel
 PKGSD_LIBBLKID:=	BLKID library
 PKGSC_LIBBLKID:=	libs
+PKGSD_LIBMOUNT:=	Mount library
+PKGSC_LIBMOUNT:=	libs
 PKGSD_FDISK:=		Partition table manipulation utility
 PKGSD_SFDISK:=		Scriptable Partition table manipulation utility
 PKGSD_SWAP_UTILS:=	Swap space management utilities
@@ -32,7 +34,7 @@ PKGSS_SWAP_UTILS:=	libblkid
 PKGSD_LOSETUP:=		Loop devices management utilities
 PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSD_MOUNT:=		mount/umount utilities
-PKGSS_MOUNT:=		libblkid
+PKGSS_MOUNT:=		libblkid libmount libuuid
 PKGSC_MOUNT:=		fs
 PKGSD_MCOOKIE:=		Generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/apps
@@ -43,11 +45,12 @@ $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKG_SECTION}))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKG_SECTION}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
-$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MOUNT},${PKG_SECTION}))
+$(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKG_SECTION}))
 $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE}))
 $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
 $(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
+$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT}))
 
 CONFIGURE_ENV+=		have_scanf_alloc_modifier=yes \
 			scanf_cv_alloc_modifier=ms
@@ -88,8 +91,8 @@ swap-utils-install:
 	${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
 
 mount-install:
-	${INSTALL_DIR} ${IDIR_MOUNT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/usr/bin
+	${INSTALL_DIR} ${IDIR_MOUNT}/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/{u,}mount ${IDIR_MOUNT}/bin
 
 mcookie-install:
 	${INSTALL_DIR} ${IDIR_MCOOKIE}/usr/bin
@@ -107,4 +110,8 @@ libblkid-install:
 	${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libblkid.so* ${IDIR_LIBBLKID}/usr/lib
 
+libmount-install:
+	${INSTALL_DIR} ${IDIR_LIBMOUNT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libmount.so* ${IDIR_LIBMOUNT}/usr/lib
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-linux/patches/patch-libmount_src_tab_parse_c b/package/util-linux/patches/patch-libmount_src_tab_parse_c
deleted file mode 100644
index 9abf59d71..000000000
--- a/package/util-linux/patches/patch-libmount_src_tab_parse_c
+++ /dev/null
@@ -1,82 +0,0 @@
---- util-linux-2.23.2.orig/libmount/src/tab_parse.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/libmount/src/tab_parse.c	2013-08-14 11:39:26.000000000 +0200
-@@ -16,6 +16,8 @@
- #include <dirent.h>
- #include <fcntl.h>
- 
-+#define UL_SCNsA        "%ms"
-+
- #include "at.h"
- #include "mangle.h"
- #include "mountP.h"
-@@ -59,18 +61,21 @@ static int next_number(char **s, int *nu
- static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
- {
- 	int rc, n = 0, xrc;
--	char *src = NULL, *fstype = NULL, *optstr = NULL;
-+	int len = strlen (s) + 1;
-+	char *fstype  = malloc (sizeof *fstype * len);
-+	char *optstr  = malloc (sizeof *optstr * len);
-+	char *src     = malloc (sizeof *src * len);
- 
--	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
--			UL_SCNsA" "	/* (2) target */
--			UL_SCNsA" "	/* (3) FS type */
--			UL_SCNsA" "	/* (4) options */
-+	rc = sscanf(s,	"%s"" "	/* (1) source */
-+			"%s"" "	/* (2) target */
-+			"%s"" "	/* (3) FS type */
-+			"%s"" "	/* (4) options */
- 			"%n",		/* byte count */
- 
--			&src,
--			&fs->target,
--			&fstype,
--			&optstr,
-+			src,
-+			fs->target,
-+			fstype,
-+			optstr,
- 			&n);
- 	xrc = rc;
- 
-@@ -135,13 +140,18 @@ static int mnt_parse_mountinfo_line(stru
- 	int rc, end = 0;
- 	unsigned int maj, min;
- 	char *fstype = NULL, *src = NULL, *p;
-+	int len = strlen (s) + 1;
-+
-+	fs->root        = malloc (sizeof *fs->root * len);
-+	fs->target      = malloc (sizeof *fs->target * len);
-+	fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
- 
- 	rc = sscanf(s,	"%u "		/* (1) id */
- 			"%u "		/* (2) parent */
- 			"%u:%u "	/* (3) maj:min */
--			UL_SCNsA" "	/* (4) mountroot */
--			UL_SCNsA" "	/* (5) target */
--			UL_SCNsA	/* (6) vfs options (fs-independent) */
-+			"%s"" "	/* (4) mountroot */
-+			"%s"" "	/* (5) target */
-+			"%s"	/* (6) vfs options (fs-independent) */
- 			"%n",		/* number of read bytes */
- 
- 			&fs->id,
-@@ -164,10 +174,14 @@ static int mnt_parse_mountinfo_line(stru
- 	if (p > s + 1)
- 		fs->opt_fields = strndup(s + 1, p - s - 1);
- 	s = p + 3;
-+	len           = strlen (s) + 1;
-+	fstype        = malloc (sizeof *fstype * len);
-+	src           = malloc (sizeof *src * len);
-+	fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
- 
--	rc += sscanf(s,	UL_SCNsA" "	/* (8) FS type */
--			UL_SCNsA" "	/* (9) source */
--			UL_SCNsA,	/* (10) fs options (fs specific) */
-+	rc += sscanf(s,	"%s"" "	/* (8) FS type */
-+			"%s"" "	/* (9) source */
-+			"%s",	/* (10) fs options (fs specific) */
- 
- 			&fstype,
- 			&src,
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 98e245bae..47264e74e 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		489f3877decae4e265ece54f9eaef0ba
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost boost-shared libffmpeg python2 libstdcxx 
+PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx 
 PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
 PKG_DEPENDS+=		libjpeg libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo