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

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

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

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"

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"

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"

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>

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

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

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);

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

package/drbd/patches/patch-drbd_drbd_buildtag_c

@@ -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

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
 

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

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;
+ 

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}))

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"

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

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/}
 

package/hdparm/patches/patch-Makefile

@@ -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

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);

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)

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"

package/heyu/Makefile

@@ -13,6 +13,8 @@ PKG_DEPENDS:=		setserial
 PKG_URL:=		http://heyu.tanj.com/
 PKG_SITES:=		http://heyu.tanj.com/download/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include ${TOPDIR}/mk/package.mk

package/jamvm/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		lang

package/jamvm/patches/patch-src_os_linux_os_c

@@ -0,0 +1,17 @@
+--- jamvm-1.5.4.orig/src/os/linux/os.c	2009-12-31 19:40:48.000000000 +0100
++++ jamvm-1.5.4/src/os/linux/os.c	2013-12-25 16:43:03.000000000 +0100
+@@ -46,10 +46,12 @@ void *nativeStackBase() {
+ }
+ 
+ int nativeAvailableProcessors() {
+-#ifdef __UCLIBC__
++#if defined(__UCLIBC__)
+     return 1;
+-#else
++#elif defined(__GLIBC__)
+     return get_nprocs();
++#else
++    return 1;
+ #endif
+ }
+ 

package/libaudiofile/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		audiofile
 PKG_VERSION:=		0.3.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2731d79bec0acef3d30d2fc86b0b72fd
 PKG_DESCR:=		audiofile library
 PKG_SECTION:=		libs

package/libaudiofile/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- audiofile-0.3.6.orig/Makefile.in	2013-03-07 08:27:14.000000000 +0100
++++ audiofile-0.3.6/Makefile.in	2013-12-23 15:53:28.000000000 +0100
+@@ -294,7 +294,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = gtest libaudiofile sfcommands test examples docs
++SUBDIRS = gtest libaudiofile sfcommands 
+ EXTRA_DIST = \
+ 	ACKNOWLEDGEMENTS \
+ 	NOTES \

package/libjansson/Makefile

@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libjansson
+PKG_VERSION:=		2.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		46ac93bec48aacf207b67b51c8fbf7f1
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.digip.org/jansson/
+PKG_SITES:=		http://www.digip.org/jansson/releases/
+PKG_OPTS:=		dev
+
+DISTFILES:=             jansson-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/jansson-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBJANSSON,libjansson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libjansson-install:
+	$(INSTALL_DIR) $(IDIR_LIBJANSSON)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjansson*.so* \
+		$(IDIR_LIBJANSSON)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libnids/Makefile

@@ -15,10 +15,13 @@ PKG_URL:=		http://libnids.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 PKG_OPTS:=		dev
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--with-libpcap=${STAGING_TARGET_DIR}/usr

package/librpcsecgss/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libgssglue libtirpc autotool
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
 PKG_OPTS:=		dev
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/libtirpc/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://sourceforge.net/projects/libtirpc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 PKG_OPTS:		dev
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ${TOPDIR}/mk/package.mk

package/libvirt/Makefile

@@ -19,6 +19,7 @@ PKG_OPTS:=		dev
 
 PKG_HOST_DEPENDS:=	!freebsd !netbsd !openbsd
 PKG_ARCH_DEPENDS:=	x86 x86_64
