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

71 files changed, 551 insertions, 109 deletions

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index d9caa7c4f..0e53be8e4 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -18,6 +18,7 @@ PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
 PKG_ARCH_DEPENDS:=	!cris
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 84517448c..670c97e7c 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bridge-utils
 PKG_VERSION:=		1.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ec7b381160b340648dede58c31bb2238
 PKG_DESCR:=		Ethernet bridging tools
 PKG_SECTION:=		bridge
diff --git a/package/bridge-utils/patches/patch-brctl_brctl_c b/package/bridge-utils/patches/patch-brctl_brctl_c
new file mode 100644
index 000000000..5305e47cc
--- /dev/null
+++ b/package/bridge-utils/patches/patch-brctl_brctl_c
@@ -0,0 +1,13 @@
+--- bridge-utils-1.5.orig/brctl/brctl.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl.c	2013-12-27 20:58:33.000000000 +0100
+@@ -19,8 +19,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <getopt.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "config.h"
diff --git a/package/bridge-utils/patches/patch-brctl_brctl_cmd_c b/package/bridge-utils/patches/patch-brctl_brctl_cmd_c
new file mode 100644
index 000000000..62ccfef49
--- /dev/null
+++ b/package/bridge-utils/patches/patch-brctl_brctl_cmd_c
@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_cmd.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_cmd.c	2013-12-27 20:59:48.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <errno.h>
+ #include <asm/param.h>
+ #include "libbridge.h"
diff --git a/package/bridge-utils/patches/patch-brctl_brctl_disp_c b/package/bridge-utils/patches/patch-brctl_brctl_disp_c
new file mode 100644
index 000000000..2adbb9e35
--- /dev/null
+++ b/package/bridge-utils/patches/patch-brctl_brctl_disp_c
@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_disp.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_disp.c	2013-12-27 21:00:22.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "brctl.h"
diff --git a/package/bridge-utils/patches/patch-libbridge_libbridge_h b/package/bridge-utils/patches/patch-libbridge_libbridge_h
index 2d42c496c..bbfd4ccb3 100644
--- a/package/bridge-utils/patches/patch-libbridge_libbridge_h
+++ b/package/bridge-utils/patches/patch-libbridge_libbridge_h
@@ -1,9 +1,10 @@
 --- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-07-12 14:38:31.000000000 +0200
-@@ -20,6 +20,7 @@
++++ bridge-utils-1.5/libbridge/libbridge.h	2013-12-27 21:01:15.000000000 +0100
+@@ -20,6 +20,8 @@
  #define _LIBBRIDGE_H
  
  #include <sys/socket.h>
++#include <sys/types.h>
 +#include <netinet/in.h>
  #include <linux/if.h>
  #include <linux/if_bridge.h>
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 6cd5d4175..9032d3f06 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_
 PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index c87667822..ca4b12b21 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
 PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
 PKG_SECTION:=		firewall
diff --git a/package/cutter/patches/patch-cutter_c b/package/cutter/patches/patch-cutter_c
index 03129f87e..0842a6dd9 100644
--- a/package/cutter/patches/patch-cutter_c
+++ b/package/cutter/patches/patch-cutter_c
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
++++ cutter-1.03/cutter.c	2013-12-24 12:14:44.000000000 +0100
 @@ -35,6 +35,10 @@
   * 		improvment.
   */
@@ -12,7 +12,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #include <string.h>
  #include <stdio.h>
  #include <unistd.h>
