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

mk/image.mk

@@ -34,6 +34,9 @@ imageprepare: image-prepare-post extra-install
 # if an extra directory exist in TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
 extra-install:
+	@-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(TOPDIR)/extra/etc/resolv.conf ];then \
+		rm ${TARGET_DIR}/etc/resolv.conf;\
+	fi
 	@if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi
 	@if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
 

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		78
+PKG_RELEASE:=		79
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host

package/base-files/src/etc/init.d/boot

@@ -4,10 +4,6 @@
 
 . /etc/functions.sh
 
-if [ -f /proc/sys/kernel/printk ];then
-	echo 0 > /proc/sys/kernel/printk
-fi
-
 # remount /dev with smaller size
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 
@@ -31,9 +27,9 @@ cat /etc/.rnd >/dev/urandom 2>&1
 # create some useful directories in tmpfs
 mkdir -p /var/log
 mkdir -p /var/run
+mkdir -p /var/tmp
 touch /var/log/lastlog
 touch /var/log/wtmp
-ln -s /tmp /var/tmp
 
 HOSTNAME=
 [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)

package/base-files/src/etc/inittab

@@ -6,5 +6,5 @@ null::sysinit:/bin/mount -a -t devpts
 null::sysinit:/bin/mount -a -t tmpfs
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/etc/init.d/rcK
-null::shutdown:/bin/umount -a -r
+null::shutdown:/bin/umount -a -t ext4
 null::shutdown:/sbin/swapoff -a

package/check/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		check
 PKG_VERSION:=		0.9.12
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		46fe540d1a03714c7a1967dbc6d484e7
 PKG_DESCR:=		unit testing framework for C
 PKG_SECTION:=		libs
@@ -19,8 +19,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBCHECK,libcheck,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libcheck-install:
-	$(INSTALL_DIR) $(IDIR_CHECK)/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBCHECK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcheck*.so* \
-		$(IDIR_CHECK)/usr/lib
+		$(IDIR_LIBCHECK)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/eudev/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		eudev
 PKG_VERSION:=		1.5.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		51380938b489385cc394f4ebabc048f0
 PKG_DESCR:=		device manager (udev clone)
 PKG_SECTION:=		utils

package/eudev/patches/patch-rule_generator_write_cd_rules

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/rule_generator/write_cd_rules	2014-03-22 23:45:54.000000000 +0100
++++ eudev-1.5.3/rule_generator/write_cd_rules	2014-03-24 18:26:38.000000000 +0100
+@@ -27,7 +27,7 @@ if [ -n "$UDEV_LOG" ]; then
+ 	fi
+ fi
+ 
+-RULES_FILE="${prefix}/etc/udev/rules.d/70-persistent-cd.rules"
++RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
+ 
+ . ${prefix}/lib/udev/rule_generator.functions
+ 

package/eudev/patches/patch-rule_generator_write_net_rules

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/rule_generator/write_net_rules	2014-03-22 23:45:54.000000000 +0100
++++ eudev-1.5.3/rule_generator/write_net_rules	2014-03-24 18:26:38.000000000 +0100
+@@ -38,7 +38,7 @@ if [ -n "$UDEV_LOG" ]; then
+ 	fi
+ fi
+ 
+-RULES_FILE='${prefix}/etc/udev/rules.d/70-persistent-net.rules'
++RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+ 
+ . ${prefix}/lib/udev/rule_generator.functions
+ 

package/eudev/patches/patch-src_accelerometer_accelerometer_c

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/accelerometer/accelerometer.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/accelerometer/accelerometer.c	2014-03-24 20:41:59.000000000 +0100
+@@ -58,8 +58,8 @@
+ #include <linux/limits.h>
+ #include <linux/input.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#if defined(__UCLIBC__)
++#define O_CLOEXEC      02000000        /* set close_on_exec */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_accelerometer_accelerometer_c.orig

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/accelerometer/accelerometer.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/accelerometer/accelerometer.c	2014-03-24 20:39:35.000000000 +0100
+@@ -58,10 +58,6 @@
+ #include <linux/limits.h>
+ #include <linux/input.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
+-#endif
+-
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 

package/eudev/patches/patch-src_ata_id_ata_id_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/ata_id/ata_id.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/ata_id/ata_id.c	2014-03-24 20:44:36.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include <arpa/inet.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_ata_id_ata_id_c.orig

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/ata_id/ata_id.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/ata_id/ata_id.c	2014-03-24 20:43:14.000000000 +0100
+@@ -41,10 +41,6 @@
+ #include <linux/bsg.h>
+ #include <arpa/inet.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
+-#endif
+-
+ #include "libudev.h"
+ #include "libudev-private.h"
+ #include "log.h"