+PKG_LIBC_DEPENDS:=	eglibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/lsof/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
 WRKSRC=			${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src

package/madplay/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		madplay
 PKG_VERSION:=		0.15.2b
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		6814b47ceaa99880c754c5195aa1aac1
 PKG_DESCR:=		MPEG audio player in fixed point
 PKG_SECTION:=		multimedia
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
 			LIBS="-lz" \
 			ac_cv_linux_vers=2 \

package/miredo/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		miredo
 PKG_VERSION:=		1.2.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5bcdbaced54f40b6cb1e9c9a8dbac411
 PKG_DESCR:=		A Teredo client and relay daemon
 PKG_SECTION:=		ipv6

package/miredo/patches/patch-libtun6_tun6_c

@@ -0,0 +1,15 @@
+--- miredo-1.2.6.orig/libtun6/tun6.c	2012-09-12 15:03:59.000000000 +0200
++++ miredo-1.2.6/libtun6/tun6.c	2013-12-23 17:23:42.000000000 +0100
+@@ -53,7 +53,12 @@
+ const char os_driver[] = "Linux";
+ # define USE_LINUX 1
+ 
++#if defined(__GLIBC__)
+ # include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver
++#else
++#define IFF_TUN                0x0001
++#define TUNSETIFF     _IOW('T', 202, int)
++#endif
+ /*
+  * <linux/ipv6.h> conflicts with <netinet/in.h> and <arpa/inet.h>,
+  * so we've got to declare this structure by hand.

package/mtr/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.bitwizard.nl/mtr/
 PKG_SITES:=		ftp://ftp.bitwizard.nl/mtr/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/net-tools/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		net-tools
 PKG_VERSION:=		1.60
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		888774accab40217dde927e21979c165
 PKG_DESCR:=		Linux net-tools
 PKG_SECTION:=		net

package/net-tools/patches/patch-lib_inet_c

@@ -0,0 +1,11 @@
+--- net-tools-1.60.orig/lib/inet.c	2000-05-22 23:27:13.000000000 +0200
++++ net-tools-1.60/lib/inet.c	2013-12-27 18:00:30.000000000 +0100
+@@ -224,7 +224,7 @@ static int INET_rresolve(char *name, siz
+ 
+ static void INET_reserror(char *text)
+ {
+-    herror(text);
++    perror(text);
+ }
+ 
+ 

package/nfs-utils/Makefile

@@ -18,6 +18,8 @@ PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		http://openadk.org/distfiles/
 #PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss

package/parted/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		parted
 PKG_VERSION:=		3.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5d89d64d94bcfefa9ce8f59f4b81bdcb
 PKG_DESCR:=		partition table editor
 PKG_SECTION:=		fs

package/parted/patches/patch-lib_config_h_in

@@ -1,7 +1,7 @@
---- parted-3.0.orig/lib/config.h.in	2011-05-30 09:07:32.000000000 +0200
-+++ parted-3.0/lib/config.h.in	2013-02-11 15:50:00.000000000 +0100
-@@ -1385,6 +1385,11 @@
- # endif
+--- parted-3.1.orig/lib/config.h.in	2012-03-02 17:10:29.000000000 +0100
++++ parted-3.1/lib/config.h.in	2013-12-25 20:03:47.000000000 +0100
+@@ -1424,6 +1424,11 @@
+ # define _DARWIN_USE_64_BIT_INODE 1
  #endif
  
 +/* Enable large inode numbers on Mac OS X 10.5.  */

package/parted/patches/patch-libparted_fs_xfs_platform_defs_h

@@ -0,0 +1,11 @@
+--- parted-3.1.orig/libparted/fs/xfs/platform_defs.h	2012-01-12 17:38:40.000000000 +0100
++++ parted-3.1/libparted/fs/xfs/platform_defs.h	2013-12-25 20:53:13.000000000 +0100
+@@ -51,7 +51,7 @@
+ # define constpp	char * const *
+ #endif
+ 
+-typedef loff_t		xfs_off_t;
++typedef off_t		xfs_off_t;
+ typedef uint64_t	xfs_ino_t;
+ typedef uint32_t	xfs_dev_t;
+ typedef int64_t         xfs_daddr_t;

package/picocom/Makefile

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		picocom
-PKG_VERSION:=		1.4
+PKG_VERSION:=		1.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		08fcc5f6bb9e7676a2569386d5ea9f70
+PKG_MD5SUM:=		8eaba1d31407e8408674d6e57af447ef
 PKG_DESCR:=		minimal dumb-terminal emulation program
 PKG_SECTION:=		serial
-PKG_URL:=		http://efault.net/npat/hacks/picocom/
-PKG_SITES:=		http://efault.net/npat/hacks/picocom/dist/
+PKG_URL:=		http://code.google.com/p/picocom
+PKG_SITES:=		http://picocom.googlecode.com/files/
 
 include ${TOPDIR}/mk/package.mk
 

package/picocom/patches/patch-Makefile

@@ -1,13 +1,15 @@
---- picocom-1.4.orig/Makefile	2004-08-13 13:18:38.000000000 +0200
-+++ picocom-1.4/Makefile	2011-01-21 21:02:02.096749132 +0100
-@@ -2,11 +2,12 @@
- VERSION=1.4
+--- picocom-1.7.orig/Makefile	2012-02-21 06:42:24.000000000 +0100
++++ picocom-1.7/Makefile	2013-12-26 09:43:38.000000000 +0100
+@@ -4,13 +4,14 @@ VERSION=1.7
+ UUCP_LOCK_DIR=/var/lock
  
  # CC = gcc
--CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\"
--CFLAGS = -Wall -g
+-CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" \
 +CPPFLAGS ?=
-+CPPFLAGS += -DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\"
++CPPFLAGS+=-DVERSION_STR=\"$(VERSION)\" \
+          -DUUCP_LOCK_DIR=\"$(UUCP_LOCK_DIR)\" \
+          -DHIGH_BAUD
+-CFLAGS = -Wall -g
 +CFLAGS ?= -Wall -g
  
  # LD = gcc

package/picocom/patches/patch-term_c

@@ -0,0 +1,106 @@
+--- picocom-1.7.orig/term.c	2010-05-29 00:41:19.000000000 +0200
++++ picocom-1.7/term.c	2013-12-26 09:45:20.000000000 +0100
+@@ -33,11 +33,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+-#ifdef __linux__
+-#include <termio.h>
+-#else
+ #include <termios.h>
+-#endif /* of __linux__ */
+ 
+ #include "term.h"
+ 
+@@ -945,27 +941,6 @@ term_pulse_dtr (int fd)
+ 			break;
+ 		}
+ 
+-#ifdef __linux__
+-		{
+-			int opins = TIOCM_DTR;
+-
+-			r = ioctl(fd, TIOCMBIC, &opins);
+-			if ( r < 0 ) {
+-				term_errno = TERM_EDTRDOWN;
+-				rval = -1;
+-				break;
+-			}
+-
+-			sleep(1);
+-
+-			r = ioctl(fd, TIOCMBIS, &opins);
+-			if ( r < 0 ) {
+-				term_errno = TERM_EDTRUP;
+-				rval = -1;
+-				break;
+-			}
+-		}
+-#else
+ 		{
+ 			struct termios tio, tioold;
+ 
+@@ -997,8 +972,6 @@ term_pulse_dtr (int fd)
+ 				break;
+ 			}
+ 		}
+-#endif /* of __linux__ */
+-			
+ 	} while (0);
+ 
+ 	return rval;
+@@ -1020,19 +993,6 @@ term_raise_dtr(int fd)
+ 			rval = -1;
+ 			break;
+ 		}
+-
+-#ifdef __linux__
+-		{
+-			int opins = TIOCM_DTR;
+-
+-			r = ioctl(fd, TIOCMBIS, &opins);
+-			if ( r < 0 ) {
+-				term_errno = TERM_EDTRUP;
+-				rval = -1;
+-				break;
+-			}
+-		}
+-#else
+ 		r = tcsetattr(fd, TCSANOW, &term.currtermios[i]);
+ 		if ( r < 0 ) {
+ 			/* FIXME: perhaps try to update currtermios */
+@@ -1040,7 +1000,6 @@ term_raise_dtr(int fd)
+ 			rval = -1;
+ 			break;
+ 		}
+-#endif /* of __linux__ */
+ 	} while (0);
+ 
+ 	return rval;
+@@ -1064,18 +1023,6 @@ term_lower_dtr(int fd)
+ 			break;
+ 		}
+ 
+-#ifdef __linux__
+-		{
+-			int opins = TIOCM_DTR;
+-
+-			r = ioctl(fd, TIOCMBIC, &opins);
+-			if ( r < 0 ) {
+-				term_errno = TERM_EDTRDOWN;
+-				rval = -1;
+-				break;
+-			}
+-		}
+-#else
+ 		{
+ 			struct termios tio;
+ 
+@@ -1097,7 +1044,6 @@ term_lower_dtr(int fd)
+ 				break;
+ 			}
+ 		}
+-#endif /* of __linux__ */
+ 	} while (0);
+ 	
+ 	return rval;

