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

package/binutils/Makefile

@@ -42,8 +42,8 @@ else
 CONFIGURE_ARGS+=	--disable-werror
 endif
 
-pre-build:
-	@-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
+post-build:
+	$(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
 
 libbfd-install:
 	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib

package/comgt/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
 PKG_DESCR:=		3G/GPRS datacard control tool
 PKG_SECTION:=		utils

package/comgt/patches/patch-comgt_c

@@ -0,0 +1,47 @@
+--- comgt.0.32.orig/comgt.c	2006-10-20 16:49:46.000000000 +0200
++++ comgt.0.32/comgt.c	2013-12-28 19:40:28.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -81,7 +81,7 @@ char token[MAXTOKEN];   /* For gettoken(
+ char scriptfile[MAXPATH]; /* Script file name */
+ char scriptfilepath[MAXPATH]; /* temp storage for full path */
+ BOOL verbose=0; /* Log actions */
+-struct termio cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
++struct termios cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
+ int comfd=0; /* Communication file descriptor.  Defaults to stdin. */
+ char msg[STRINGL]; /* Massage messages here */
+ int preturn,returns[MAXGOSUBS];
+@@ -926,7 +926,7 @@ void setcom(void) {
+ }
+ 
+ void doset(void) {
+-  struct termio console;
++  struct termios console;
+   int a,b;
+   gettoken();
+   if(strcmp(token,"echo")==0) {
+@@ -1281,7 +1281,7 @@ void opengt(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;
+@@ -1336,7 +1336,7 @@ void opendevice(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;

package/ctorrent/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		p2p

package/ctorrent/patches/patch-compat_c

@@ -0,0 +1,13 @@
+--- ctorrent-dnh3.3.2.orig/compat.c	2008-06-15 02:00:19.000000000 +0200
++++ ctorrent-dnh3.3.2/compat.c	2014-01-02 18:21:09.000000000 +0100
+@@ -67,8 +67,8 @@ int snprintf(char *str, size_t size, con
+ char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
+ {
+   char *p;
+-  ssize_t plen;
+-  ssize_t len = strlen(needle);
++  size_t plen;
++  size_t len = strlen(needle);
+ 
+   if( *needle == '\0' )
+     return (char *)haystack;

package/davfs2/Makefile

@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		davfs2
-PKG_VERSION:=		1.4.6
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c9e8aeb15daeba4b6283b40bb640e908
+PKG_VERSION:=		1.4.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils kmod-fuse-fs neon
 PKG_BUILDDEP:=		libiconv-tiny neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
-PKG_SITES:=		http://www.very-clever.com/download/nongnu/davfs2/
+PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
+
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/davfs2/patches/patch-src_cache_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/cache.c	2009-11-15 11:15:17.000000000 +0100
-+++ davfs2-1.4.6/src/cache.c	2010-12-27 22:02:47.000000000 +0100
-@@ -55,7 +55,6 @@
+--- davfs2-1.4.7.orig/src/cache.c	2012-07-19 13:26:00.000000000 +0200
++++ davfs2-1.4.7/src/cache.c	2014-01-01 20:01:21.000000000 +0100
+@@ -24,7 +24,6 @@
+ #include <dirent.h>
+ #endif
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -55,7 +54,6 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif

package/davfs2/patches/patch-src_coda_h

@@ -0,0 +1,15 @@
+--- davfs2-1.4.7.orig/src/coda.h	2009-04-14 21:54:57.000000000 +0200
++++ davfs2-1.4.7/src/coda.h	2014-01-01 20:12:52.000000000 +0100
+@@ -57,6 +57,12 @@ typedef int		     int32_t;
+ typedef unsigned int	   u_int32_t;
+ #endif
+ 
++typedef unsigned long u_long;
++typedef unsigned int u_int;
++typedef unsigned short u_short;
++typedef unsigned long long u_quad_t;
++#include <sys/types.h>
++
+ 
+ /*
+  * Cfs constants

package/davfs2/patches/patch-src_dav_fuse_c

@@ -1,10 +1,11 @@
---- davfs2-1.4.6.orig/src/dav_fuse.c	2010-02-16 20:29:49.000000000 +0100
-+++ davfs2-1.4.6/src/dav_fuse.c	2010-12-27 22:02:24.000000000 +0100
-@@ -33,6 +33,7 @@
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
+--- davfs2-1.4.7.orig/src/dav_fuse.c	2012-07-19 13:18:51.000000000 +0200
++++ davfs2-1.4.7/src/dav_fuse.c	2014-01-01 20:02:55.000000000 +0100
+@@ -48,6 +48,8 @@
+ #include <sys/stat.h>
  #endif
-+#include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
+ 
++#include <sys/select.h>
++
+ #include "defaults.h"
+ #include "mount_davfs.h"
+ #include "cache.h"

package/davfs2/patches/patch-src_kernel_interface_c

@@ -0,0 +1,10 @@
+--- davfs2-1.4.7.orig/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
++++ davfs2-1.4.7/src/kernel_interface.c	2014-01-01 20:01:11.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ #include "config.h"
+ 
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif

package/davfs2/patches/patch-src_mount_davfs_c

@@ -1,6 +1,16 @@
---- davfs2-1.4.6.orig/src/mount_davfs.c	2010-01-21 19:50:15.000000000 +0100
-+++ davfs2-1.4.6/src/mount_davfs.c	2010-05-29 21:10:23.041613426 +0200
-@@ -29,7 +29,6 @@
+--- davfs2-1.4.7.orig/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7/src/mount_davfs.c	2014-01-01 20:14:21.000000000 +0100
+@@ -20,16 +20,15 @@
+ 
+ #include "config.h"
+ 
++#include <paths.h>
+ #ifdef HAVE_ARGZ_H
+ #include <argz.h>
+ #endif
+ #include <ctype.h>
+ #include <errno.h>
+-#include <error.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
@@ -8,15 +18,15 @@
  #include <getopt.h>
  #include <grp.h>
  #ifdef HAVE_LIBINTL_H
-@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
+@@ -674,6 +673,7 @@ check_double_mounts(dav_args *args)
  static void
  check_fstab(const dav_args *args)
  {
 +#if 0
      dav_args *n_args = new_args();
      n_args->mopts = DAV_USER_MOPTS;
- 
-@@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
+     setfsent();
+@@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
  
      endfsent();
      delete_args(n_args);
@@ -24,7 +34,7 @@
  }
  
  
-@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
+@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
      struct passwd *pw;
  
      if (*mpoint != '/') {
@@ -33,7 +43,7 @@
          if (!mp)
              error(EXIT_FAILURE, 0,
                    _("can't evaluate path of mount point %s"), mpoint);
-@@ -1824,6 +1825,7 @@ new_args(void)
+@@ -1793,6 +1794,7 @@ new_args(void)
  static void
  log_dbg_cmdline(char *argv[])
  {
@@ -41,8 +51,8 @@
      size_t len;
      char *cmdline;
      if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
-         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
+@@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[])
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline);
          free(cmdline);
      }
 +    */

package/davfs2/patches/patch-src_webdav_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/webdav.c	2010-02-16 20:29:59.000000000 +0100
-+++ davfs2-1.4.6/src/webdav.c	2010-05-30 09:52:01.161613627 +0200
-@@ -52,6 +52,8 @@
+--- davfs2-1.4.7.orig/src/webdav.c	2012-07-19 13:27:51.000000000 +0200
++++ davfs2-1.4.7/src/webdav.c	2014-01-01 20:14:54.000000000 +0100
+@@ -21,7 +21,6 @@
+ #include "config.h"
+ 
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -52,6 +51,8 @@
  #include <sys/stat.h>
  #endif
  
@@ -9,7 +17,7 @@
  #include <ne_alloc.h>
  #include <ne_auth.h>
  #include <ne_basic.h>
-@@ -1918,6 +1920,7 @@ quota_result(void *userdata, const ne_ur
+@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur
  static int
  ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
  {
@@ -17,7 +25,7 @@
      char *issuer = ne_ssl_readable_dname(ne_ssl_cert_issuer(cert));
      char *subject = ne_ssl_readable_dname(ne_ssl_cert_subject(cert));
      char *digest = ne_calloc(NE_SSL_DIGESTLEN);
-@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures,
+@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures,
              len = getline(&s, &n, stdin);
              if (len < 0)
                  abort();

package/deco/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		deco
 PKG_VERSION:=		39
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
 PKG_DESCR:=		Text-based, full featured file manager
 PKG_SECTION:=		misc
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 INSTALL_STYLE:=		manual
 
 do-install:

package/dhcp-forwarder/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp-forwarder
-PKG_VERSION:=		0.9
+PKG_VERSION:=		0.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		63630db269ac17523ad085b67277b1c3
+PKG_MD5SUM:=		97b5f3ddbdee5c1f6756321c15907138
 PKG_DESCR:=		DHCP relay agent
 PKG_SECTION:=		dhcp
 PKG_URL:=		http://www.nongnu.org/dhcp-fwd/

package/dhcp-forwarder/patches/patch-src_parser_c

@@ -0,0 +1,10 @@
+--- dhcp-forwarder-0.10.orig/src/parser.c	2012-04-30 12:57:35.000000000 +0200
++++ dhcp-forwarder-0.10/src/parser.c	2013-12-30 19:16:07.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <netinet/in.h>
+ #include <sys/mman.h>
++#include <sys/stat.h>
+ 
+ #include "parser.h"
+ #include "cfg.h"

package/digitemp/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk

package/fuse/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fuse
 PKG_VERSION:=		2.9.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		33cae22ca50311446400daf8a6255c6a
 PKG_DESCR:=		Filesystem in Userspace (utilities)
 PKG_SECTION:=		fs

package/fuse/patches/patch-lib_fuse_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/fuse.c	2013-07-01 09:40:39.000000000 +0200
++++ fuse-2.9.3/lib/fuse.c	2014-01-01 11:45:54.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include <dlfcn.h>
+ #include <assert.h>
+ #include <poll.h>
++#include <sys/file.h>
+ #include <sys/param.h>
+ #include <sys/uio.h>
+ #include <sys/time.h>

package/fuse/patches/patch-lib_fuse_lowlevel_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/fuse_lowlevel.c	2013-07-01 09:40:39.000000000 +0200
++++ fuse-2.9.3/lib/fuse_lowlevel.c	2014-01-01 11:50:38.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <limits.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <sys/file.h>
+ 
+ #ifndef F_LINUX_SPECIFIC_BASE
+ #define F_LINUX_SPECIFIC_BASE       1024

package/fuse/patches/patch-lib_mount_util_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/mount_util.c	2013-07-01 09:25:36.000000000 +0200
++++ fuse-2.9.3/lib/mount_util.c	2014-01-01 11:52:48.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <paths.h>
+ #ifndef __NetBSD__
+ #include <mntent.h>
+ #endif

package/fuse/patches/patch-util_mount_util_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/util/mount_util.c	2013-07-01 10:02:18.000000000 +0200
++++ fuse-2.9.3/util/mount_util.c	2014-01-01 11:54:07.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <paths.h>
+ #ifndef __NetBSD__
+ #include <mntent.h>
+ #endif

package/gcc/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=		gcc
 PKG_DESCR:=		GNU C compiler
 PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
-PKG_DEPENDS:=		libmpc libgmp mpfr
+PKG_DEPENDS:=		libmpc libgmp mpfr libgcc
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_ARCH_DEPENDS:=	!avr32
@@ -37,6 +37,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
+ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
+CONFIGURE_ARGS+=	--enable-sjlj-exceptions
+else
+CONFIGURE_ARGS+=	--disable-sjlj-exceptions
+endif
+
 ifneq ($(ADK_PACKAGE_GXX),)
 CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
@@ -50,7 +56,6 @@ CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
 			--without-headers \
 			--libexecdir=/usr/lib \
 			--disable-libssp \
-			--disable-sjlj-exceptions \
 			--disable-biarch \
 			--disable-libmudflap \
 			--disable-libgomp \

package/gcc/patches/4.8.2/patch-libatomic_Makefile_in

@@ -0,0 +1,12 @@
+--- gcc-4.8.2.orig/libatomic/Makefile.in	2013-10-16 09:27:58.000000000 +0200
++++ gcc-4.8.2/libatomic/Makefile.in	2014-01-01 11:37:38.000000000 +0100
+@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
+ PAT_S = $(word 3,$(PAT_SPLIT))
+ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
+ IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
+-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_FALSE@M_DEPS = 
+ M_SIZE = -DN=$(PAT_N)
+ M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
+ M_FILE = $(PAT_BASE)_n.c

package/glibc/files/libc.so.microblaze

@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-microblaze)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/hostapd/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		hostapd
-PKG_VERSION:=		1.0
+PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		236247a7bbd4f60d5fa3e99849d1ffc9
+PKG_MD5SUM:=		ba22e639bc57aa4035d2ea8ffa9bbbee
 PKG_DESCR:=		an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libnl

package/hostapd/patches/patch-src_drivers_linux_wext_h

@@ -0,0 +1,19 @@
+--- hostapd-2.0.orig/src/drivers/linux_wext.h	2013-01-12 16:42:53.000000000 +0100
++++ hostapd-2.0/src/drivers/linux_wext.h	2014-01-02 16:26:15.000000000 +0100
+@@ -21,11 +21,11 @@
+ 
+ #include <sys/types.h>
+ #include <net/if.h>
+-typedef __uint32_t __u32;
+-typedef __int32_t __s32;
+-typedef __uint16_t __u16;
+-typedef __int16_t __s16;
+-typedef __uint8_t __u8;
++typedef uint32_t __u32;
++typedef int32_t __s32;
++typedef uint16_t __u16;
++typedef int16_t __s16;
++typedef uint8_t __u8;
+ #ifndef __user
+ #define __user
+ #endif /* __user */

package/htop/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		htop
 PKG_VERSION:=		1.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0d01cca8df3349c74569cefebbd9919e
 PKG_DESCR:=		graphical process manager
 PKG_SECTION:=		utils
@@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ENV+= 	ac_cv_file__proc_stat=yes \
 		  	ac_cv_file__proc_meminfo=yes
 CONFIGURE_ARGS+=	--disable-unicode

package/iftop/Makefile

@@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IFTOP,iftop,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
+
 iftop-install:
 	${INSTALL_DIR} ${IDIR_IFTOP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/iftop ${IDIR_IFTOP}/usr/bin/

package/iptraf/Makefile

@@ -22,7 +22,9 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-ltinfo
 
 do-build:
 	${MAKE} -C ${WRKBUILD}/src \

package/irssi/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		irssi
 PKG_VERSION:=		0.8.15
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		870db8e319f640c2bf446c30d0c24ef6
 PKG_DESCR:=		IRC text client
 PKG_SECTION:=		chat
@@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--with-perl=no \
 			--with-gnu-ld \
 			--with-textui \

package/kismet/Makefile

@@ -4,16 +4,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		kismet
-PKG_VERSION:=		2011-01-R1
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		1fb1f024a7ca52814b255e2f2faccf3b
+PKG_VERSION:=		2013-03-R1b
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		596acdd2940887dd05a498ea27475eea
 PKG_DESCR:=		Kismet
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libpcap libncurses libpthread
-PKG_BUILDDEP:=		libpcap ncurses
+PKG_BUILDDEP:=		autotool libpcap ncurses
 PKG_URL:=		http://www.kismetwireless.net/
 PKG_SITES:=		http://www.kismetwireless.net/code/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SUBPKGS:=		KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER
 PKGSD_KISMET_CLIENT:=	Kismet client
 PKGSD_KISMET_SERVER:=	Kismet server
@@ -26,7 +28,8 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
 $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
 $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-lpthread
+AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-lpthread -ltinfo
 CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet
 
 pre-build:

package/kismet/patches/patch-configure_in

@@ -0,0 +1,12 @@
+--- kismet-2013-03-R1b.orig/configure.in	2013-03-27 15:41:48.000000000 +0100
++++ kismet-2013-03-R1b/configure.in	2013-12-31 23:14:38.000000000 +0100
+@@ -406,9 +406,6 @@ AC_ARG_ENABLE(client,
+ )
+ AC_SUBST(wantclient)
+ 
+-# Add additional cflags since some distros bury panel.h
+-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+-
+ termcontrol="none";
+ 
+ if test "$wantclient" = "yes"; then

package/kismet/patches/patch-dumpfile_tuntap_h

@@ -0,0 +1,18 @@
+--- kismet-2013-03-R1b.orig/dumpfile_tuntap.h	2013-03-27 15:41:48.000000000 +0100
++++ kismet-2013-03-R1b/dumpfile_tuntap.h	2014-01-02 20:53:21.000000000 +0100
+@@ -65,7 +65,15 @@
+ #include "dumpfile.h"
+ 
+ #ifdef SYS_LINUX 
++#if defined(__GLIBC__)
+ #include <linux/if_tun.h>
++#else
++#define IFF_TUN         0x0001
++#define IFF_TAP         0x0002
++#define IFF_NO_PI       0x1000
++#define TUNSETNOCSUM  _IOW('T', 200, int)
++#define TUNSETIFF     _IOW('T', 202, int)
++#endif
+ 
+ // Linux IEEE80211 link typ to set
+ #define LNX_LINKTYPE_80211		801

package/lame/Makefile

@@ -30,6 +30,7 @@ $(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-ltinfo
 
 lame-install:
 	$(INSTALL_DIR) $(IDIR_LAME)/usr/bin

package/libmms/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		9f63aa363deb4874e072a45850161bff
 PKG_DESCR:=		common library for parsing mms:// type network streams
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		glib
+PKG_DEPENDS:=		glib
 PKG_URL:=		http://libmms.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libmms/}
 PKG_OPTS:=		dev

package/libshout/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libshout
-PKG_VERSION:=		2.2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		4f75fc9901c724b712c371c9a1e782d3
+PKG_VERSION:=		2.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		11765b2592e7ea623ccd93d3f8df172c
 PKG_DESCR:=		Library which can be used to write a source client for streaming
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libvorbis libogg
@@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--with-speex=no \
-			--with-theora=no
+CONFIGURE_ARGS+=	--disable-speex \
+			--disable-theora
 
 libshout-install:
 	${INSTALL_DIR} ${IDIR_LIBSHOUT}/usr/lib

package/libshout/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- libshout-2.2.2.orig/ltmain.sh	2006-01-10 16:23:50.000000000 +0100
-+++ libshout-2.2.2/ltmain.sh	2011-01-15 23:03:59.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
-       # -pg pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
--      -t[45]*|-txscale*|@*)
-+      -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.

package/libunistring/Makefile

@@ -13,6 +13,8 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/lsscsi/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lsscsi
-PKG_VERSION:=		0.25
+PKG_VERSION:=		0.27
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c4e36b106624aff78527c54cf08ecbfe
+PKG_MD5SUM:=		33ab2927a9e567a47905e6a618c17859
 PKG_DESCR:=		list SCSI devices
 PKG_SECTION:=		utils
 PKG_URL:=		http://sg.danny.cz/scsi/lsscsi.html

package/m4/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		m4
-PKG_VERSION:=		1.4.16
+PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a5dfb4f2b7370e9d34293d23fd09b280
+PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
 PKG_DESCR:=		macro processor
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		m4-host

package/m4/patches/patch-lib_stdio_in_h

@@ -1,13 +0,0 @@
---- m4-1.4.16.orig/lib/stdio.in.h	2011-03-01 17:39:29.000000000 +0100
-+++ m4-1.4.16/lib/stdio.in.h	2013-10-29 10:45:30.000000000 +0100
-@@ -161,8 +161,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if HAVE_RAW_DECL_GETS
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

package/mdadm/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mdadm
-PKG_VERSION:=		3.2.6
+PKG_VERSION:=		3.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dd2472f07993496ca4f4e3e8f6746517
+PKG_MD5SUM:=		f73bf9c6a72cdd644904b287bc9b7c9e
 PKG_DESCR:=		tool for managing Linux Software RAID arrays
 PKG_SECTION:=		fs
 PKG_URL:=		http://neil.brown.name/blog/mdadm

package/mdadm/patches/patch-Makefile

@@ -1,25 +1,15 @@
---- mdadm-3.2.5.orig/Makefile	2012-05-18 09:10:03.000000000 +0200
-+++ mdadm-3.2.5/Makefile	2012-07-25 13:51:12.000000000 +0200
-@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
+--- mdadm-3.3.orig/Makefile	2013-09-03 06:47:47.000000000 +0200
++++ mdadm-3.3/Makefile	2013-12-31 18:42:30.000000000 +0100
+@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
  
  CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
+ CXFLAGS ?= -ggdb
 -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
 +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
  ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
  endif
-@@ -76,7 +76,8 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo
- DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
- DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
- DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
--CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
-+CFLAGS ?=
-+CFLAGS += $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
- 
- # The glibc TLS ABI requires applications that call clone(2) to set up
- # TLS data structures, use pthreads until mdmon implements this support
-@@ -231,9 +232,10 @@ $(MON_OBJS) : $(INCL) mdmon.h
+@@ -257,9 +257,10 @@ $(MON_OBJS) : $(INCL) mdmon.h
  sha1.o : sha1.c sha1.h md5.h
  	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
  

package/mpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.18.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		63bcf6ce338caa2ae2cd6dc8e9710d5c
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
@@ -126,6 +126,7 @@ CONFIGURE_ARGS+=	--disable-jack \
 			--disable-pulse \
 			--disable-oss \
 			--disable-bzip2 \
+			--disable-libwrap \
 			--disable-mpc \
 			--disable-wavpack \
 			--disable-modplug \

package/mpg123/Makefile

@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 CONFIGURE_ARGS+=	--disable-shared \
 			--with-default-audio=alsa
 

package/nano/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nano
-PKG_VERSION:=		2.2.4
+PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6304308afb1f7ef4a5e93eb99206632a
+PKG_MD5SUM:=		03233ae480689a008eb98feb1b599807
 PKG_DESCR:=		An enhanced clone of the Pico editor
 PKG_SECTION:=		editor
 PKG_DEPENDS:=		libncurses
@@ -14,30 +14,24 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.nano-editor.org/
 PKG_SITES:=		http://www.nano-editor.org/dist/v2.2/
 
-PKG_FLAVOURS_NANO:=	TINY
-PKGFD_TINY:=		tiny nano
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NANO,nano,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_header_regex_h=no
 CONFIGURE_ARGS+=	--enable-nanorc \
-			--disable-glibtest \
+			--enable-tiny \
 			--disable-utf8 \
+			--disable-glibtest \
 			--disable-color \
-			--without-slang
-ifeq (${ADK_PACKAGE_NANO_TINY},y)
-CONFIGURE_ARGS+=	--enable-tiny
-else
-CONFIGURE_ARGS+=	--disable-browser \
+			--without-slang \
+			--disable-browser \
 			--disable-help \
 			--disable-mouse \
-			--disable-nls \
 			--disable-speller \
 			--disable-operatingdir \
 			--enable-multibuffer
-endif
+TARGET_LDFLAGS+=	-ltinfo
 
 nano-install:
 	${INSTALL_DIR} ${IDIR_NANO}/usr/bin

package/ncurses/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
 PKG_VERSION:=		5.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		8cb9c412e5f2d96bc6f459aa8c6282a1
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--enable-symlinks \
 			--without-ada \
 			--with-shared \
+			--with-termlib \
 			--without-debug \
 			--without-profile \
 			--without-gpm \
@@ -78,7 +79,7 @@ libncurses-install:
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
 	# libcurses will not show up in the IPKG, only in STAGING_TARGET_DIR
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \
+	${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
 	for ti in rxvt rxvt-unicode; do \
 		TERMINFO=${WRKINST}/usr/share/terminfo \

package/net-snmp/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.7.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5bddd02e2f82b62daa79f82717737a14
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net/misc

package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c

@@ -1,6 +1,6 @@
---- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c	2010-10-20 15:12:08.000000000 +0200
-+++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c	2011-01-12 14:48:14.000000000 +0100
-@@ -33,6 +33,12 @@
+--- net-snmp-5.7.2.orig/agent/mibgroup/mibII/tcpTable.c	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/agent/mibgroup/mibII/tcpTable.c	2014-01-01 17:12:30.000000000 +0100
+@@ -34,6 +34,12 @@
  #include <netlink/netlink.h>
  #include <netlink/msg.h>
  #include <linux/inet_diag.h>
@@ -13,7 +13,7 @@
  #endif
  
  #include <net-snmp/net-snmp-includes.h>
-@@ -565,8 +571,8 @@ tcpTable_load_netlink(void)
+@@ -579,8 +585,8 @@ tcpTable_load_netlink(void)
  	}
  
  	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
@@ -24,7 +24,7 @@
  		nl_handle_destroy(nl);
  		return -1;
  	}
-@@ -580,8 +586,8 @@ tcpTable_load_netlink(void)
+@@ -594,8 +600,8 @@ tcpTable_load_netlink(void)
  	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
  
  	if (nl_send_auto_complete(nl, nm) < 0) {
@@ -35,7 +35,7 @@
  		nl_handle_destroy(nl);
  		return -1;
  	}
-@@ -593,8 +599,8 @@ tcpTable_load_netlink(void)
+@@ -607,8 +613,8 @@ tcpTable_load_netlink(void)
  
  	while (running) {
  		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {

package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c

@@ -0,0 +1,10 @@
+--- net-snmp-5.7.2.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/agent/mibgroup/util_funcs/get_pid_from_inode.c	2014-01-01 17:29:08.000000000 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <limits.h>
+ #if HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif

package/net-snmp/patches/patch-net-snmp-config_in

@@ -1,6 +1,6 @@
---- net-snmp-5.6.1.orig/net-snmp-config.in	2010-10-13 11:58:34.000000000 +0200
-+++ net-snmp-5.6.1/net-snmp-config.in	2011-01-21 18:05:18.494919068 +0100
-@@ -127,10 +127,10 @@ else
+--- net-snmp-5.7.2.orig/net-snmp-config.in	2012-10-10 00:28:58.000000000 +0200
++++ net-snmp-5.7.2/net-snmp-config.in	2014-01-01 17:12:30.000000000 +0100
+@@ -138,10 +138,10 @@ else
        ;;
      #################################################### compile
      --base-cflags)

package/ntpclient/patches/patch-ntpclient_c

@@ -0,0 +1,11 @@
+--- ntpclient-2010.orig/ntpclient.c	2010-12-31 18:28:36.000000000 +0100
++++ ntpclient-2010/ntpclient.c	2014-01-03 12:20:27.000000000 +0100
+@@ -441,7 +441,7 @@ static void stuff_net_addr(struct in_add
+ 	struct hostent *ntpserver;
+ 	ntpserver=gethostbyname(hostname);
+ 	if (ntpserver == NULL) {
+-		herror(hostname);
++		perror(hostname);
+ 		exit(1);
+ 	}
+ 	if (ntpserver->h_length != 4) {

package/open-iscsi/patches/patch-usr_idbm_c

@@ -0,0 +1,10 @@
+--- open-iscsi-2.0-871.orig/usr/idbm.c	2009-07-11 05:55:58.000000000 +0200
++++ open-iscsi-2.0-871/usr/idbm.c	2014-01-03 12:44:20.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <limits.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
++#include <fcntl.h>
+ 
+ #include "idbm.h"
+ #include "idbm_fields.h"

package/open-iscsi/patches/patch-usr_mgmt_ipc_c

@@ -1,6 +1,6 @@
 --- open-iscsi-2.0-871.orig/usr/mgmt_ipc.c	2009-07-11 05:55:58.000000000 +0200
-+++ open-iscsi-2.0-871/usr/mgmt_ipc.c	2010-11-22 22:47:25.000000000 +0100
-@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t 
++++ open-iscsi-2.0-871/usr/mgmt_ipc.c	2014-01-03 12:35:32.000000000 +0100
+@@ -341,31 +341,7 @@ mgmt_ipc_notify_del_portal(queue_task_t
  static int
  mgmt_peeruser(int sock, char *user)
  {

package/oprofile/Makefile

@@ -15,6 +15,7 @@ PKG_URL:=		http://oprofile.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
 PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_CFLINE_OPROFILE:=	select BUSYBOX_EXPR
 
@@ -23,7 +24,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	-lpthread
-CONFIGURE_ARGS+=	--with-kernel-support
 
 oprofile-install:
 	$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,share}

package/orbit2/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ORBit2
 PKG_VERSION:=		2.14.19
 PKG_EXTRAVER:=		2.14
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
 PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
 PKG_SECTION:=		libs
@@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CFLAGS_FOR_BUILD+=	$(shell PATH=$(TARGET_PATH) libIDL-config-2 --cflags)
-LDFLAGS_FOR_BUILD+=	$(shell PATH=$(TARGET_PATH) libIDL-config-2 --libs)
+CFLAGS_FOR_BUILD+=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags)
+LDFLAGS_FOR_BUILD+=	$(shell PATH=$(HOST_PATH) libIDL-config-2 --libs)
 LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
 			ac_cv_alignof_CORBA_boolean=1 \
@@ -43,9 +43,6 @@ orbit2-install:
 	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \
 		$(IDIR_ORBIT2)/usr/lib
-	$(INSTALL_DIR) $(IDIR_ORBIT2)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
-		$(IDIR_ORBIT2)/usr/bin
 	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/orbit-idl-2 \
 		$(STAGING_DIR)/usr/bin

package/orbit2/patches/patch-src_idl-compiler_Makefile_in

@@ -33,15 +33,6 @@
  ORBIT_LIBS = @ORBIT_LIBS@
  ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@
  ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@
-@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR)
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
- RANLIB = @RANLIB@
- SED = @SED@
 @@ -270,8 +268,7 @@ INCLUDES = \
  	-DVERSION=\"$(ORBIT_VERSION)\"				\
  	-DORBIT2_INTERNAL_API					\

package/osiris/patches/patch-src_libosiris_Makefile_in

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- osiris-4.2.3.orig/src/libosiris/Makefile.in	2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/Makefile.in	2009-05-10 20:51:38.000000000 +0200
++++ osiris-4.2.3/src/libosiris/Makefile.in	2014-01-03 17:24:45.000000000 +0100
 @@ -105,7 +105,7 @@ libosiris_a_SOURCES = list.c message.c s
                              filter_uid.c filter_gid.c filter_user.c \
                              filter_group.c filter_header.c filter_file.c \
@@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
                              string_list.h ssl_utilities.h utilities.h \
                              regex.h regex.c debug.h debug.c strcasestr.c \
                              error.h strptime.h
-@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT) 
+@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT)
  	filter_python.$(OBJEXT) filter_script.$(OBJEXT) \
  	filter_gzip.$(OBJEXT) filter_zip.$(OBJEXT) filter_tar.$(OBJEXT) \
  	filter_pgp.$(OBJEXT) filter_rpm.$(OBJEXT) filter_uid.$(OBJEXT) \

package/osiris/patches/patch-src_libosiris_osi_common_h

@@ -0,0 +1,10 @@
+--- osiris-4.2.3.orig/src/libosiris/osi_common.h	2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/libosiris/osi_common.h	2014-01-03 17:33:53.000000000 +0100
+@@ -31,6 +31,7 @@
+ #ifndef OSI_COMMON_H
+ #define OSI_COMMON_H
+ 
++#include <sys/types.h>
+ #include "config.h"
+ 
+ /* for atomic_t */

package/portsentry/Makefile

@@ -12,6 +12,8 @@ PKG_SECTION:=		net/security
 PKG_URL:=		http://sourceforge.net/projects/sentrytools
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sentrytools/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}_beta
 
 include ${TOPDIR}/mk/package.mk

package/procps/Makefile

@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,PROCPS,procps,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
+TARGET_LDFLAGS+=	-ltinfo
 
 procps-install:
 	${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin}

package/proftpd/Makefile

@@ -4,15 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		proftpd
-PKG_VERSION:=		1.3.3
+PKG_VERSION:=		1.3.4d
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		97ad29f31f4fe633a9f8d021bab2df20
+PKG_MD5SUM:=		13c6fd7ce320886adc371c81a3e23f07
 PKG_DESCR:=		A very configurable FTP server
 PKG_SECTION:=		www
 PKG_URL:=		http://www.proftpd.org/
 PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
 PKG_NOPARALLEL:=	1
 
+PKG_LIBC_DEPENDS:=	eglibc glibc
+PKG_CFLINE_PROFTPD:=	depends on ADK_BROKEN
+
 PKG_FLAVOURS_PROFTPD:=	WITH_FTPUSERS
 PKGFD_WITH_FTPUSERS:=	install /etc/ftpusers along with proftpd
 
@@ -23,6 +26,7 @@ $(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 CONFIGURE_ARGS+=	--disable-cap
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_func_setgrent_void=yes
+TARGET_LDFLAGS+=	-ltinfo
 
 proftpd-install:
 	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc

package/quagga/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		quagga
-PKG_VERSION:=		0.99.17
+PKG_VERSION:=		0.99.22.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		37b9022adca04b03863d2d79787e643f
+PKG_MD5SUM:=		27ef98abb1820bae19eb71f631a10853
 PKG_DESCR:=		A routing software package
 PKG_SECTION:=		route
 PKG_BUILDDEP:=		readline ncurses

package/quagga/patches/patch-configure

@@ -1,20 +0,0 @@
---- quagga-0.99.17.orig/configure	2010-08-19 11:43:02.000000000 +0200
-+++ quagga-0.99.17/configure	2011-02-16 22:51:51.000000000 +0100
-@@ -14188,7 +14188,7 @@ if test "${ac_cv_func_malloc_0_nonnull+s
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
--  ac_cv_func_malloc_0_nonnull=no
-+  ac_cv_func_malloc_0_nonnull=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -14640,7 +14640,7 @@ if test "${ac_cv_func_realloc_0_nonnull+
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
--  ac_cv_func_realloc_0_nonnull=no
-+  ac_cv_func_realloc_0_nonnull=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */

package/quagga/patches/patch-lib_queue_h

@@ -0,0 +1,11 @@
+--- quagga-0.99.22.4.orig/lib/queue.h	2013-08-04 15:01:38.000000000 +0200
++++ quagga-0.99.22.4/lib/queue.h	2013-12-30 19:57:25.000000000 +0100
+@@ -33,8 +33,6 @@
+ #ifndef _SYS_QUEUE_H_
+ #define	_SYS_QUEUE_H_
+ 
+-#include <sys/cdefs.h>
+-
+ /*
+  * This file defines four types of data structures: singly-linked lists,
+  * singly-linked tail queues, lists and tail queues.

package/quagga/patches/patch-lib_sockopt_c

@@ -0,0 +1,23 @@
+--- quagga-0.99.22.4.orig/lib/sockopt.c	2013-04-14 14:46:07.000000000 +0200
++++ quagga-0.99.22.4/lib/sockopt.c	2013-12-30 19:56:54.000000000 +0100
+@@ -24,6 +24,20 @@
+ #include "sockopt.h"
+ #include "sockunion.h"
+ 
++#if !defined(__GLIBC__)
++/* For TCP_MD5SIG socket option.  */
++#define TCP_MD5SIG_MAXKEYLEN    80
++
++struct tcp_md5sig
++{
++  struct sockaddr_storage tcpm_addr;            /* Address associated.  */
++  u_int16_t     __tcpm_pad1;                    /* Zero.  */
++  u_int16_t     tcpm_keylen;                    /* Key length.  */
++  u_int32_t     __tcpm_pad2;                    /* Zero.  */
++  u_int8_t      tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary).  */
++};
++#endif
++
+ int
+ setsockopt_so_recvbuf (int sock, int size)
+ {

package/quagga/patches/patch-lib_zebra_h

@@ -0,0 +1,10 @@
+--- quagga-0.99.22.4.orig/lib/zebra.h	2013-09-02 14:53:04.000000000 +0200
++++ quagga-0.99.22.4/lib/zebra.h	2013-12-30 19:58:14.000000000 +0100
+@@ -51,7 +51,6 @@ typedef int socklen_t;
+ #ifdef HAVE_STROPTS_H
+ #include <stropts.h>
+ #endif /* HAVE_STROPTS_H */
+-#include <sys/fcntl.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif /* HAVE_SYS_SELECT_H */

package/quagga/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- quagga-0.99.17.orig/ltmain.sh	2010-08-19 11:43:02.000000000 +0200
-+++ quagga-0.99.17/ltmain.sh	2011-01-16 22:05:52.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

package/quagga/patches/patch-redhat_quagga_spec

@@ -1,11 +0,0 @@
---- quagga-0.99.17.orig/redhat/quagga.spec	2010-08-19 11:44:45.000000000 +0200
-+++ quagga-0.99.17/redhat/quagga.spec	2011-01-16 22:05:02.000000000 +0100
-@@ -90,7 +90,7 @@
- Summary: Routing daemon
- Name:		quagga
- Version:	0.99.17
--Release:	20100819%{release_rev}
-+Release:	20110116%{release_rev}
- License:	GPL
- Group: System Environment/Daemons
- Source0:	http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz

package/quagga/patches/patch-vtysh_extract_pl

@@ -1,8 +0,0 @@
---- quagga-0.99.17.orig/vtysh/extract.pl	2010-08-19 11:44:45.000000000 +0200
-+++ quagga-0.99.17/vtysh/extract.pl	2011-01-16 22:05:03.000000000 +0100
-@@ -1,4 +1,4 @@
--#! 
-+#! /opt/local/bin/perl
- ##
- ## vtysh/extract.pl.  Generated from extract.pl.in by configure.
- ##

package/radvd/Makefile

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		radvd
-PKG_VERSION:=		1.9.1
+PKG_VERSION:=		1.9.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e807ad7e9a76d46b6133df391385cd31
+PKG_MD5SUM:=		85141c7dc7d35e5499e16052742f1040
 PKG_DESCR:=		Routing Advertisement Daemon for IPv6
 PKG_SECTION:=		ipv6
 PKG_DEPENDS:=		kmod-ipv6 libdaemon
-PKG_BUILDDEP:=		libdaemon
+PKG_BUILDDEP:=		autotool libdaemon
 PKG_URL:=		http://www.litech.org/radvd/
 PKG_SITES:=		http://v6web.litech.org/radvd/dist/
 
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RADVD,radvd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-configfile=/etc/radvd.conf \
 			--with-logfile=/var/log/radvd.log \
 			--with-pidfile=/var/run/radvd.pid

package/radvd/patches/patch-configure_ac

@@ -0,0 +1,10 @@
+--- radvd-1.9.7.orig/configure.ac	2013-11-17 16:41:26.000000000 +0100
++++ radvd-1.9.7/configure.ac	2014-01-04 18:30:07.000000000 +0100
+@@ -151,7 +151,6 @@ AC_CHECK_HEADERS( \
+ 	net/if_types.h \
+ 	sys/param.h \
+ 	sys/sockio.h \
+-	sys/sysctl.h \
+ 	sys/time.h \
+ 	time.h \
+ )

package/rdate/Makefile

@@ -18,6 +18,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 MAKE_FILE=		GNUmakefile
 
 rdate-install:

package/rdate/patches/patch-ntp_c

@@ -0,0 +1,50 @@
+--- rdate.orig/ntp.c	2007-08-17 17:03:24.000000000 +0200
++++ rdate/ntp.c	2013-12-30 23:07:06.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <sys/types.h>
+ 
+ #include <ctype.h>
+ #include <err.h>
+@@ -100,9 +101,9 @@ struct ntp_data {
+ 	double		transmit;
+ 	double		current;
+ 	double		originate;
+-	u_int64_t	xmitck;
+-	u_int64_t	recvck;
+-	u_int32_t	refid;
++	uint64_t	xmitck;
++	uint64_t	recvck;
++	uint32_t	refid;
+ 	u_char		status;
+ 	u_char		version;
+ 	u_char		mode;
+@@ -268,7 +269,7 @@ write_packet(int fd, struct ntp_data *da
+ 
+ 	packet[0] = ((nver ? nver : NTP_VERSION) << 3) | (NTP_MODE_CLIENT);
+ 
+-	data->xmitck = (u_int64_t)arc4random() << 32 | arc4random();
++	data->xmitck = (uint64_t)arc4random() << 32 | arc4random();
+ 
+ 	/*
+ 	 * Send out a random 64-bit number as our transmit time.  The NTP
+@@ -286,7 +287,7 @@ write_packet(int fd, struct ntp_data *da
+ 	 * the transmit field intelligible.
+ 	 */
+ 
+-	memcpy(packet + NTP_TRANSMIT, &data->xmitck, sizeof (u_int64_t));
++	memcpy(packet + NTP_TRANSMIT, &data->xmitck, sizeof (uint64_t));
+ 
+ 	data->originate = current_time(JAN_1970);
+ 
+@@ -437,7 +438,7 @@ unpack_ntp(struct ntp_data *data, u_char
+ 	data->transmit = d / NTP_SCALE;
+ 
+ 	/* See write_packet for why this isn't an endian problem. */
+-	memcpy(&data->recvck, packet + NTP_ORIGINATE, sizeof (u_int64_t));
++	memcpy(&data->recvck, packet + NTP_ORIGINATE, sizeof (uint64_t));
+ }
+ 
+ /*

package/rdate/patches/patch-rdate_h

@@ -0,0 +1,11 @@
+--- rdate.orig/rdate.h	2007-08-16 12:38:52.000000000 +0200
++++ rdate/rdate.h	2013-12-30 23:00:23.000000000 +0100
+@@ -10,7 +10,7 @@
+ #endif
+ 
+ #ifdef EXT_A4R
+-extern u_int32_t arc4random(void);
++extern uint32_t arc4random(void);
+ #endif
+ 
+ #ifdef __MirBSD__

package/rdate/patches/patch-rfc868time_c

@@ -0,0 +1,11 @@
+--- rdate.orig/rfc868time.c	2007-08-11 01:52:47.000000000 +0200
++++ rdate/rfc868time.c	2013-12-30 23:07:29.000000000 +0100
+@@ -70,7 +70,7 @@ rfc868time_client (const char *hostname,
+ {
+ 	struct addrinfo hints, *res0, *res;
+ 	struct timeval old;
+-	u_int32_t tim;	/* RFC 868 states clearly this is an uint32 */
++	uint32_t tim;	/* RFC 868 states clearly this is an uint32 */
+ 	int s;
+ 	int error;
+ 

package/rdesktop/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		f5382c5c85b0d2cc88b9b1aa9bbf1356
 PKG_DESCR:=		client for Windows Terminal Services
 PKG_SECTION:=		net
-PKG_BUILDDEP:=		libiconv-tiny openssl
+PKG_DEPENDS:=		libsamplerate libopenssl alsa-lib libao
+PKG_BUILDDEP:=		libiconv-tiny openssl libsamplerate alsa-lib libao
 PKG_URL:=		http://www.rdesktop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 

package/rtmpdump/patches/patch-Makefile.orig

@@ -1,28 +0,0 @@
---- rtmpdump-2.4.orig/Makefile	2013-12-15 14:24:48.000000000 +0100
-+++ rtmpdump-2.4/Makefile	2013-12-15 15:17:36.000000000 +0100
-@@ -1,9 +1,9 @@
- VERSION=v2.4
- 
--prefix=/usr/local
-+prefix=/usr
- 
--CC=$(CROSS_COMPILE)gcc
--LD=$(CROSS_COMPILE)ld
-+CC=$(CROSS)gcc
-+LD=$(CROSS)ld
- 
- SYS=posix
- #SYS=mingw
-@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
- 
- DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
- OPT=-O2
--CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
--LDFLAGS=-Wall $(XLDFLAGS)
-+CFLAGS?=
-+CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF)
-+LDFLAGS?=
-+LDFLAGS+=-Wall $(XLDFLAGS)
- 
- bindir=$(prefix)/bin
- sbindir=$(prefix)/sbin

package/scsi-spin/src/scsi-spin.c

@@ -31,6 +31,7 @@
 #include <linux/major.h>
 #include <sys/sysmacros.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
 			    ((M) >= SCSI_DISK1_MAJOR && \
@@ -203,8 +204,8 @@ is_mounted( const char* device, int use_proc, int devmaj, int devmin )
   struct stat devstat;
   int mounted = 0;
   struct {
-    __uint32_t dev_id;
-    __uint32_t host_unique_id;
+    uint32_t dev_id;
+    uint32_t host_unique_id;
   } scsi_dev_id, scsi_id;
   FILE *mtab;
   char *mtabfile = use_proc ? "/proc/mounts" : "/etc/mtab";

package/tinc/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tinc
-PKG_VERSION:=		1.0.11
+PKG_VERSION:=		1.0.23
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ee0b1a3366c6e379cae34be6fa5dcb15
+PKG_MD5SUM:=		762c0d47bdf1b33a40b19165d9c2761f
 PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		zlib liblzo libopenssl kmod-tun
@@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--with-kernel=${LINUX_DIR} \
-			--with-zlib=${STAGING_TARGET_DIR}/usr/ \
+CONFIGURE_ARGS+=	--with-zlib=${STAGING_TARGET_DIR}/usr/ \
 			--with-lzo-include=${STAGING_TARGET_DIR}/usr/include/lzo
 
 tinc-install:

package/tinc/patches/patch-src_Makefile_in

@@ -1,11 +0,0 @@
---- tinc-1.0.11.orig/src/Makefile.in	2009-11-01 16:23:33.000000000 +0100
-+++ tinc-1.0.11/src/Makefile.in	2011-01-21 23:31:11.568658762 +0100
-@@ -197,7 +197,7 @@ noinst_HEADERS = conf.h connection.h dev
- tincd_LDADD = \
- 	$(top_builddir)/lib/libvpn.a
- 
--AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
-+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
- all: all-am
- 
- .SUFFIXES:

package/tinc/patches/patch-src_have_h

@@ -0,0 +1,25 @@
+--- tinc-1.0.23.orig/src/have.h	2013-09-25 21:21:09.000000000 +0200
++++ tinc-1.0.23/src/have.h	2013-12-30 19:30:24.000000000 +0100
+@@ -175,9 +175,11 @@
+ #include <netinet/ip6.h>
+ #endif
+ 
++#if defined(__GLIBC__)
+ #ifdef HAVE_NET_ETHERNET_H
+ #include <net/ethernet.h>
+ #endif
++#endif
+ 
+ #ifdef HAVE_NET_IF_ARP_H
+ #include <net/if_arp.h>
+@@ -191,8 +193,10 @@
+ #include <netinet/icmp6.h>
+ #endif
+ 
++#if defined(__GLIBC__)
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <netinet/if_ether.h>
+ #endif
++#endif
+ 
+ #endif /* __TINC_SYSTEM_H__ */

package/tinc/patches/patch-src_linux_device_c

@@ -1,20 +0,0 @@
---- tinc-1.0.11.orig/src/linux/device.c	2009-09-27 12:27:54.000000000 +0200
-+++ tinc-1.0.11/src/linux/device.c	2009-12-06 02:30:32.000000000 +0100
-@@ -61,7 +61,7 @@ bool setup_device(void) {
- 		if (netname != NULL)
- 			iface = xstrdup(netname);
- #else
--		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
-+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
- #endif
- 	device_fd = open(device, O_RDWR | O_NONBLOCK);
- 
-@@ -105,7 +105,7 @@ bool setup_device(void) {
- 		device_type = DEVICE_TYPE_ETHERTAP;
- 		if(iface)
- 			free(iface);
--		iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
-+		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
- 	}
- 
- 	logger(LOG_INFO, "%s is a %s", device, device_info);

package/traceroute/Makefile

@@ -4,14 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		traceroute
-PKG_VERSION:=		2.0.18
+PKG_VERSION:=		2.0.19
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b7254149b7f081cce07f4b9e065ba5ef
+PKG_MD5SUM:=		dd15d563993020d088ba02e8f987deaf
 PKG_DESCR:=		Utility to trace the route of IP packets
 PKG_SECTION:=		net
 PKG_URL:=		http://traceroute.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=traceroute/}
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TRACEROUTE,traceroute,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/traceroute/patches/patch-Make_rules

@@ -1,5 +1,5 @@
---- traceroute-2.0.16.orig/Make.rules	2010-09-09 16:20:46.000000000 +0200
-+++ traceroute-2.0.16/Make.rules	2010-10-11 20:07:03.000000000 +0200
+--- traceroute-2.0.19.orig/Make.rules	2012-03-27 15:49:04.000000000 +0200
++++ traceroute-2.0.19/Make.rules	2013-12-29 20:01:35.000000000 +0100
 @@ -46,14 +46,14 @@ $(call set, INSTALL, cp)
  $(call set, INDENT, true)
  
@@ -15,11 +15,11 @@
 -prefix = /usr/local
 +prefix = /usr
  
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
-@@ -125,7 +125,7 @@ _libs = $(strip $(foreach lib,$(LIBDIRS)
- 			$(wildcard $(srcdir)/$(lib)/$(lib).so \
- 					$(srcdir)/$(lib)/$(lib).a))))
+ ifneq ($(wildcard /lib64/libc.* /usr/lib64/libc.*),)
+ lib := lib64
+@@ -131,7 +131,7 @@ _libs = $(strip $(foreach _lib,$(LIBDIRS
+ 			$(wildcard $(srcdir)/$(_lib)/$(_lib).so \
+ 					$(srcdir)/$(_lib)/$(_lib).a))))
  
 -override LIBS := $(_libs) -lm $(LIBS)
 +override LIBS := $(_libs) $(LIBS)

package/traceroute/patches/patch-traceroute_csum_c

@@ -0,0 +1,17 @@
+--- traceroute-2.0.19.orig/traceroute/csum.c	2007-07-19 16:47:55.000000000 +0200
++++ traceroute-2.0.19/traceroute/csum.c	2013-12-29 20:01:35.000000000 +0100
+@@ -12,11 +12,11 @@
+ #include "traceroute.h"
+ 
+ 
+-u_int16_t in_csum (const void *ptr, size_t len) {
+-	const u_int16_t *p = (const u_int16_t *) ptr;
++uint16_t in_csum (const void *ptr, size_t len) {
++	const uint16_t *p = (const uint16_t *) ptr;
+ 	size_t nw = len / 2;
+ 	unsigned int sum = 0;
+-	u_int16_t res;
++	uint16_t res;
+ 
+ 	while (nw--)  sum += *p++;
+ 

package/traceroute/patches/patch-traceroute_extension_c

@@ -0,0 +1,61 @@
+--- traceroute-2.0.19.orig/traceroute/extension.c	2010-07-14 16:29:08.000000000 +0200
++++ traceroute-2.0.19/traceroute/extension.c	2013-12-29 20:01:35.000000000 +0100
+@@ -14,16 +14,16 @@ struct icmp_ext_header {
+ 	unsigned int reserved:4;
+ 	unsigned int version:4;
+ #endif
+-	u_int8_t reserved1;
+-	u_int16_t checksum;
++	uint8_t reserved1;
++	uint16_t checksum;
+ } __attribute__ ((packed));
+ 
+ 
+ struct icmp_ext_object {
+-	u_int16_t length;
+-	u_int8_t class;
+-	u_int8_t c_type;
+-	u_int8_t data[0];
++	uint16_t length;
++	uint8_t class;
++	uint8_t c_type;
++	uint8_t data[0];
+ };
+ 
+ #define MPLS_CLASS 1
+@@ -49,7 +49,7 @@ static int try_extension (probe *pb, cha
+ 	if (iext->version != 2)  return -1;
+ 
+ 	if (iext->checksum &&
+-	    in_csum (iext, len) != (u_int16_t) ~0
++	    in_csum (iext, len) != (uint16_t) ~0
+ 	)  return -1;
+ 
+ 	buf += sizeof (*iext);
+@@ -60,7 +60,7 @@ static int try_extension (probe *pb, cha
+ 	    struct icmp_ext_object *obj = (struct icmp_ext_object *) buf;
+ 	    size_t objlen = ntohs (obj->length);
+ 	    size_t data_len;
+-	    u_int32_t *ui = (u_int32_t *) obj->data;
++	    uint32_t *ui = (uint32_t *) obj->data;
+ 	    int i, n;
+ 
+ 	    if (objlen < sizeof (*obj) ||
+@@ -68,7 +68,7 @@ static int try_extension (probe *pb, cha
+ 	    )  return -1;
+ 
+ 	    data_len = objlen - sizeof (*obj);
+-	    if (data_len % sizeof (u_int32_t))
++	    if (data_len % sizeof (uint32_t))
+ 		    return -1;	/*  must be 32bit rounded...  */
+ 
+ 	    n = data_len / sizeof (*ui);
+@@ -85,7 +85,7 @@ static int try_extension (probe *pb, cha
+ 		do_snprintf (curr, end, "MPLS:");
+ 
+ 		for (i = 0; i < n; i++, ui++) {
+-		    u_int32_t mpls = ntohl (*ui);
++		    uint32_t mpls = ntohl (*ui);
+ 
+ 		    do_snprintf (curr, end, "%sL=%u,E=%u,S=%u,T=%u",
+ 					i ? "/" : "",