-@@ -297,7 +301,7 @@ int send_rst(
+@@ -50,7 +54,9 @@
+ #include <linux/if_ether.h>
+ #include <fcntl.h>
+ #include <netpacket/packet.h>
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>     /* the L2 protocols */
++#endif
+ #include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+@@ -297,7 +303,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -21,7 +31,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +423,7 @@ int send_rst(
+@@ -419,7 +425,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index 9adbaa298..49f8169be 100644
--- a/package/drbd/Makefile
+++ b/package/drbd/Makefile
@@ -4,14 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.4.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af0cc49ee0b5005ea108c5ba92aa755
+PKG_VERSION:=		8.4.4
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		b51815343c1a9151e2936b3b97520388
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
 PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,7 +33,7 @@ post-install:
 	$(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin
 	$(CP) $(WRKINST)/usr/lib/drbd/* \
 		$(IDIR_DRBD)/usr/lib/drbd/
-	$(INSTALL_BIN) $(WRKINST)/sbin/drbd* \
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \
 		$(IDIR_DRBD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c
deleted file mode 100644
index 86dd50121..000000000
--- a/package/drbd/patches/patch-drbd_drbd_buildtag_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- drbd-8.4.1.orig/drbd/drbd_buildtag.c	2011-12-20 12:43:15.000000000 +0100
-+++ drbd-8.4.1/drbd/drbd_buildtag.c	2012-07-24 23:03:27.000000000 +0200
-@@ -3,5 +3,5 @@
- const char *drbd_buildtag(void)
- {
- 	return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80"
--		" build by phil@fat-tyre, 2011-12-20 12:43:15";
--}
-+		" build by wbx@neon, 2012-07-24 23:03:27";
-+}
-\ No newline at end of file
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index b11d9af1c..813956bfc 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -15,6 +15,7 @@ PKG_URL:=		http://www.monkey.org/~dugsong/dsniff/
 PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
 
 PKG_ARCH_DEPENDS:=	!arm
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 
diff --git a/package/esound/Makefile b/package/esound/Makefile
index aabe40bd4..45c3d1529 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		6
+PKG_RELEASE:=		8
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		multimedia
diff --git a/package/esound/patches/patch-esddsp_c b/package/esound/patches/patch-esddsp_c
new file mode 100644
index 000000000..3b774f403
--- /dev/null
+++ b/package/esound/patches/patch-esddsp_c
@@ -0,0 +1,38 @@
+--- esound-0.2.41.orig/esddsp.c	2008-11-18 21:35:19.000000000 +0100
++++ esound-0.2.41/esddsp.c	2013-12-23 16:08:43.000000000 +0100
+@@ -264,7 +264,7 @@ open_wrapper (int (*func) (const char *,
+ }
+ 
+ int
+-open (const char *pathname, int flags, ...)
++esd_open (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -291,7 +291,7 @@ open (const char *pathname, int flags, .
+ }
+ 
+ int
+-open64 (const char *pathname, int flags, ...)
++esd_open64 (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -355,7 +355,7 @@ fopen_wrapper (FILE * (*func) (const cha
+ }
+ 
+ FILE *
+-fopen (const char *path, const char *mode)
++esd_fopen (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 
+@@ -375,7 +375,7 @@ fopen (const char *path, const char *mod
+ }
+ 
+ FILE *
+-fopen64 (const char *path, const char *mode)
++esd_fopen64 (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index f0b7cb9ed..6943d6d68 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		framebuffer utility
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/gdb/patches/patch-gdb_gdbserver_configure b/package/gdb/patches/patch-gdb_gdbserver_configure
new file mode 100644
index 000000000..fb32187b2
--- /dev/null
+++ b/package/gdb/patches/patch-gdb_gdbserver_configure
@@ -0,0 +1,20 @@
+--- gdb-7.6.orig/gdb/gdbserver/configure	2013-03-11 09:35:09.000000000 +0100
++++ gdb-7.6/gdb/gdbserver/configure	2013-12-23 19:39:06.000000000 +0100
+@@ -4927,9 +4927,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON
+ fi
+ 
+ WERROR_CFLAGS=""
+-if test "${ERROR_ON_WARNING}" = yes ; then
+-    WERROR_CFLAGS="-Werror"
+-fi
+ 
+ build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
+ -Wformat-nonliteral -Wno-char-subscripts -Wempty-body"
+@@ -4943,7 +4940,6 @@ $as_echo_n "checking compiler warning fl
+     # compiled with it enabled.
+     for w in ${build_warnings}; do
+ 	case $w in
+-	-Werr*) WERROR_CFLAGS=-Werror ;;
+ 	*) # Check that GCC accepts it
+ 	    saved_CFLAGS="$CFLAGS"
+ 	    CFLAGS="$CFLAGS $w"
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index bc2a9b72f..71de5e559 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -10,6 +10,7 @@ PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_SUBPKGS:=		GDBSERVER
 
 WRKSRC=                 ${WRKDIST}/gdb/gdbserver
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index 85b49f5a0..61925e59c 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -4,11 +4,11 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		hdparm
-PKG_VERSION:=		9.15
+PKG_VERSION:=		9.43
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0524dd10ad986285ff4eeb3507f7471c
+PKG_MD5SUM:=		f73233be118d86c779a8463d8b6a3cdb
 PKG_DESCR:=		get/set ATA drive parameters
-PKG_SECTION:=		utils
+PKG_SECTION:=		fs
 PKG_URL:=		http://sourceforge.net/projects/hdparm
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=hdparm/}
 
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
deleted file mode 100644
index 616b9fccc..000000000
--- a/package/hdparm/patches/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- hdparm-9.15.orig/Makefile	2008-12-10 01:14:28.000000000 +0100
-+++ hdparm-9.15/Makefile	2011-01-15 20:46:42.000000000 +0100
-@@ -13,10 +13,10 @@ oldmandir = $(manprefix)/man
- CC ?= gcc
- STRIP ?= strip
- 
--CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-+CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
- 
- #LDFLAGS = -s -static
--LDFLAGS = -s
-+LDFLAGS ?= -s
- INSTALL = install
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_DIR = $(INSTALL) -m 755 -d
-@@ -28,7 +28,6 @@ all: hdparm
- 
- hdparm: hdparm.h sgio.h $(OBJS)
- 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
--	$(STRIP) hdparm
- 
- hdparm.o:	hdparm.h sgio.h
- 
-@@ -46,9 +45,9 @@ install: all hdparm.8
- 	if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
- 	if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
- 	elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
--	$(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
--	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
--	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
-+	$(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
-+	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
-+	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
- 
- clean:
- 	-rm -f hdparm $(OBJS) core 2>/dev/null
diff --git a/package/hdparm/patches/patch-fallocate_c b/package/hdparm/patches/patch-fallocate_c
new file mode 100644
index 000000000..b826cdeba
--- /dev/null
+++ b/package/hdparm/patches/patch-fallocate_c
@@ -0,0 +1,11 @@
+--- hdparm-9.43.orig/fallocate.c	2010-10-04 21:38:39.000000000 +0200
++++ hdparm-9.43/fallocate.c	2013-12-26 10:25:40.000000000 +0100
+@@ -27,7 +27,7 @@ int do_fallocate_syscall (const char *pa
+ 	err = EINVAL;
+ #else
+ 	int fd;
+-	loff_t offset = 0, len;
++	off_t offset = 0, len;
+ 	int mode = 0;
+ 
+ 	fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600);
diff --git a/package/hdparm/patches/patch-hdparm_h b/package/hdparm/patches/patch-hdparm_h
new file mode 100644
index 000000000..8149ef69c
--- /dev/null
+++ b/package/hdparm/patches/patch-hdparm_h
@@ -0,0 +1,10 @@
+--- hdparm-9.43.orig/hdparm.h	2012-01-06 17:38:59.000000000 +0100
++++ hdparm-9.43/hdparm.h	2013-12-26 10:25:23.000000000 +0100
+@@ -2,6 +2,7 @@
+ 
+ //#undef __KERNEL_STRICT_NAMES
+ #include <linux/types.h>
++#include <sys/types.h>
+ 
+ #if !defined(__GNUC__) && !defined(__attribute__)
+ #define __attribute__(x)
diff --git a/package/hdparm/patches/patch-sysfs_c b/package/hdparm/patches/patch-sysfs_c
new file mode 100644
index 000000000..b3ffc3191
--- /dev/null
+++ b/package/hdparm/patches/patch-sysfs_c
@@ -0,0 +1,14 @@
+--- hdparm-9.43.orig/sysfs.c	2010-10-04 21:39:20.000000000 +0200
++++ hdparm-9.43/sysfs.c	2013-12-26 10:24:57.000000000 +0100
+@@ -11,9 +11,11 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <errno.h>
+ #include <dirent.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <linux/types.h>
+ 
+ #include "hdparm.h"
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index 9feaa4a67..d4dd07df8 100644
--- a/