package/procps/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		procps
 PKG_VERSION:=		3.2.8
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9532714b6846013ca9898984ba4cd7e0
 PKG_DESCR:=		The /proc file system utilities
 PKG_SECTION:=		utils

package/procps/patches/patch-Makefile

@@ -1,6 +1,6 @@
 $Id$
---- procps-3.2.7.orig/Makefile	Sat Jun 24 09:02:02 2006
-+++ procps-3.2.7/Makefile	Tue May 22 14:43:11 2007
+--- procps-3.2.8.orig/Makefile	2009-05-10 20:50:48.000000000 +0200
++++ procps-3.2.8/Makefile	2013-12-23 16:53:06.000000000 +0100
 @@ -27,7 +27,7 @@ TARVERSION   := $(VERSION).$(SUBVERSION)
  ldconfig := ldconfig
  ln_f     := ln -f
@@ -19,7 +19,7 @@ $Id$
  ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
  
  # Left out -Wconversion due to noise in glibc headers.
-@@ -102,11 +102,11 @@ PKG_CFLAGS   := -fno-common -ffast-math 
+@@ -102,11 +102,11 @@ PKG_CFLAGS   := -fno-common -ffast-math
    -Wstrict-prototypes -Wmissing-prototypes
  # Note that some stuff below is conditional on CFLAGS containing
  # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)