package/eudev/patches/patch-src_collect_collect_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/collect/collect.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/collect/collect.c	2014-03-24 20:45:48.000000000 +0100
+@@ -32,7 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_mtd_probe_mtd_probe_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/mtd_probe/mtd_probe.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/mtd_probe/mtd_probe.c	2014-03-24 20:46:53.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++# define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ int main(int argc, char** argv)

package/eudev/patches/patch-src_scsi_id_scsi_serial_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/scsi_id/scsi_serial.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/scsi_id/scsi_serial.c	2014-03-24 20:49:53.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <linux/bsg.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC      02000000        /* set close_on_exec */
+ #endif
+ 
+ #include "libudev.h"

package/gdb/Makefile

@@ -20,27 +20,28 @@ TARGET_CFLAGS+=         -static
 CONFIGURE_ARGS+=	--enable-static
 endif
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS} -fPIC
-CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
-			--disable-tui --disable-gdbtk --without-x \
-			--without-included-gettext --disable-sim \
-			--with-curses --disable-werror \
-			--without-auto-load-safe-path \
+CONFIGURE_ARGS+=	--without-uiout \
+			--disable-tui \
+			--disable-gdbtk \
+			--without-x \
+			--disable-sim \
+			--disable-werror \
 			--disable-gdbserver \
-			--without-python
+			--without-python \
+			--without-included-gettext \
+			--without-auto-load-safe-path \
+			--with-curses \
+			--enable-gdbmi
+
 XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 
-post-extract:
-	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak
-
 gdb-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
 	# shipped libbfd conflicts with system wide one
 	rm -f ${WRKINST}/usr/lib/libbfd*
-	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/glib/Makefile

@@ -11,7 +11,7 @@ PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		glib-host zlib libelf dbus
+PKG_BUILDDEP:=		glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus
 HOST_BUILDDEP:=		libffi-host gettext-tiny-host libiconv-tiny-host
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/

package/hdparm/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		hdparm
 PKG_VERSION:=		9.43
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f73233be118d86c779a8463d8b6a3cdb
-PKG_DESCR:=		get/set ATA drive parameters
+PKG_DESCR:=		get/set ATA/SATA drive parameters
 PKG_SECTION:=		fs
 PKG_URL:=		http://sourceforge.net/projects/hdparm
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=hdparm/}

package/kbd/Makefile

@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kbd
 PKG_VERSION:=		2.0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cc0ee9f2537d8636cae85a8c6541ed2e
 PKG_DESCR:=		keyboard utility
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libcheck
-PKG_BUILDDEP:=		check
+PKG_BUILDDEP:=		flex-host bison-host check
 PKG_URL:=		http://kbd-project.org/
 PKG_SITES:=		http://kbd-project.org/download/
 

package/kbd/patches/patch-src_dumpkeys_c

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/dumpkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/dumpkeys.c	2014-03-24 22:38:21.000000000 +0100
+@@ -3,6 +3,8 @@
+  *
+  * derived from version 0.81 - aeb@cwi.nl
+  */
++
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>

package/kbd/patches/patch-src_libkeymap_analyze_l

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/analyze.l	2013-10-04 15:28:49.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/analyze.l	2014-03-24 22:34:35.000000000 +0100
+@@ -12,6 +12,8 @@
+ %}
+ 
+ %top {
++#include <stdarg.h>
++#include <stdio.h>
+ #include "keymap.h"
+ int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner);
+ int stack_pop(struct lk_ctx *ctx, void *scanner);

package/kbd/patches/patch-src_libkeymap_common_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/common.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/common.c	2014-03-24 21:30:58.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <string.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ 

package/kbd/patches/patch-src_libkeymap_dump_c

@@ -1,11 +1,12 @@
 --- kbd-2.0.1.orig/src/libkeymap/dump.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/dump.c	2014-03-24 12:18:50.000000000 +0100
-@@ -9,6 +9,8 @@
++++ kbd-2.0.1/src/libkeymap/dump.c	2014-03-24 21:46:08.000000000 +0100
+@@ -9,6 +9,9 @@
   * This file is covered by the GNU General Public License,
   * which should be included with kbd as the file COPYING.
   */
 +
 +#include <sys/types.h>
++#include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
  #include <ctype.h>

