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

40 files changed, 367 insertions, 53 deletions

diff --git a/package/check/Makefile b/package/check/Makefile
index 5e7a9803a..3d7c2fb2b 100644
--- a/package/check/Makefile
+++ b/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
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
index 72eb76a8f..a6939a032 100644
--- a/package/eudev/Makefile
+++ b/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
diff --git a/package/eudev/patches/patch-rule_generator_write_cd_rules b/package/eudev/patches/patch-rule_generator_write_cd_rules
new file mode 100644
index 000000000..ed67769b9
--- /dev/null
+++ b/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
+ 
diff --git a/package/eudev/patches/patch-rule_generator_write_net_rules b/package/eudev/patches/patch-rule_generator_write_net_rules
new file mode 100644
index 000000000..e5d14ae2e
--- /dev/null
+++ b/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
+ 
diff --git a/package/eudev/patches/patch-src_accelerometer_accelerometer_c b/package/eudev/patches/patch-src_accelerometer_accelerometer_c
new file mode 100644
index 000000000..95735f8c5
--- /dev/null
+++ b/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"
diff --git a/package/eudev/patches/patch-src_accelerometer_accelerometer_c.orig b/package/eudev/patches/patch-src_accelerometer_accelerometer_c.orig
new file mode 100644
index 000000000..7bfc4f0c6
--- /dev/null
+++ b/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"
+ 
diff --git a/package/eudev/patches/patch-src_ata_id_ata_id_c b/package/eudev/patches/patch-src_ata_id_ata_id_c
new file mode 100644
index 000000000..eae35adf7
--- /dev/null
+++ b/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"
diff --git a/package/eudev/patches/patch-src_ata_id_ata_id_c.orig b/package/eudev/patches/patch-src_ata_id_ata_id_c.orig
new file mode 100644
index 000000000..0d621ffc6
--- /dev/null
+++ b/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"
diff --git a/package/eudev/patches/patch-src_collect_collect_c b/package/eudev/patches/patch-src_collect_collect_c
new file mode 100644
index 000000000..dbf17c706
--- /dev/null
+++ b/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"
diff --git a/package/eudev/patches/patch-src_mtd_probe_mtd_probe_c b/package/eudev/patches/patch-src_mtd_probe_mtd_probe_c
new file mode 100644
index 000000000..340f08e94
--- /dev/null
+++ b/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)
diff --git a/package/eudev/patches/patch-src_scsi_id_scsi_serial_c b/package/eudev/patches/patch-src_scsi_id_scsi_serial_c
new file mode 100644
index 000000000..ab4f23dfd
--- /dev/null
+++ b/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"
diff --git a/package/glib/Makefile b/package/glib/Makefile
index a523434f7..d92294b8e 100644
--- a/package/glib/Makefile
+++ b/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}/
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 901ae6266..51f5f05ae 100644
--- a/package/kbd/Makefile
+++ b/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/
 
diff --git a/package/kbd/patches/patch-src_dumpkeys_c b/package/kbd/patches/patch-src_dumpkeys_c
new file mode 100644
index 000000000..f77b2d841
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-src_libkeymap_analyze_l b/package/kbd/patches/patch-src_libkeymap_analyze_l
new file mode 100644
index 000000000..56396f23e
--- /dev/null
+++ b/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);
diff --git a/package/kbd/patches/patch-src_libkeymap_common_c b/package/kbd/patches/patch-src_libkeymap_common_c
new file mode 100644
index 000000000..bbdb8726f
--- /dev/null
+++ b/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>
+ 
diff --git a/package/kbd/patches/patch-src_libkeymap_dump_c b/package/kbd/patches/patch-src_libkeymap_dump_c
index 23c883910..cf3aca4d8 100644
--- a/package/kbd/patches/patch-src_libkeymap_dump_c
+++ b/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>
diff --git a/package/kbd/patches/patch-src_libkeymap_kernel_c b/package/kbd/patches/patch-src_libkeymap_kernel_c
new file mode 100644
index 000000000..70cff9735
--- /dev/null
+++ b/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>
+ 
diff --git a/package/kbd/patches/patch-src_libkeymap_kmap_c b/package/kbd/patches/patch-src_libkeymap_kmap_c
index 2016772ab..3f945e5da 100644
--- a/package/kbd/patches/patch-src_libkeymap_kmap_c
+++ b/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"
diff --git a/package/kbd/patches/patch-src_libkeymap_ksyms_c b/package/kbd/patches/patch-src_libkeymap_ksyms_c
new file mode 100644
index 000000000..13c1be329
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-src_libkeymap_loadkeys_c b/package/kbd/patches/patch-src_libkeymap_loadkeys_c
new file mode 100644
index 000000000..ca368041b
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-src_libkeymap_parser_y b/package/kbd/patches/patch-src_libkeymap_parser_y
new file mode 100644
index 000000000..f06797961
--- /dev/null
+++ b/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"
+ 
diff --git a/package/kbd/patches/patch-src_libkeymap_summary_c b/package/kbd/patches/patch-src_libkeymap_summary_c
index b6637f99f..de2ec90b7 100644
--- a/package/kbd/patches/patch-src_libkeymap_summary_c
+++ b/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>
diff --git a/package/kbd/patches/patch-src_loadkeys_c b/package/kbd/patches/patch-src_loadkeys_c
new file mode 100644
index 000000000..11d44825f
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-bkeymap_c b/package/kbd/patches/patch-tests_libkeymap-bkeymap_c
new file mode 100644
index 000000000..66247229b
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-charset_c b/package/kbd/patches/patch-tests_libkeymap-charset_c
new file mode 100644
index 000000000..629bc06cd
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-dumpkeys_c b/package/kbd/patches/patch-tests_libkeymap-dumpkeys_c
new file mode 100644
index 000000000..85c242608
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-init_c b/package/kbd/patches/patch-tests_libkeymap-init_c
new file mode 100644
index 000000000..7c9d9f1e1
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-keys_c b/package/kbd/patches/patch-tests_libkeymap-keys_c
new file mode 100644
index 000000000..b2656fa25
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-kmap_c b/package/kbd/patches/patch-tests_libkeymap-kmap_c
new file mode 100644
index 000000000..a07347d55
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-mktable_c b/package/kbd/patches/patch-tests_libkeymap-mktable_c
new file mode 100644
index 000000000..adc5b722d
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-parse_c b/package/kbd/patches/patch-tests_libkeymap-parse_c
new file mode 100644
index 000000000..53293e773
--- /dev/null
+++ b/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>
diff --git a/package/kbd/patches/patch-tests_libkeymap-showmaps_c b/package/kbd/patches/patch-tests_libkeymap-showmaps_c
new file mode 100644
index 000000000..29bc6dea9
--- /dev/null
+++ b/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>
diff --git a/package/libpciaccess/patches/patch-src_linux_sysfs_c b/package/libpciaccess/patches/patch-src_linux_sysfs_c
index b84340706..eb91062c2 100644
--- a/package/libpciaccess/patches/patch-src_linux_sysfs_c
+++ b/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)
  {
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 409e63c0a..4d0c4e9da 100644
--- a/package/openssh/Makefile
+++ b/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
diff --git a/package/openssh/patches/patch-digest_c b/package/openssh/patches/patch-digest-openssl_c
index feead7711..dc8aeb4f6 100644
--- a/package/openssh/patches/patch-digest_c
+++ b/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[] = {
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c
deleted