package/procps/patches/patch-proc_readproc_c

@@ -0,0 +1,10 @@
+--- procps-3.2.8.orig/proc/readproc.c	2006-06-16 10:18:13.000000000 +0200
++++ procps-3.2.8/proc/readproc.c	2013-12-23 16:58:19.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <sys/dir.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>

package/rdesktop/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		rdesktop
-PKG_VERSION:=		1.6.0
+PKG_VERSION:=		1.8.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c6fcbed7f0ad7e60ac5fcb2d324d8b16
+PKG_MD5SUM:=		f5382c5c85b0d2cc88b9b1aa9bbf1356
 PKG_DESCR:=		client for Windows Terminal Services
 PKG_SECTION:=		net
 PKG_BUILDDEP:=		libiconv-tiny openssl
@@ -17,7 +17,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr"
+TARGET_CFLAGS+=		-D_GNU_SOURCE -D_POSIX_SOURCE
+CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr" \
+			--disable-smartcard \
+			--disable-credssp
 
 rdesktop-install:
 	$(INSTALL_DIR) $(IDIR_RDESKTOP)/usr/bin

package/rpcbind/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libtirpc autotool
 PKG_URL:=		http://sourceforge.net/projects/rpcbind/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rpcbind/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk

package/scanlogd/Makefile

@@ -15,6 +15,7 @@ PKG_URL:=		http://www.openwall.com/scanlogd/
 PKG_SITES:=		http://www.openwall.com/scanlogd/
 
 PKG_ARCH_DEPENDS:=	!arm
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/snort/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://www.snort.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NOPARALLEL:=	1
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/socat/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		socat
-PKG_VERSION:=		1.7.2.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		0565dd58800e4c50534c61bbb453b771
+PKG_VERSION:=		1.7.2.2
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		fe70c821a104378a834c3ed1b5971e54
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpthread libopenssl

package/socat/patches/501-honor_ldflags.patch

@@ -1,7 +1,7 @@
 diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in
---- socat-1.4-old/Makefile.in	2005-09-10 22:09:11.000000000 +0200
-+++ socat-1.4-new/Makefile.in	2005-10-08 17:12:45.000000000 +0200
-@@ -36,7 +36,8 @@
+--- socat-1.7.2.2.orig/Makefile.in	2011-12-06 08:45:03.000000000 +0100
++++ socat-1.7.2.2/Makefile.in	2013-12-24 16:37:21.000000000 +0100
+@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
  
  #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
  CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)

package/socat/patches/patch-sysincludes_h