package/kbd/patches/patch-src_libkeymap_kernel_c

@@ -0,0 +1,13 @@
+--- kbd-2.0.1.orig/src/libkeymap/kernel.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/kernel.c	2014-03-24 21:45:01.000000000 +0100
+@@ -6,7 +6,10 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <stdarg.h>
+ #include <string.h>
++#include <stdio.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ 

package/kbd/patches/patch-src_libkeymap_kmap_c

@@ -1,7 +1,10 @@
 --- kbd-2.0.1.orig/src/libkeymap/kmap.c	2013-10-07 16:13:31.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/kmap.c	2014-03-24 12:17:45.000000000 +0100
-@@ -1,3 +1,4 @@
++++ kbd-2.0.1/src/libkeymap/kmap.c	2014-03-24 21:46:56.000000000 +0100
+@@ -1,4 +1,7 @@
 +#include <sys/types.h>
++#include <stdarg.h>
  #include <stdlib.h>
++#include <stdio.h>
  #include <string.h>
  
+ #include "nls.h"

package/kbd/patches/patch-src_libkeymap_ksyms_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/ksyms.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/ksyms.c	2014-03-24 22:37:11.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <linux/keyboard.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>

package/kbd/patches/patch-src_libkeymap_loadkeys_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/loadkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/loadkeys.c	2014-03-24 21:48:35.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <errno.h>
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>

package/kbd/patches/patch-src_libkeymap_parser_y

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/parser.y	2013-10-07 16:13:39.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/parser.y	2014-03-24 21:49:52.000000000 +0100
+@@ -12,6 +12,8 @@
+ %{
+ #define YY_HEADER_EXPORT_START_CONDITIONS 1
+ 
++#include <stdarg.h>
++
+ #include "nls.h"
+ #include "kbd.h"
+ 

package/kbd/patches/patch-src_libkeymap_summary_c

@@ -1,11 +1,13 @@
 --- kbd-2.0.1.orig/src/libkeymap/summary.c	2013-08-27 22:45:33.000000000 +0200
-+++ kbd-2.0.1/src/libkeymap/summary.c	2014-03-24 12:23:53.000000000 +0100
-@@ -6,6 +6,8 @@
++++ kbd-2.0.1/src/libkeymap/summary.c	2014-03-24 21:47:48.000000000 +0100
+@@ -6,6 +6,10 @@
   * This file is covered by the GNU General Public License,
   * which should be included with kbd as the file COPYING.
   */
 +
 +#include <sys/types.h>
++#include <stdarg.h>
++#include <stdio.h>
  #include <string.h>
  #include <errno.h>
  #include <sys/ioctl.h>

package/kbd/patches/patch-src_loadkeys_c

@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/loadkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/loadkeys.c	2014-03-24 22:39:26.000000000 +0100
+@@ -10,6 +10,7 @@
+  * which should be included with kbd as the file COPYING.
+  */
+ 
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-bkeymap_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-bkeymap.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-bkeymap.c	2014-03-24 22:43:01.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-charset_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-charset.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-charset.c	2014-03-24 22:51:27.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-dumpkeys_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-dumpkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-dumpkeys.c	2014-03-24 22:40:50.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-init_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-init.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-init.c	2014-03-24 22:45:25.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-keys_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-keys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-keys.c	2014-03-24 22:49:03.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-kmap_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-kmap.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-kmap.c	2014-03-24 22:46:30.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-mktable_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-mktable.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-mktable.c	2014-03-24 22:41:52.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-parse_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-parse.c	2013-10-07 14:55:01.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-parse.c	2014-03-24 22:50:11.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-showmaps_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-showmaps.c	2013-10-07 16:13:31.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-showmaps.c	2014-03-24 22:44:16.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/libpciaccess/patches/patch-src_linux_sysfs_c

@@ -1,6 +1,20 @@
 --- libpciaccess-0.13.2.orig/src/linux_sysfs.c	2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/linux_sysfs.c	2014-03-24 13:26:10.484152334 +0100
-@@ -759,6 +759,7 @@ pci_device_linux_sysfs_open_device_io(st
++++ libpciaccess-0.13.2/src/linux_sysfs.c	2014-03-24 21:01:44.000000000 +0100
+@@ -41,11 +41,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <sys/mman.h>
+ #include <dirent.h>
+ #include <errno.h>
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
++#if defined(__i386__) || defined(__x86_64__)
+ #include <sys/io.h>
+ #else
+ #define inb(x) -1
+@@ -759,6 +760,7 @@ pci_device_linux_sysfs_open_device_io(st
  
      ret->base = base;
      ret->size = size;
@@ -8,7 +22,7 @@
  
      return ret;
  }
-@@ -796,6 +797,7 @@ pci_device_linux_sysfs_open_legacy_io(st
+@@ -796,6 +798,7 @@ pci_device_linux_sysfs_open_legacy_io(st
  
      ret->base = base;
      ret->size = size;
@@ -16,7 +30,7 @@
  
      return ret;
  }
-@@ -813,10 +815,14 @@ pci_device_linux_sysfs_read32(struct pci
+@@ -813,10 +816,14 @@ pci_device_linux_sysfs_read32(struct pci
  {
      uint32_t ret;
  
@@ -34,7 +48,7 @@
  	
      return ret;
  }
-@@ -826,10 +832,14 @@ pci_device_linux_sysfs_read16(struct pci
+@@ -826,10 +833,14 @@ pci_device_linux_sysfs_read16(struct pci
  {
      uint16_t ret;
  
@@ -52,7 +66,7 @@
  
      return ret;
  }
-@@ -839,10 +849,14 @@ pci_device_linux_sysfs_read8(struct pci_
+@@ -839,10 +850,14 @@ pci_device_linux_sysfs_read8(struct pci_
  {
      uint8_t ret;
  
@@ -70,7 +84,7 @@
  
      return ret;
  }
-@@ -851,30 +865,42 @@ static void
+@@ -851,30 +866,42 @@ static void
  pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
  			       uint32_t data)
  {

package/mpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.18.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0e5156a831d4302d2032998bcfd5c36f
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia

package/mpd/patches/patch-src_db_SimpleDatabasePlugin_cxx

@@ -1,91 +0,0 @@
---- mpd-0.18.5.orig/src/db/SimpleDatabasePlugin.cxx	2013-11-22 00:33:30.000000000 +0100
-+++ mpd-0.18.5/src/db/SimpleDatabasePlugin.cxx	2013-11-30 19:17:55.000000000 +0100
-@@ -35,6 +35,9 @@
- 
- #include <sys/types.h>
- #include <errno.h>
-+#include <sys/mount.h> 
-+#include <mntent.h>
-+#include <string.h>
- 
- static constexpr Domain simple_db_domain("simple_db");
- 
-@@ -95,8 +98,8 @@ SimpleDatabase::Check(Error &error) cons
- 			return false;
- 		}
- 
--		/* Check if we can write to the directory */
--		if (!CheckAccess(dirPath, X_OK | W_OK)) {
-+		/* Check if we can change into the directory */
-+		if (!CheckAccess(dirPath, X_OK)) {
- 			const int e = errno;
- 			const std::string dirPath_utf8 = dirPath.ToUTF8();
- 			error.FormatErrno(e, "Can't create db file in \"%s\"",
-@@ -122,9 +125,9 @@ SimpleDatabase::Check(Error &error) cons
- 		return false;
- 	}
- 
--	/* And check that we can write to it */
--	if (!CheckAccess(path, R_OK | W_OK)) {
--		error.FormatErrno("Can't open db file \"%s\" for reading/writing",
-+	/* And check that we can read it */
-+	if (!CheckAccess(path, R_OK)) {
-+		error.FormatErrno("Can't open db file \"%s\" for reading",
- 				  path_utf8.c_str());
- 		return false;
- 	}
-@@ -281,6 +284,10 @@ SimpleDatabase::GetStats(const DatabaseS
- bool
- SimpleDatabase::Save(Error &error)
- {
-+	struct mntent *mnt;
-+	int remount;
-+	FILE *f;
-+
- 	db_lock();
- 
- 	LogDebug(simple_db_domain, "removing empty directories from DB");
-@@ -293,6 +300,26 @@ SimpleDatabase::Save(Error &error)
- 
- 	LogDebug(simple_db_domain, "writing DB");
- 
-+	remount = 0;
-+	/* check if /data is mounted read-only */
-+	if ((f = setmntent("/proc/mounts", "r")) == NULL)
-+		error.Format(simple_db_domain, "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) {
-+			error.Format(simple_db_domain, "Remounting /data rw failed");
-+		}
-+		LogDebug(simple_db_domain, "Mounted /data successfully in read-write mode"); 
-+	}
-+
- 	FILE *fp = FOpen(path, FOpenMode::WriteText);
- 	if (!fp) {
- 		error.FormatErrno("unable to write to db file \"%s\"",
-@@ -310,6 +337,16 @@ SimpleDatabase::Save(Error &error)
- 
- 	fclose(fp);
- 
-+	if (remount) {
-+		sync();
-+		if (mount("","/data",0,MS_REMOUNT|MS_RDONLY,0)<0) {
-+			error.Format(simple_db_domain, "Remounting /data ro failed");
-+		}
-+		LogDebug(simple_db_domain, "Mounted /data successfully in read-only mode");
-+	}
-+
-+	LogDebug(simple_db_domain, "Successfully written database");	
-+
- 	struct stat st;
- 	if (StatFile(path, st))
- 		mtime = st.st_mtime;

package/mpd/patches/patch-src_thread_Id_hxx

@@ -1,11 +0,0 @@
---- mpd-0.18.5.orig/src/thread/Id.hxx	2013-11-18 23:50:46.000000000 +0100
-+++ mpd-0.18.5/src/thread/Id.hxx	2013-11-29 20:50:36.000000000 +0100
-@@ -84,7 +84,7 @@ public:
- #ifdef WIN32
- 		return id == other.id;
- #else
--		return ::pthread_equal(id, other.id);
-+		return pthread_equal(id, other.id);
- #endif
- 	}
- 

package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		6.5p1
+PKG_VERSION:=		6.6p1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a084e7272b8cbd25afe0f5dce4802fef
+PKG_MD5SUM:=		3e9800e6bca1fbac0eea4d41baa7f239
 PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl

package/openssh/patches/patch-digest_c → package/openssh/patches/patch-digest-openssl_c

@@ -1,5 +1,5 @@
---- openssh-6.5p1.orig/digest.c	2014-01-20 02:41:53.000000000 +0100
-+++ openssh-6.5p1/digest.c	2014-02-11 17:41:23.000000000 +0100
+--- openssh-6.6p1.orig/digest-openssl.c	2014-02-04 01:25:45.000000000 +0100
++++ openssh-6.6p1/digest-openssl.c	2014-03-24 13:42:01.000000000 +0100
 @@ -44,7 +44,9 @@ struct ssh_digest {
  /* NB. Indexed directly by algorithm number */
  const struct ssh_digest digests[] = {

package/openssh/patches/patch-mac_c

@@ -1,24 +0,0 @@
-diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
---- openssh-6.5p1.orig/mac.c	2014-01-10 00:37:05.000000000 +0100
-+++ openssh-6.5p1/mac.c	2014-02-11 15:26:16.000000000 +0100
-@@ -70,8 +70,10 @@ static const struct macalg macs[] = {
- #endif
- 	{ "hmac-md5",				SSH_EVP, EVP_md5, 0, 0, 0, 0 },
- 	{ "hmac-md5-96",			SSH_EVP, EVP_md5, 96, 0, 0, 0 },
-+#ifndef OPENSSL_NO_RIPEMD
- 	{ "hmac-ripemd160",			SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
- 	{ "hmac-ripemd160@openssh.com",		SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
-+#endif
- 	{ "umac-64@openssh.com",		SSH_UMAC, NULL, 0, 128, 64, 0 },
- 	{ "umac-128@openssh.com",		SSH_UMAC128, NULL, 0, 128, 128, 0 },
- 
-@@ -84,7 +86,9 @@ static const struct macalg macs[] = {
- #endif
- 	{ "hmac-md5-etm@openssh.com",		SSH_EVP, EVP_md5, 0, 0, 0, 1 },
- 	{ "hmac-md5-96-etm@openssh.com",	SSH_EVP, EVP_md5, 96, 0, 0, 1 },
-+#ifndef OPENSSL_NO_RIPEMD
- 	{ "hmac-ripemd160-etm@openssh.com",	SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
-+#endif
- 	{ "umac-64-etm@openssh.com",		SSH_UMAC, NULL, 0, 128, 64, 1 },
- 	{ "umac-128-etm@openssh.com",		SSH_UMAC128, NULL, 0, 128, 128, 1 },
- 

package/sudo/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		sudo
-PKG_VERSION:=		1.7.4p4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		55d9906535d70a1de347cd3d3550ee87
+PKG_VERSION:=		1.8.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		954d64906c3f6e2436f33445a049c58b
 PKG_DESCR:=		su do
 PKG_SECTION:=		admin
 PKG_URL:=		http://www.courtesan.com/sudo/
@@ -16,9 +16,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SUDO,sudo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CPPFLAGS_FOR_BUILD+=	-I../ -I../include
 CONFIGURE_ARGS+=	--without-pam \
-			--with-env-editor \
-			--with-timedir=/var/run
+			--without-sendmail \
+			--with-env-editor
 
 sudo-install:
 	$(INSTALL_DIR) $(IDIR_SUDO)/usr/bin

package/sudo/patches/patch-compat_Makefile_in

@@ -0,0 +1,15 @@
+--- sudo-1.8.10.orig/compat/Makefile.in	2014-03-07 22:51:19.000000000 +0100
++++ sudo-1.8.10/compat/Makefile.in	2014-03-24 15:58:28.000000000 +0100
+@@ -96,10 +96,10 @@ signame.c: mksigname
+ 	./mksigname > $@
+ 
+ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
+ 
+ mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/missing.h $(top_builddir)/config.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c -o $@
+ 
+ fnm_test: fnm_test.o libreplace.la
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libreplace.la $(PIE_LDFLAGS) $(SSP_LDFLAGS)

package/sudo/patches/patch-plugins_sudoers_match_c

@@ -0,0 +1,54 @@
+--- sudo-1.8.10.orig/plugins/sudoers/match.c	2014-03-07 22:51:19.000000000 +0100
++++ sudo-1.8.10/plugins/sudoers/match.c	2014-03-24 16:16:24.000000000 +0100
+@@ -122,10 +122,12 @@ userlist_matches(const struct passwd *pw
+ 	    case ALL:
+ 		matched = !m->negated;
+ 		break;
++#if 0
+ 	    case NETGROUP:
+ 		if (netgr_matches(m->name, NULL, NULL, pw->pw_name))
+ 		    matched = !m->negated;
+ 		break;
++#endif
+ 	    case USERGROUP:
+ 		if (usergr_matches(m->name, pw->pw_name, pw))
+ 		    matched = !m->negated;
+@@ -178,10 +180,12 @@ runaslist_matches(const struct member_li
+ 		    case ALL:
+ 			user_matched = !m->negated;
+ 			break;
++#if 0
+ 		    case NETGROUP:
+ 			if (netgr_matches(m->name, NULL, NULL, runas_pw->pw_name))
+ 			    user_matched = !m->negated;
+ 			break;
++#endif
+ 		    case USERGROUP:
+ 			if (usergr_matches(m->name, runas_pw->pw_name, runas_pw))
+ 			    user_matched = !m->negated;
+@@ -278,10 +282,12 @@ hostlist_matches(const struct member_lis
+ 	    case ALL:
+ 		matched = !m->negated;
+ 		break;
++#if 0
+ 	    case NETGROUP:
+ 		if (netgr_matches(m->name, user_runhost, user_srunhost, NULL))
+ 		    matched = !m->negated;
+ 		break;
++#endif
+ 	    case NTWKADDR:
+ 		if (addr_matches(m->name))
+ 		    matched = !m->negated;
+@@ -930,6 +936,7 @@ sudo_getdomainname(void)
+  * else return false.  Either of "lhost", "shost" or "user" may be NULL
+  * in which case that argument is not checked...
+  */
++#if 0
+ bool
+ netgr_matches(const char *netgr, const char *lhost, const char *shost, const char *user)
+ {
+@@ -972,3 +979,4 @@ netgr_matches(const char *netgr, const c
+ 
+     debug_return_bool(rc);
+ }
++#endif

target/packages/pkg-available/mpdbox

@@ -3,8 +3,9 @@ config ADK_PKG_MPDBOX
 	default n
 	select ADK_PACKAGE_MPDBOX
 	select ADK_PACKAGE_CIFS_UTILS
-	select ADK_PACKAGE_NFS_UTILS if ADK_TARGET_LIB_GLIBC
-	select ADK_PACKAGE_NFS_UTILS_CLIENT if ADK_TARGET_LIB_GLIBC
+	select ADK_PACKAGE_NFS_UTILS
+	select ADK_PACKAGE_NFS_UTILS_CLIENT
+	select ADK_PACKAGE_NTFS_3G
 	select ADK_PACKAGE_LIBMPDCLIENT
 	select ADK_PACKAGE_MPC
 	select ADK_PACKAGE_MPD
@@ -22,7 +23,6 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_CURL
 	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
 	select ADK_PACKAGE_MPD_WITH_HTTPD
-	select ADK_PACKAGE_CPUFREQUTILS
 	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_HTOP
 	select ADK_PACKAGE_DROPBEAR