@@ -0,0 +1,14 @@
+--- socat-1.7.2.2.orig/sysincludes.h	2011-12-06 08:45:03.000000000 +0100
++++ socat-1.7.2.2/sysincludes.h	2013-12-25 15:43:19.000000000 +0100
+@@ -136,9 +136,11 @@
+ #if HAVE_NETINET_IF_ETHER_H
+ #include <netinet/if_ether.h>
+ #endif
++#if defined(__GLIBC__)
+ #if HAVE_LINUX_IF_TUN_H
+ #include <linux/if_tun.h>
+ #endif
++#endif
+ 
+ #if HAVE_TERMIOS_H && _WITH_TERMIOS
+ #include <termios.h>

package/socat/patches/patch-xio-ip4_c

@@ -0,0 +1,12 @@
+--- socat-1.7.2.2.orig/xio-ip4.c	2010-10-06 09:25:30.000000000 +0200
++++ socat-1.7.2.2/xio-ip4.c	2013-12-25 15:46:30.000000000 +0100
+@@ -13,6 +13,9 @@
+ #include "xio-ip.h"
+ #include "xio-ip4.h"
+ 
++#if !defined(__GLIBC__)
++# define NETDB_INTERNAL       -1 
++#endif
+ 
+ int xioparsenetwork_ip4(const char *rangename, struct xiorange *range) {
+    struct hostent *maskaddr;

package/socat/patches/patch-xio-proxy_c

@@ -0,0 +1,12 @@
+--- socat-1.7.2.2.orig/xio-proxy.c	2011-12-06 08:45:03.000000000 +0100
++++ socat-1.7.2.2/xio-proxy.c	2013-12-25 15:47:38.000000000 +0100
+@@ -16,6 +16,9 @@
+ 
+ #include "xio-proxy.h"
+ 
++#if !defined(__GLIBC__)
++# define NETDB_INTERNAL       -1 
++#endif
+ 
+ #define PROXYPORT "8080"
+ 

package/socat/patches/patch-xio-tun_c

@@ -0,0 +1,15 @@
+--- socat-1.7.2.2.orig/xio-tun.c	2011-12-06 08:45:03.000000000 +0100
++++ socat-1.7.2.2/xio-tun.c	2013-12-25 15:51:46.000000000 +0100
+@@ -14,6 +14,12 @@
+ 
+ #include "xio-tun.h"
+ 
++#if !defined(__GLIBC__)
++#define IFF_TUN                0x0001
++#define IFF_TAP                0x0002
++#define IFF_NO_PI      0x1000
++#define TUNSETIFF     _IOW('T', 202, int)
++#endif
+ 
+ static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3);
+ 

package/strongswan/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		strongswan
-PKG_VERSION:=		5.0.0
+PKG_VERSION:=		5.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1d7bccb50f01020bb04d06e9755e0eec
+PKG_MD5SUM:=		f624ab041c306af0f5f57c927e9ea2e4
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		ip libpthread kmod-net-key kmod-xfrm-user
@@ -18,6 +18,8 @@ PKG_DEPENDS+=		kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc
 PKG_URL:=		http://strongswan.org/index.htm
 PKG_SITES:=		http://download.strongswan.org/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 PKG_CHOICES_STRONGSWAN:=WITH_GMP WITH_OPENSSL WITH_GNUTLS
 PKGCD_WITH_GMP:=	use GMP for crypto
 PKGCS_WITH_GMP:=	libgmp

package/systemd/Makefile

@@ -17,7 +17,7 @@ PKG_SITES:=		http://www.freedesktop.org/software/systemd/
 PKG_LIBNAME:=		libudev
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_SUBPKGS:=		UDEV LIBUDEV
 PKGSC_LIBUDEV:=		libs
 PKGSD_LIBUDEV:=		UDEV library

package/tcsh/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		tcsh
 PKG_VERSION:=		6.18.01
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		6eed09dbd4223ab5b6955378450d228a
 PKG_DESCR:=		alternative csh
 PKG_SECTION:=		shells

package/tcsh/patches/patch-sh_h

@@ -1,6 +1,6 @@
---- tcsh-6.17.00.orig/sh.h	2009-06-25 23:27:37.000000000 +0200
-+++ tcsh-6.17.00/sh.h	2010-07-31 19:48:01.000000000 +0200
-@@ -338,7 +338,7 @@ static inline void ignore(intptr_t a)
+--- tcsh-6.18.01.orig/sh.h	2011-04-14 20:25:25.000000000 +0200
++++ tcsh-6.18.01/sh.h	2013-12-25 17:12:55.000000000 +0100
+@@ -361,7 +361,7 @@ typedef long tcsh_number_t;
  # include <sys/filio.h>
  #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */
  
@@ -9,7 +9,7 @@
  # include <sys/file.h>
  #endif	/* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */
  
-@@ -375,9 +375,11 @@ static inline void ignore(intptr_t a)
+@@ -395,9 +395,11 @@ typedef long tcsh_number_t;
  #include <pwd.h>
  #include <grp.h>
  #endif /* WINNT_NATIVE */

package/tcsh/patches/patch-sh_proc_c

@@ -0,0 +1,11 @@
+--- tcsh-6.18.01.orig/sh.proc.c	2012-01-25 16:34:41.000000000 +0100
++++ tcsh-6.18.01/sh.proc.c	2013-12-25 17:17:37.000000000 +0100
+@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.proc.c,v 3.121 2012/01/
+ # define HZ 16
+ #endif /* aiws */
+ 
+-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GNU__) || defined(__GLIBC__)
+ # if !defined(__ANDROID__)
+ #  define BSDWAIT
+ # endif

package/vpnc/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vpnc
 PKG_VERSION:=		0.5.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		4378f9551d5b077e1770bbe09995afb3
 PKG_DESCR:=		client for cisco3000 VPN Concentrator.
 PKG_SECTION:=		net/security
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,VPNC,vpnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			OFLAGS="${TARGET_CFLAGS}" \
 			OS="Linux" \

package/vpnc/patches/patch-sysdep_c

@@ -0,0 +1,17 @@
+--- vpnc-0.5.3.orig/sysdep.c	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/sysdep.c	2013-12-23 14:15:07.000000000 +0100
+@@ -58,14 +58,10 @@
+ 
+ #if defined(__DragonFly__)
+ #include <net/tun/if_tun.h>
+-#elif defined(__linux__)
+-#include <linux/if_tun.h>
+ #elif defined(__APPLE__)
+ /* no header for tun */
+ #elif defined(__CYGWIN__)
+ #include "tap-win32.h"
+-#else
+-#include <net/if_tun.h>
+ #endif
+ 
+ #include "sysdep.h"

package/vpnc/patches/patch-sysdep_h

@@ -0,0 +1,11 @@
+--- vpnc-0.5.3.orig/sysdep.h	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/sysdep.h	2013-12-23 14:13:51.000000000 +0100
+@@ -37,7 +37,7 @@ int tun_read(int fd, unsigned char *buf,
+ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr);
+ 
+ /***************************************************************************/
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__GLIBC__)
+ #include <error.h>
+ 
+ #define HAVE_VASPRINTF 1

package/xf86-input-evdev/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
 PKG_BUILDDEP:=		xorg-server systemd
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT

package/xorg-server/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
 PKG_VERSION:=		1.12.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		a95c896fbe8322c3c8d518a13eb74c7a
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11/server

package/xorg-server/patches/patch-hw_kdrive_linux_linux_c

@@ -0,0 +1,13 @@
+--- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c	2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/kdrive/linux/linux.c	2013-12-22 20:10:03.000000000 +0100
+@@ -66,8 +66,8 @@ static void
+ LinuxCheckChown(char *file)
+ {
+     struct stat st;
+-    __uid_t u;
+-    __gid_t g;
++    uid_t u;
++    gid_t g;
+ 
+     if (stat(file, &st) < 0)
+         return;

package/xz/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		xz
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		5.0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		60044a5701997e4e0904257197208ea9
+PKG_MD5SUM:=		19d924e066b6fff0bc9d1981b4e53196
 PKG_DESCR:=		xz compression utility
 PKG_SECTION:=		archive
 PKG_URL:=		http://tukaani.org/xz/