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

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		57
+PKG_RELEASE:=		58
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 

package/base-files/src/init

@@ -7,7 +7,7 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
   size=$(cat /etc/tmpfs 2>/dev/null)
   [ -z $size ] && size=2048
-  mount tmpfs /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=${size}k
+  mount -o nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
 }
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 [ -d /dev/pts ] || mkdir /dev/pts 

package/bcm2835-vc/Makefile

@@ -11,6 +11,7 @@ PKG_DESCR:=		vc tools for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 PKG_SUBPKGS:=		BCM2835_VC BCM2835_VC_DEV

package/busybox/Makefile

@@ -38,7 +38,7 @@ BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
 			-C ${WRKBUILD} 
 ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
+BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS="-static-libgcc"
 else
 BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
 endif

package/busybox/patches/014-disable-static-libgcc.patch

@@ -0,0 +1,12 @@
+diff -Nur busybox-1.20.2.orig/Makefile.flags busybox-1.20.2/Makefile.flags
+--- busybox-1.20.2.orig/Makefile.flags	2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.20.2/Makefile.flags	2013-08-13 14:25:53.000000000 +0200
+@@ -50,7 +50,7 @@
+ # -fno-guess-branch-probability: prohibit pseudo-random guessing
+ # of branch probabilities (hopefully makes bloatcheck more stable):
+ CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
+-CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
++CFLAGS += $(call cc-option,-funsigned-char,)
+ CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
+ 
+ # FIXME: These warnings are at least partially to be concerned about and should

package/cfgfs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.9
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
 PKG_URL:=		http://openadk.org/
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-
 TARGET_LDFLAGS+=	-static-libgcc
 
 do-install:

package/cfgfs/src/adler.h

@@ -45,7 +45,7 @@
    by the 'buffer' argument, size expected in 'len'
    which is TRASHED; stores the result in s1 and s2 */
 #define ADLER_CALC(buffer)	do {					\
-		const uint8_t *adler_buf = (const uint8_t *)(buffer);	\
+		const u_int8_t *adler_buf = (const u_int8_t *)(buffer);	\
 		while (len) {						\
 			len -= (n = MIN(len, ADLER_NMAX));		\
 			while (n--) {					\

package/cfgfs/src/compress.c

@@ -28,8 +28,6 @@
 #include "defs.h"
 #include "compress.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/compress.c,v 1.7 2006/09/23 23:46:35 tg Exp $");
-
 static void compress_initialise(void);
 
 static fwcf_compressor *fwcf_compressors = NULL;

package/cfgfs/src/compress.h

@@ -9,6 +9,8 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
+#include <sys/types.h>
+
 /* BEGIN of plug-in API description - hook yer proprietary modules here */
 
 /* returns 0 on success, -1 on failure */
@@ -28,25 +30,21 @@ typedef struct FWCF_COMPRESSOR {
 	fwcf_compress_work_func compress;
 	fwcf_compress_rev_func decompress;
 	const char *name;
-	uint8_t code;
+	u_int8_t code;
 } fwcf_compressor;
 
-__BEGIN_DECLS
 /* 0=success 1=EINVAL 2=slot already used */
 int compress_register(fwcf_compressor *);
-__END_DECLS
 
 /* END of plug-in API description, version 1.0 */
 
-__BEGIN_DECLS
 /* low-level */
 fwcf_compressor *compress_enumerate(void);
 int compress_list(void);
 
 /* high-level */
-fwcf_compressor *compressor_get(uint8_t);
+fwcf_compressor *compressor_get(u_int8_t);
 int compressor_getbyname(const char *);
 int list_compressors(void);
-__END_DECLS
 
 #endif

package/cfgfs/src/cpr_get.c

@@ -29,10 +29,8 @@
 #include "defs.h"
 #include "compress.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/cpr_get.c,v 1.4 2007/03/09 22:35:13 tg Exp $");
-
 fwcf_compressor *
-compressor_get(uint8_t algo)
+compressor_get(u_int8_t algo)
 {
 	fwcf_compressor *list;
 

package/cfgfs/src/defs.h

@@ -18,13 +18,6 @@
 #define __RCSID(x)	static const char __rcsid[] __attribute__((used)) = (x)
 #endif
 
-#ifndef BSD
-#define uint8_t		u_int8_t
-#define uint16_t	u_int16_t
-#define uint32_t	u_int32_t
-#define uint64_t	u_int64_t
-#endif
-
 #ifndef __dead
 #define __dead		__attribute__((noreturn))
 #endif

package/cfgfs/src/ft_creat.c

@@ -35,12 +35,10 @@
 #include "defs.h"
 #include "pack.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/ft_creat.c,v 1.2 2006/09/23 23:21:04 tg Exp $");
-
 static size_t ft_creat(char *);
-static void make_directory(char *, uint32_t, uint32_t, uint32_t, time_t);
-static void make_file(char *, uint8_t *, size_t);
-static void make_symlink(char *, uint8_t *, size_t);
+static void make_directory(char *, u_int32_t, u_int32_t, u_int32_t, time_t);
+static void make_file(char *, u_int8_t *, size_t);
+static void make_symlink(char *, u_int8_t *, size_t);
 static void pop_directories(void);
 static void do_chown(char *, uid_t, gid_t);
 static void do_chmod(char *, mode_t);
@@ -74,14 +72,14 @@ ft_creatm(char *buf, const char *pathname)
 static size_t
 ft_creat(char *buf)
 {
-	uint8_t c, *p;
+	u_int8_t c, *p;
 	char *fname;
 	size_t i, type = 0, size = 0;
-	uint32_t x_uid = 0, x_gid = 0, x_mode = 0;
+	u_int32_t x_uid = 0, x_gid = 0, x_mode = 0;
 	time_t x_mtime = 0;
 
 	i = strlen(buf) + 1;
-	p = (uint8_t *)buf + i;
+	p = (u_int8_t *)buf + i;
 	fname = pfxname(buf);
 	while (*p)
 		switch (c = *p++) {
@@ -183,11 +181,11 @@ ft_creat(char *buf)
 	if (type != 3)
 		free(fname);
 
-	return ((p - (uint8_t *)buf) + size);
+	return ((p - (u_int8_t *)buf) + size);
 }
 
 static void
-make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
+make_directory(char *n, u_int32_t m, u_int32_t u, u_int32_t g, time_t t)
 {
 	struct a_directory *newdir;
 
@@ -209,7 +207,7 @@ make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
 }
 
 static void
-make_file(char *n, uint8_t *buf, size_t len)
+make_file(char *n, u_int8_t *buf, size_t len)
 {
 	int fd;
 
@@ -221,14 +219,14 @@ make_file(char *n, uint8_t *buf, size_t len)
 	}
 
 	if ((size_t)write(fd, buf, len) != len)
-		warn("could not write %lu bytes", (u_long)len);
+		warn("could not write %lu bytes", (unsigned long)len);
 
 	if (close(fd))
 		warn("close");
 }
 
 static void
-make_symlink(char *n, uint8_t *buf, size_t len)
+make_symlink(char *n, u_int8_t *buf, size_t len)
 {
 	char target[len + 1];
 

package/cfgfs/src/fts.c

@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 
 #include "defs.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
-
 #define internal_function
 
 /* Largest alignment size needed, minus one.
@@ -67,15 +65,15 @@ __RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
 #endif
 
 
-static FTSENT	*fts_alloc __P((FTS *, const char *, int)) internal_function;
-static FTSENT	*fts_build __P((FTS *, int)) internal_function;
-static void	 fts_lfree __P((FTSENT *)) internal_function;
-static void	 fts_load __P((FTS *, FTSENT *)) internal_function;
-static size_t	 fts_maxarglen __P((char * const *)) internal_function;
-static void	 fts_padjust __P((FTS *, FTSENT *)) internal_function;
-static int	 fts_palloc __P((FTS *, size_t)) internal_function;
-static FTSENT	*fts_sort __P((FTS *, FTSENT *, int)) internal_function;
-static u_short	 fts_stat __P((FTS *, FTSENT *, int)) internal_function;
+static FTSENT	*fts_alloc (FTS *, const char *, int) internal_function;
+static FTSENT	*fts_build (FTS *, int) internal_function;
+static void	 fts_lfree (FTSENT *) internal_function;
+static void	 fts_load (FTS *, FTSENT *) internal_function;
+static size_t	 fts_maxarglen (char * const *) internal_function;
+static void	 fts_padjust (FTS *, FTSENT *) internal_function;
+static int	 fts_palloc (FTS *, size_t) internal_function;
+static FTSENT	*fts_sort (FTS *, FTSENT *, int) internal_function;
+static u_short	 fts_stat (FTS *, FTSENT *, int) internal_function;
 static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
 
 #ifndef MAX
@@ -101,7 +99,7 @@ FTS *
 fts_open(argv, options, compar)
 	char * const *argv;
 	register int options;
-	int (*compar) __P((const FTSENT **, const FTSENT **));
+	int (*compar) (const FTSENT **, const FTSENT **);
 {
 	register FTS *sp;
 	register FTSENT *p, *root;
@@ -119,7 +117,7 @@ fts_open(argv, options, compar)
 	if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
 		return (NULL);
 	memset(sp, 0, sizeof(FTS));
-	sp->fts_compar = (int (*) __P((const void *, const void *))) compar;
+	sp->fts_compar = (int (*) (const void *, const void *)) compar;
 	sp->fts_options = options;
 
 	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
@@ -694,11 +692,11 @@ fts_build(sp, type)
 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
 			continue;
 
-		if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
+		if ((p = fts_alloc(sp, dp->d_name, (int)strlen(dp->d_name))) == NULL)
 			goto mem1;
-		if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
+		if (strlen(dp->d_name) >= maxlen) {/* include space for NUL */
 			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
+			if (fts_palloc(sp, strlen(dp->d_name) + len + 1)) {
 				/*
 				 * No more memory for path or structures.  Save
 				 * errno, free up the current structure and the
@@ -723,7 +721,7 @@ mem1:				saved_errno = errno;
 			maxlen = sp->fts_pathlen - len;
 		}
 
-		if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
+		if (len + strlen(dp->d_name) >= USHRT_MAX) {
 			/*
 			 * In an FTSENT, fts_pathlen is a u_short so it is
 			 * possible to wraparound here.  If we do, free up
@@ -740,7 +738,7 @@ mem1:				saved_errno = errno;
 		}
 		p->fts_level = level;
 		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
+		p->fts_pathlen = len + strlen(dp->d_name);
 
 #if defined FTS_WHITEOUT && 0
 		if (dp->d_type == DT_WHT)

package/cfgfs/src/fts_gnu.h

@@ -123,15 +123,11 @@ typedef struct _ftsent {
 	char fts_name[1];		/* file name */
 } FTSENT;
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
 FTS	*fts_open(char * const *, int,
 	    int (*)(const FTSENT **, const FTSENT **));
 FTSENT	*fts_read(FTS *);
 int	 fts_set(FTS *, FTSENT *, int);
-__END_DECLS
 
 #endif /* !_FTS_H_ */

package/cfgfs/src/fts_subs.c

@@ -37,8 +37,6 @@
 #define FTSF_INTERNALS
 #include "fts_subs.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/fts_subs.c,v 1.8 2007/07/02 14:53:03 tg Exp $");
-
 static FTS *handle;
 
 char ftsf_prefix[PATH_MAX];

package/cfgfs/src/fts_subs.h

@@ -27,11 +27,9 @@ typedef struct FTSF_ENTRY ftsf_entry;
 extern const char ftsf_prefix[];
 #endif
 
-__BEGIN_DECLS
 void ftsf_start(const char *);
 /* returns -1 on error, 0 on empty, 1 on okay */
 int ftsf_next(ftsf_entry *);
 void ftsf_debugent(ftsf_entry *);
-__END_DECLS
 
 #endif

package/cfgfs/src/header.c

@@ -33,12 +33,9 @@
 #include "adler.h"
 #include "pack.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/header.c,v 1.7 2006/09/26 10:25:03 tg Exp $"
-    "\t" ADLER_H);
-
 char *
-mkheader(char *f_header, size_t hdrsize, uint32_t outer_len,
-    uint32_t inner_len, uint8_t algo)
+mkheader(char *f_header, size_t hdrsize, u_int32_t outer_len,
+    u_int32_t inner_len, u_int8_t algo)
 {
 	char *hdrptr = f_header;
 	size_t hdrleft = hdrsize;
@@ -68,7 +65,7 @@ mktrailer(char *data, size_t len)
 	size_t hdrleft = 4;
 	ADLER_DECL;
 #ifdef DEBUG_ADLER
-	uint32_t adler = adler32(1, (uint8_t *)data, len);
+	u_int32_t adler = adler32(1, (u_int8_t *)data, len);
 #endif
 
 	ADLER_CALC(data);

package/cfgfs/src/minilzop.c

@@ -32,19 +32,17 @@
 #include "compress.h"
 #include "minilzop.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/minilzop.c,v 1.2 2007/03/09 22:25:45 tg Exp $");
-
 #define lodsw(s)	__extension__({				\
-		const uint8_t *lodsw_buf = (const uint8_t *)(s);\
-		uint16_t lodsw_val;				\
+		const u_int8_t *lodsw_buf = (const u_int8_t *)(s);\
+		u_int16_t lodsw_val;				\
 								\
 		lodsw_val = lodsw_buf[0];			\
 		lodsw_val |= lodsw_buf[1] << 8;			\
 		(lodsw_val);					\
 	})
 #define lodsd(s)	__extension__({				\
-		const uint8_t *lodsd_buf = (const uint8_t *)(s);\
-		uint32_t lodsd_val;				\
+		const u_int8_t *lodsd_buf = (const u_int8_t *)(s);\
+		u_int32_t lodsd_val;				\
 								\
 		lodsd_val = lodsd_buf[0];			\
 		lodsd_val |= lodsd_buf[1] << 8;			\
@@ -53,15 +51,15 @@ __RCSID("$MirOS: contrib/hosted/fwcf/minilzop.c,v 1.2 2007/03/09 22:25:45 tg Exp
 		(lodsd_val);					\
 	})
 #define stosw(s,w)	do {					\
-		uint8_t *stosw_buf = (uint8_t *)(s);		\
-		uint16_t stosw_val = (w);			\
+		u_int8_t *stosw_buf = (u_int8_t *)(s);		\
+		u_int16_t stosw_val = (w);			\
 								\
 		stosw_buf[0] = stosw_val & 0xFF;		\
 		stosw_buf[1] = (stosw_val >> 8) & 0xFF;		\
 	} while (0)
 #define stosd(s,dw)	do {					\
-		uint8_t *stosd_buf = (uint8_t *)(s);		\
-		uint32_t stosd_val = (dw);			\
+		u_int8_t *stosd_buf = (u_int8_t *)(s);		\
+		u_int32_t stosd_val = (dw);			\
 								\
 		stosd_buf[0] = stosd_val & 0xFF;		\
 		stosd_buf[1] = (stosd_val >> 8) & 0xFF;		\
@@ -73,7 +71,7 @@ void
 read_aszdata(int dfd, char **dbuf, size_t *dlen)
 {
 	size_t len;
-	uint8_t hdrbuf[8];
+	u_int8_t hdrbuf[8];
 	ADLER_DECL;
 
 	if (read(dfd, hdrbuf, 8) != 8)
@@ -97,7 +95,7 @@ void
 write_aszdata(int dfd, const char *dbuf, size_t dlen)
 {
 	size_t len;
-	uint8_t hdrbuf[8];
+	u_int8_t hdrbuf[8];
 	ADLER_DECL;
 
 	stosd(hdrbuf + 4, dlen);

package/cfgfs/src/minilzop.h

@@ -9,11 +9,9 @@
 #ifndef MINILZOP_H
 #define MINILZOP_H
 
-__BEGIN_DECLS
 int minilzop(int ifd, int ofd, int compr_alg, int decompress);
 /* TODO: use the two below for the “outer filesystem” as well */
 void read_aszdata(int, char **, size_t *);
 void write_aszdata(int, const char *, size_t);
-__END_DECLS
 
 #endif

package/cfgfs/src/pack.h

@@ -9,6 +9,8 @@
 #ifndef PACK_H
 #define PACK_H
 
+#include <sys/types.h>
+
 struct FTSF_ENTRY;
 #ifndef FTS_SUBS_H
 typedef struct FTSF_ENTRY ftsf_entry;
@@ -51,16 +53,16 @@ typedef struct FTSF_ENTRY ftsf_entry;
 	} while (0)
 
 #define LOADW(x) __extension__({		\
-		uint8_t *lwbf = (uint8_t *)(x);	\
-		uint32_t res = 0;		\
+		u_int8_t *lwbf = (u_int8_t *)(x);	\
+		u_int32_t res = 0;		\
 		res = (res << 8) | lwbf[1];	\
 		res = (res << 8) | lwbf[0];	\
 		res;				\
 	})
 
 #define LOADT(x) __extension__({		\
-		uint8_t *lwbf = (uint8_t *)(x);	\
-		uint32_t res = 0;		\
+		u_int8_t *lwbf = (u_int8_t *)(x);	\
+		u_int32_t res = 0;		\
 		res = (res << 8) | lwbf[2];	\
 		res = (res << 8) | lwbf[1];	\
 		res = (res << 8) | lwbf[0];	\
@@ -68,8 +70,8 @@ typedef struct FTSF_ENTRY ftsf_entry;
 	})
 
 #define LOADD(x) __extension__({		\
-		uint8_t *lwbf = (uint8_t *)(x);	\
-		uint32_t res = 0;		\
+		u_int8_t *lwbf = (u_int8_t *)(x);	\
+		u_int32_t res = 0;		\
 		res = (res << 8) | lwbf[3];	\
 		res = (res << 8) | lwbf[2];	\
 		res = (res << 8) | lwbf[1];	\
@@ -77,11 +79,10 @@ typedef struct FTSF_ENTRY ftsf_entry;
 		res;				\
 	})
 
-__BEGIN_DECLS
 char *ft_pack(ftsf_entry *);
 char *ft_packm(void);
 
-char *mkheader(char *, size_t, uint32_t, uint32_t, uint8_t);
+char *mkheader(char *, size_t, u_int32_t, u_int32_t, u_int8_t);
 char *mktrailer(char *, size_t);
 
 void ft_dump(char *);
@@ -90,6 +91,5 @@ void ft_creatm(char *, const char *);
 char *fwcf_unpack(int, size_t *);
 char *fwcf_pack(char *, size_t, int, size_t *);
 char *fwcf_packm(const char *, int, size_t *);
-__END_DECLS
 
 #endif

package/cfgfs/src/sys_linux.c

@@ -23,6 +23,7 @@
 
 #include <err.h>
 #include <fcntl.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -30,8 +31,6 @@
 #include "defs.h"
 #include "sysdeps.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/sys_linux.c,v 1.3 2006/09/26 10:25:03 tg Exp $");
-
 void
 pull_rndata(uint8_t *buf, size_t n)
 {
@@ -42,7 +41,7 @@ pull_rndata(uint8_t *buf, size_t n)
 		return;
 	}
 	if ((size_t)read(fd, buf, n) != n)
-		warn("Cannot read %lu bytes from /dev/urandom", (u_long)n);
+		warn("Cannot read %lu bytes from /dev/urandom", (unsigned long)n);
 	close(fd);
 }
 
@@ -56,6 +55,6 @@ push_rndata(uint8_t *buf, size_t n)
 		return;
 	}
 	if ((size_t)write(fd, buf, n) != n)
-		warn("Cannot write %lu bytes to /dev/urandom", (u_long)n);
+		warn("Cannot write %lu bytes to /dev/urandom", (unsigned long)n);
 	close(fd);
 }

package/cfgfs/src/sysdeps.h

@@ -9,9 +9,9 @@
 #ifndef SYSDEPS_H
 #define SYSDEPS_H
 
-__BEGIN_DECLS
-void pull_rndata(uint8_t *, size_t);
-void push_rndata(uint8_t *, size_t);
-__END_DECLS
+#include <sys/types.h>
+
+void pull_rndata(u_int8_t *, size_t);
+void push_rndata(u_int8_t *, size_t);
 
 #endif

package/cfgfs/src/tool.c

@@ -32,8 +32,6 @@
 #include "minilzop.h"
 #include "pack.h"
 
-__RCSID("$MirOS: contrib/hosted/fwcf/tool.c,v 1.7 2007/03/09 22:35:13 tg Exp $");
-
 static __dead void usage(void);
 static int mkfwcf(int, const char *, int);
 static int unfwcf(int, const char *);

package/cfgfs/src/unwraps.c

@@ -41,7 +41,7 @@ __RCSID("$MirOS: contrib/hosted/fwcf/unwraps.c,v 1.10 2006/09/26 10:25:03 tg Exp
 char *
 fwcf_unpack(int fd, size_t *inner)
 {
-	uint8_t c, hdrbuf[12];
+	u_int8_t c, hdrbuf[12];
 	size_t outer, x_inner, x, len, maxln;
 	char *cdata, *udata;
 	ADLER_DECL;
@@ -77,19 +77,19 @@ fwcf_unpack(int fd, size_t *inner)
 	if ((s1 != LOADW(cdata + outer - 4)) ||
 	    (s2 != LOADW(cdata + outer - 2)))
 		errx(1, "crc mismatch: %02X%02X%02X%02X != %04X%04X",
-		    (uint8_t)cdata[outer - 1], (uint8_t)cdata[outer - 2],
-		    (uint8_t)cdata[outer - 3], (uint8_t)cdata[outer - 4],
+		    (u_int8_t)cdata[outer - 1], (u_int8_t)cdata[outer - 2],
+		    (u_int8_t)cdata[outer - 3], (u_int8_t)cdata[outer - 4],
 		    s2, s1);
 
 	if ((x = compressor_get(c)->decompress(udata, *inner, cdata + 12,
 	    outer - 16)) != *inner)
-		errx(1, "size mismatch: decompressed %lu, want %lu", (u_long)x,
-		    (u_long)*inner);
-	push_rndata((uint8_t *)cdata + outer, maxln - outer);
+		errx(1, "size mismatch: decompressed %lu, want %lu", (unsigned long)x,
+		    (unsigned long)*inner);
+	push_rndata((u_int8_t *)cdata + outer, maxln - outer);
 	free(cdata);
 #ifdef DEBUG
 	fprintf(stderr, "fwcf_unpack: decompressed outer %lu inner %lu\n",
-	    (u_long)outer, (u_long)*inner);
+	    (unsigned long)outer, (unsigned long)*inner);
 #endif
 	return (udata);
 }

package/cfgfs/src/wraps.c

@@ -67,9 +67,9 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz)
 	char *data, *cdata;
 
 	if (i > 0xFFFFFF)
-		errx(1, "inner size of %lu too large", (u_long)i);
+		errx(1, "inner size of %lu too large", (unsigned long)i);
 #ifdef DEBUG
-	fprintf(stderr, "fwcf_pack: algo %02X packing %lu\n", algo, (u_long)i);
+	fprintf(stderr, "fwcf_pack: algo %02X packing %lu\n", algo, (unsigned long)i);
 #endif
 
 	if ((j = compressor_get(algo)->compress(&cdata, odata, i)) == -1)
@@ -92,6 +92,6 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz)
 		data[k++] = 0;
 	mktrailer(data, k);
 	k += 4;
-	pull_rndata((uint8_t *)data + k, *dstsz - k);
+	pull_rndata((u_int8_t *)data + k, *dstsz - k);
 	return (data);
 }

package/dropbear/Makefile

@@ -27,6 +27,12 @@ $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	$(ADK_TARGET_ABI_CFLAGS)
+
+ifeq ($(ADK_STATIC),y)
+TARGET_LDFLAGS+=	-static
+endif
+
+TARGET_LDFLAGS+=	-static-libgcc
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 CONFIGURE_ARGS+=	--disable-pam \

package/dropbear/patches/patch-Makefile_in

@@ -1,5 +1,5 @@
---- dropbear-2012.55.orig/Makefile.in	2012-02-23 14:47:05.000000000 +0100
-+++ dropbear-2012.55/Makefile.in	2012-10-05 17:24:16.000000000 +0200
+--- dropbear-2013.58.orig/Makefile.in	2013-04-18 16:58:14.000000000 +0200
++++ dropbear-2013.58/Makefile.in	2013-08-13 14:33:37.000000000 +0200
 @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
  		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
  		listener.h fake-rfc2553.h
@@ -9,28 +9,21 @@
  dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
  dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
  dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -75,9 +75,8 @@ AR=@AR@
+@@ -75,10 +75,9 @@ AR=@AR@
  RANLIB=@RANLIB@
  STRIP=@STRIP@
  INSTALL=@INSTALL@
 -CPPFLAGS=@CPPFLAGS@
 -CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
 -LIBS+=@LIBS@
+-LDFLAGS=@LDFLAGS@
 +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)
 +LIBS+=@LIBS@ @CRYPTLIB@
- LDFLAGS=@LDFLAGS@
++LDFLAGS+=@LDFLAGS@
  
  EXEEXT=@EXEEXT@
-@@ -159,7 +158,7 @@ dropbearkey: $(dropbearkeyobjs)
- dropbearconvert: $(dropbearconvertobjs)
  
- dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
-+	$(CC) $(LDFLAGS) -static-libgcc -o $@$(EXEEXT) $($@objs) $(LIBS)
- 
- # scp doesn't use the libs so is special.
- scp: $(SCPOBJS)  $(HEADERS) Makefile
-@@ -169,14 +168,14 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
+@@ -169,7 +168,7 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
  # multi-binary compilation.
  MULTIOBJS=
  ifeq ($(MULTI),1)
@@ -39,11 +32,3 @@
  	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
  endif
  
- dropbearmulti: multilink 
- 
- multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
--	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -static-libgcc -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
- 
- multilink: multibinary $(addprefix link, $(PROGRAMS))
- 

package/dropbear/patches/patch-cli-runopts_c

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-0.53.1.orig/cli-runopts.c	2011-03-02 14:23:35.000000000 +0100
-+++ dropbear-0.53.1/cli-runopts.c	2011-08-02 20:03:12.000000000 +0200
-@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv)
+--- dropbear-2013.58.orig/cli-runopts.c	2013-04-18 16:58:14.000000000 +0200
++++ dropbear-2013.58/cli-runopts.c	2013-08-13 14:29:15.000000000 +0200
+@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv)
  					debug_trace = 1;
  					break;
  #endif
@@ -11,8 +11,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +					break;
  				case 'F':
  				case 'e':
- 				case 'c':
-@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv)
+ #ifndef ENABLE_USER_ALGO_LIST
+@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv)
  #ifndef ENABLE_CLI_LOCALTCPFWD
  				case 'L':
  #endif

package/dropbear/patches/patch-options_h

@@ -1,7 +1,7 @@
 diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
 --- dropbear-2013.58.orig/options.h	2013-04-18 16:58:14.000000000 +0200
-+++ dropbear-2013.58/options.h	2013-04-29 14:28:47.000000000 +0200
-@@ -247,7 +247,7 @@
++++ dropbear-2013.58/options.h	2013-08-13 14:29:15.000000000 +0200
+@@ -247,7 +247,7 @@ much traffic. */
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
  #ifndef XAUTH_COMMAND

package/gdb/Makefile

@@ -16,16 +16,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#ifeq ($(ADK_STATIC),y)
-#TARGET_CFLAGS+=         -static
-#endif
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=         -static
+endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS} -fPIC
 CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
 			--disable-tui --disable-gdbtk --without-x \
 			--without-included-gettext --disable-sim \
-			--enable-threads --with-curses --disable-werror \
+			--with-curses --disable-werror \
+			--disable-gdbserver \
 			--enable-static --without-python
 XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
 # disable honour cflags stuff

package/gdb/patches/patch-gdb_common_gdb_thread_db_h

@@ -0,0 +1,35 @@
+--- gdb-7.6.orig/gdb/common/gdb_thread_db.h	2013-01-01 07:32:54.000000000 +0100
++++ gdb-7.6/gdb/common/gdb_thread_db.h	2013-08-13 16:37:40.000000000 +0200
+@@ -1,17 +1,6 @@
+ #ifdef HAVE_THREAD_DB_H
+ #include <thread_db.h>
+ 
+-#ifndef LIBTHREAD_DB_SO
+-#define LIBTHREAD_DB_SO "libthread_db.so.1"
+-#endif
+-
+-#ifndef LIBTHREAD_DB_SEARCH_PATH
+-/* $sdir appears before $pdir for some minimal security protection:
+-   we trust the system libthread_db.so a bit more than some random
+-   libthread_db associated with whatever libpthread the app is using.  */
+-#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
+-#endif
+-
+ #else
+ 
+ /* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+@@ -453,3 +442,14 @@ extern td_err_e td_thr_dbresume (const t
+ #endif	/* thread_db.h */
+ 
+ #endif /* HAVE_THREAD_DB_H */
++
++#ifndef LIBTHREAD_DB_SO
++#define LIBTHREAD_DB_SO "libthread_db.so.1"
++#endif
++
++#ifndef LIBTHREAD_DB_SEARCH_PATH
++/* $sdir appears before $pdir for some minimal security protection:
++   we trust the system libthread_db.so a bit more than some random
++   libthread_db associated with whatever libpthread the app is using.  */
++#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
++#endif

package/gdb/patches/patch-gdb_common_linux-ptrace_h

@@ -0,0 +1,10 @@
+--- gdb-7.6.orig/gdb/common/linux-ptrace.h	2013-01-01 07:32:54.000000000 +0100
++++ gdb-7.6/gdb/common/linux-ptrace.h	2013-08-13 17:10:13.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ struct buffer;
+ 
++#include <unistd.h>
+ #include <sys/ptrace.h>
+ 
+ #ifndef PTRACE_GETSIGINFO

package/gdb/patches/patch-gdb_linux-nat_c

@@ -0,0 +1,26 @@
+--- gdb-7.6.orig/gdb/linux-nat.c	2013-02-13 15:59:49.000000000 +0100
++++ gdb-7.6/gdb/linux-nat.c	2013-08-13 17:01:09.000000000 +0200
+@@ -79,6 +79,14 @@
+ # endif
+ #endif /* HAVE_PERSONALITY */
+ 
++#ifndef __SIGRTMIN
++#define __SIGRTMIN SIGRTMIN
++#endif
++
++#ifndef W_STOPCODE
++#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
++#endif
++
+ /* This comment documents high-level logic of this file.
+ 
+ Waiting for events in sync mode
+@@ -2379,7 +2387,7 @@ linux_handle_extended_wait (struct lwp_i
+ 		status = 0;
+ 	    }
+ 
+-	  if (non_stop)
++	  if (1)
+ 	    {
+ 	      /* Add the new thread to GDB's lists as soon as possible
+ 		 so that:

package/glibc/Makefile

@@ -10,7 +10,6 @@ include $(TOPDIR)/toolchain/glibc/Makefile.inc
 include $(TOPDIR)/toolchain/glibc/Makefile.multilib
 
 PKG_DESCR:=		GNU C library
-PKG_VER:=		2.16
 PKG_SECTION:=		base
 PKG_OPTS:=		noremove
 PKG_SUBPKGS:=		GLIBC GLIBC_DEV GLIBC_STATIC
@@ -47,7 +46,7 @@ else
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH)
 	for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
-		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
+		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \
 	done
 	${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
@@ -79,7 +78,7 @@ endif
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
 	-for file in libcrypt libdl libm libresolv libutil; do \
-		cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VER).so $$file.so; \
+		cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \
 	done
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \

package/libnfsidmap/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libnfsidmap
 PKG_VERSION:=		0.25
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2ac4893c92716add1a1447ae01df77ab
 PKG_DESCR:=		idmap library for NFSv4
 PKG_SECTION:=		libs

package/libnfsidmap/patches/patch-cfg_c

@@ -0,0 +1,10 @@
+--- libnfsidmap-0.25.orig/cfg.c	2011-12-05 21:28:10.000000000 +0100
++++ libnfsidmap-0.25/cfg.c	2013-08-13 12:25:51.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include <sys/mman.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <ctype.h>

package/libpthread/Makefile

@@ -9,6 +9,9 @@ endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
 include ${TOPDIR}/toolchain/eglibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+include ${TOPDIR}/toolchain/musl/Makefile.inc
+endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
@@ -41,7 +44,9 @@ INSTALL_STYLE:=		manual
 libpthread-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libthread_db/Makefile

@@ -9,6 +9,9 @@ endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
 include ${TOPDIR}/toolchain/eglibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+include ${TOPDIR}/toolchain/musl/Makefile.inc
+endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
@@ -30,7 +33,9 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
+ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
 endif
+endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libtirpc/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		0.2.2
+PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		74c41c15c2909f7d11d9c7bfa7db6273
+PKG_MD5SUM:=		b70e6c12a369a91e69fcc3b9feb23d61
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgssglue

package/libtirpc/patches/patch-src_Makefile_in

@@ -1,47 +1,34 @@
---- libtirpc-0.2.2.orig/src/Makefile.in	2011-05-02 14:31:55.000000000 +0200
-+++ libtirpc-0.2.2/src/Makefile.in	2012-03-27 22:24:03.971238587 +0200
-@@ -81,8 +81,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
+--- libtirpc-0.2.3.orig/src/Makefile.in	2013-02-13 16:15:08.000000000 +0100
++++ libtirpc-0.2.3/src/Makefile.in	2013-08-12 18:41:07.000000000 +0200
+@@ -103,7 +103,7 @@ am__libtirpc_la_SOURCES_DIST = auth_none
  	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
- 	svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \
--	svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \
--	authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.c \
-+	svc_simple.c svc_vc.c getpeereid.c \
-+	des_crypt.c xdr.c xdr_rec.c xdr_array.c \
- 	xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
- 	authgss_prot.c svc_auth_gss.c svc_auth_none.c
+ 	svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \
+ 	svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+-	auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \
++	xdr.c xdr_rec.c \
+ 	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+ 	auth_gss.c authgss_prot.c svc_auth_gss.c
  @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
-@@ -110,8 +110,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
- 	libtirpc_la-svc_generic.lo libtirpc_la-svc_raw.lo \
- 	libtirpc_la-svc_run.lo libtirpc_la-svc_simple.lo \
- 	libtirpc_la-svc_vc.lo libtirpc_la-getpeereid.lo \
--	libtirpc_la-auth_time.lo libtirpc_la-auth_des.lo \
--	libtirpc_la-authdes_prot.lo libtirpc_la-des_crypt.lo \
-+	libtirpc_la-des_crypt.lo \
+@@ -130,8 +130,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
+ 	libtirpc_la-svc_auth_none.lo libtirpc_la-svc_generic.lo \
+ 	libtirpc_la-svc_raw.lo libtirpc_la-svc_run.lo \
+ 	libtirpc_la-svc_simple.lo libtirpc_la-svc_vc.lo \
+-	libtirpc_la-getpeereid.lo libtirpc_la-auth_time.lo \
+-	libtirpc_la-auth_des.lo libtirpc_la-authdes_prot.lo \
++	libtirpc_la-getpeereid.lo \
  	libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \
  	libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \
  	libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \
-@@ -291,7 +290,7 @@ lib_LTLIBRARIES = libtirpc.la
- # release number of your package. This is an abuse that only fosters
- # misunderstanding of the purpose of library versions."
- #
--libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 \
-+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 \
- 	$(am__append_2)
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
- 	bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \
-@@ -302,8 +301,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
- 	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
+@@ -327,7 +326,7 @@ libtirpc_la_SOURCES = auth_none.c auth_u
  	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
- 	svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \
--	svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \
--	authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.c \
-+	svc_simple.c svc_vc.c getpeereid.c \
-+	des_crypt.c xdr.c xdr_rec.c xdr_array.c \
- 	xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+ 	svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \
+ 	svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+-	auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \
++	xdr.c xdr_rec.c \
+ 	xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
  	$(am__append_1)
  @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
-@@ -381,12 +380,9 @@ mostlyclean-compile:
+@@ -408,10 +407,8 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -50,7 +37,33 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_none.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_time.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_unix.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authdes_prot.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authdes_prot.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authunix_prot.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-bindresvport.Plo@am__quote@
+@@ -779,27 +776,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c
+ 
+-libtirpc_la-auth_time.lo: auth_time.c
+-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
+-
+-libtirpc_la-auth_des.lo: auth_des.c
+-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
+-
+-libtirpc_la-authdes_prot.lo: authdes_prot.c
+-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
+-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='authdes_prot.c' object='libtirpc_la-authdes_prot.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
+-
+ libtirpc_la-xdr.lo: xdr.c
+ @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-xdr.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-xdr.Tpo -c -o libtirpc_la-xdr.lo `test -f 'xdr.c' || echo '$(srcdir)/'`xdr.c
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtirpc_la-xdr.Tpo $(DEPDIR)/libtirpc_la-xdr.Plo

package/libtirpc/patches/patch-src_des_crypt_c

@@ -1,6 +1,6 @@
---- libtirpc-0.2.2.orig/src/des_crypt.c	2011-05-02 14:10:40.000000000 +0200
-+++ libtirpc-0.2.2/src/des_crypt.c	2012-03-22 19:23:01.213747585 +0100
-@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)des_crypt.c	
+--- libtirpc-0.2.3.orig/src/des_crypt.c	2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3/src/des_crypt.c	2013-08-12 16:47:07.000000000 +0200
+@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)des_crypt.c
  
  static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
  int (*__des_crypt_LOCAL)() = 0;
@@ -9,7 +9,7 @@
  /*
   * Copy 8 bytes
   */
-@@ -145,10 +145,6 @@ common_crypt(key, buf, len, mode, desp)	
+@@ -145,10 +145,6 @@ common_crypt(key, buf, len, mode, desp)
  		if (!__des_crypt_LOCAL(buf, len, desp)) {
  			return (DESERR_HWERROR);
  		}

package/libtirpc/patches/patch-src_rpc_soc_c

@@ -1,6 +1,6 @@
---- libtirpc-0.2.2.orig/src/rpc_soc.c	2011-05-02 14:10:40.000000000 +0200
-+++ libtirpc-0.2.2/src/rpc_soc.c	2012-03-22 19:20:37.849747561 +0100
-@@ -515,37 +515,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
+--- libtirpc-0.2.3.orig/src/rpc_soc.c	2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3/src/rpc_soc.c	2013-08-12 16:47:07.000000000 +0200
+@@ -520,37 +520,6 @@ clnt_broadcast(prog, vers, proc, xargs,
  	    (resultproc_t) rpc_wrap_bcast, "udp");
  }
  

package/musl/Makefile

@@ -25,10 +25,13 @@ INSTALL_STYLE:=         manual
 
 # do nothing, musl is already build in toolchain directory
 do-install:
+	${INSTALL_DIR} $(IDIR_MUSL)/usr/bin
 	${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	(cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \
 		ln -sf libc.so ld-musl-$(ARCH).so.1)
+	(cd $(IDIR_MUSL)/usr/bin && \
+		ln -sf ../../lib/ld-musl-$(ARCH).so.1 ldd)
 	
 
 musl-dev-install:

package/nfs-utils/Makefile

@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.5
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		8395ac770720b83c5c469f88306d7765
+PKG_VERSION:=		1.2.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fb48630b7c145fb9d6602a79c6eaab11
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind libdevmapper
+PKG_DEPENDS+=		libpthread
 PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
@@ -47,6 +48,7 @@ endif
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
+			--disable-nfsdcltrack \
 			--with-rpcgen=internal \
 			--enable-tirpc \
 			--with-tirpcinclude=${TIRPCINC} \

package/nfs-utils/files/nfs.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
+	test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_client:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;

package/nfs-utils/files/nfsd.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
+	test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_server:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;

package/nfs-utils/patches/patch-support_include_sockaddr_h

@@ -1,11 +0,0 @@
---- nfs-utils-1.2.3.orig/support/include/sockaddr.h	2010-09-28 14:24:16.000000000 +0200
-+++ nfs-utils-1.2.3/support/include/sockaddr.h	2011-01-03 12:12:10.000000000 +0100
-@@ -20,7 +20,7 @@
- #ifndef NFS_UTILS_SOCKADDR_H
- #define NFS_UTILS_SOCKADDR_H
- 
--#include <libio.h>
-+#include <stddef.h>
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>

package/nfs-utils/patches/patch-tools_Makefile_in

@@ -1,6 +1,6 @@
---- nfs-utils-1.2.5.orig/tools/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -78,7 +78,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+--- nfs-utils-1.2.8.orig/tools/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/Makefile.in	2013-08-13 10:46:17.000000000 +0200
+@@ -95,7 +95,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
  	distdir
  ETAGS = etags
  CTAGS = ctags
@@ -9,7 +9,7 @@
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -270,7 +270,7 @@ top_build_prefix = @top_build_prefix@
+@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  OPTDIRS = $(am__append_1)

package/nfs-utils/patches/patch-tools_locktest_Makefile_in

@@ -1,6 +1,6 @@
---- nfs-utils-1.2.5.orig/tools/locktest/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/locktest/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -68,20 +68,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
+--- nfs-utils-1.2.8.orig/tools/locktest/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/locktest/Makefile.in	2013-08-13 10:46:17.000000000 +0200
+@@ -81,20 +81,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
  testlk_OBJECTS = $(am_testlk_OBJECTS)
  testlk_LDADD = $(LDADD)
  testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -26,7 +26,7 @@
  	$(LDFLAGS) -o $@
  SOURCES = $(testlk_SOURCES)
  DIST_SOURCES = $(testlk_SOURCES)
-@@ -102,15 +102,15 @@ AWK = @AWK@
+@@ -120,15 +120,15 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@

package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in

@@ -1,8 +1,8 @@
---- nfs-utils-1.2.5.orig/tools/rpcgen/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/tools/rpcgen/Makefile.in	2012-02-27 17:39:34.000000000 +0100
-@@ -73,21 +73,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
- rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
- rpcgen_LDADD = $(LDADD)
+--- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.in	2013-04-22 18:48:22.000000000 +0200
++++ nfs-utils-1.2.8/tools/rpcgen/Makefile.in	2013-08-13 11:04:51.000000000 +0200
+@@ -87,21 +87,21 @@ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ am__DEPENDENCIES_1 =
+ rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1)
  rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
 -	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
@@ -28,8 +28,8 @@
 +	-o $@
  SOURCES = $(rpcgen_SOURCES)
  DIST_SOURCES = $(rpcgen_SOURCES)
- ETAGS = etags
-@@ -98,7 +98,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ am__can_run_installinfo = \
+@@ -117,7 +117,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  ALLOCA = @ALLOCA@
  AMTAR = @AMTAR@
  AM_CFLAGS = @AM_CFLAGS@
@@ -38,7 +38,7 @@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
-@@ -107,10 +107,10 @@ AWK = @AWK@
+@@ -126,10 +126,10 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@
@@ -51,7 +51,7 @@
  CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
  CXX = @CXX@
  CXXCPP = @CXXCPP@
-@@ -143,10 +143,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+@@ -167,10 +167,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  K5VERS = @K5VERS@
  KRBCFLAGS = @KRBCFLAGS@
  KRBDIR = @KRBDIR@
@@ -64,9 +64,17 @@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LIBBLKID = @LIBBLKID@
  LIBBSD = @LIBBSD@
-@@ -312,7 +312,7 @@ clean-noinstPROGRAMS:
+@@ -296,7 +296,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.
+ rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD)
+ rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD)
+ rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD = $(LIBTIRPC)
+ MAINTAINERCLEANFILES = Makefile.in
+ EXTRA_DIST = rpcgen.new.1
+ all: all-am
+@@ -344,7 +343,7 @@ clean-noinstPROGRAMS:
  	rm -f $$list
- rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) 
  	@rm -f rpcgen$(EXEEXT)
 -	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
 +	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)

package/nfs-utils/patches/patch-utils_blkmapd_device-process_c

@@ -1,11 +0,0 @@
---- nfs-utils-1.2.5.orig/utils/blkmapd/device-process.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/utils/blkmapd/device-process.c	2013-07-11 11:02:58.000000000 +0200
-@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_
- 		off_t stripe_unit = vol->param.bv_stripe_unit;
- 		/* Check limitations imposed by device-mapper */
- 		if ((stripe_unit & (stripe_unit - 1)) != 0
--		    || stripe_unit < (off_t) (PAGE_SIZE >> 9))
-+		    || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9))
- 			return -EIO;
- 		BLK_READBUF(p, end, 4);
- 		READ32(vol->bv_vol_n);

package/nfs-utils/patches/patch-utils_gssd_Makefile_in

@@ -1,25 +1,25 @@
---- nfs-utils-1.2.5.orig/utils/gssd/Makefile.in	2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/utils/gssd/Makefile.in	2013-07-11 11:01:30.000000000 +0200
-@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
- 		$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
+--- nfs-utils-1.2.8.orig/utils/gssd/Makefile.in	2013-04-22 18:48:23.000000000 +0200
++++ nfs-utils-1.2.8/utils/gssd/Makefile.in	2013-08-13 10:59:43.000000000 +0200
+@@ -390,7 +390,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
+ 		$(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS)
  
- gssd_LDFLAGS = $(KRBLDFLAGS)
+ gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
 -gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +gssd_CFLAGS = $(AM_CFLAGS) \
- 	      $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  svcgssd_SOURCES = \
-@@ -375,11 +375,11 @@ svcgssd_LDADD = \
- 	$(KRBLIBS)
+@@ -410,11 +410,11 @@ svcgssd_LDADD = \
+ 	$(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC)
  
  svcgssd_LDFLAGS = $(KRBLDFLAGS)
 -svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +svcgssd_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  gss_clnt_send_err_SOURCES = gss_clnt_send_err.c
 -gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 +gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+ 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
  
  MAINTAINERCLEANFILES = Makefile.in

package/nfs-utils/patches/patch-utils_mount_error_c

@@ -1,5 +1,5 @@
---- nfs-utils-1.2.1.orig/utils/mount/error.c	2009-11-04 12:13:56.000000000 +0100
-+++ nfs-utils-1.2.1/utils/mount/error.c	2009-12-25 19:32:49.000000000 +0100
+--- nfs-utils-1.2.8.orig/utils/mount/error.c	2013-04-22 18:47:20.000000000 +0200
++++ nfs-utils-1.2.8/utils/mount/error.c	2013-08-13 10:46:19.000000000 +0200
 @@ -62,7 +62,7 @@ static int rpc_strerror(int spos)
  	char *tmp;
  

package/nfs-utils/patches/patch-utils_mountd_fsloc_c

@@ -1,9 +1,9 @@
---- nfs-utils-1.2.5.orig/utils/mountd/fsloc.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/utils/mountd/fsloc.c	2013-07-11 11:01:30.000000000 +0200
-@@ -126,7 +126,7 @@ static struct servers *method_list(char
- 	struct servers *rv=NULL;
+--- nfs-utils-1.2.8.orig/utils/mountd/fsloc.c	2013-04-22 18:47:20.000000000 +0200
++++ nfs-utils-1.2.8/utils/mountd/fsloc.c	2013-08-13 10:57:48.000000000 +0200
+@@ -127,7 +127,7 @@ static struct servers *method_list(char
+ 	bool v6esc = false;
  
- 	xlog(L_NOTICE, "method_list(%s)\n", data);
+ 	xlog(L_NOTICE, "method_list(%s)", data);
 -	for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
 +	for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
  		ptr++;

package/strace/Makefile

@@ -4,14 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.5.20
+PKG_VERSION:=		4.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		64dfe10d9db0c1e34030891695ffca4b
+PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
 
@@ -20,6 +20,9 @@ $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 ifeq ($(ADK_STATIC),y)
 TARGET_CFLAGS+=		-static
 endif
+ifeq ($(ADK_TARGET_LIB_MUSL),y)
+TARGET_CPPFLAGS+=	-DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
+endif
 
 INSTALL_STYLE:=		manual
 

package/strace/patches/patch-defs_h

@@ -0,0 +1,23 @@
+--- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
++++ strace-4.8/defs.h	2013-08-14 08:51:03.000000000 +0200
+@@ -162,7 +162,7 @@ extern char *stpcpy(char *dst, const cha
+ # define ptrace xptrace
+ # include <sys/ptrace.h>
+ # undef ptrace
+-# ifdef POWERPC
++# if defined(POWERPC) || defined(ARM)
+ #  define __KERNEL__
+ #  include <asm/ptrace.h>
+ #  undef __KERNEL__
+@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon
+ # define PTRACE_EVENT_EXIT	6
+ #endif
+ 
+-#if !defined(__GLIBC__)
+-# define PTRACE_PEEKUSER PTRACE_PEEKUSR
+-# define PTRACE_POKEUSER PTRACE_POKEUSR
+-#endif
+-
+ #if USE_SEIZE
+ # undef PTRACE_SEIZE
+ # define PTRACE_SEIZE		0x4206

package/strace/patches/patch-defs_h.orig

@@ -0,0 +1,14 @@
+--- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
++++ strace-4.8/defs.h	2013-08-14 08:01:46.000000000 +0200
+@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon
+ # define PTRACE_EVENT_EXIT	6
+ #endif
+ 
+-#if !defined(__GLIBC__)
+-# define PTRACE_PEEKUSER PTRACE_PEEKUSR
+-# define PTRACE_POKEUSER PTRACE_POKEUSR
+-#endif
+-
+ #if USE_SEIZE
+ # undef PTRACE_SEIZE
+ # define PTRACE_SEIZE		0x4206

package/strace/patches/patch-desc_c

@@ -0,0 +1,11 @@
+--- strace-4.8.orig/desc.c	2013-05-02 00:39:10.000000000 +0200
++++ strace-4.8/desc.c	2013-08-14 08:55:36.000000000 +0200
+@@ -223,7 +223,7 @@ static const struct xlat perf_event_open
+ 	{ 0,				NULL			},
+ };
+ 
+-#if _LFS64_LARGEFILE
++#if defined(_LFS64_LARGEFILE) && defined(__GLIBC__) || defined(__UCLIBC__)
+ /* fcntl/lockf */
+ static void
+ printflock64(struct tcb *tcp, long addr, int getlk)

package/strace/patches/patch-net_c

@@ -0,0 +1,19 @@
+--- strace-4.8.orig/net.c	2013-05-18 00:20:02.000000000 +0200
++++ strace-4.8/net.c	2013-08-14 08:46:21.000000000 +0200
+@@ -94,13 +94,15 @@
+ # define PF_UNSPEC AF_UNSPEC
+ #endif
+ 
+-/* Under Linux these are enums so we can't test for them with ifdef. */
++/* Under Linux (glibc/uclibc) these are enums so we can't test for them with ifdef. */
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ #define IPPROTO_EGP IPPROTO_EGP
+ #define IPPROTO_PUP IPPROTO_PUP
+ #define IPPROTO_IDP IPPROTO_IDP
+ #define IPPROTO_IGMP IPPROTO_IGMP
+ #define IPPROTO_RAW IPPROTO_RAW
+ #define IPPROTO_MAX IPPROTO_MAX
++#endif
+ 
+ static const struct xlat domains[] = {
+ #ifdef PF_UNSPEC

package/strace/patches/patch-process_c

@@ -0,0 +1,29 @@
+--- strace-4.8.orig/process.c	2013-05-18 00:22:19.000000000 +0200
++++ strace-4.8/process.c	2013-08-14 08:47:15.000000000 +0200
+@@ -2857,7 +2857,7 @@ sys_sched_setscheduler(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[2], &p) < 0)
+ 			tprintf(", %#lx", tcp->u_arg[2]);
+ 		else
+-			tprintf(", { %d }", p.__sched_priority);
++			tprintf(", { %d }", p.sched_priority);
+ 	}
+ 	return 0;
+ }
+@@ -2872,7 +2872,7 @@ sys_sched_getparam(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+ 			tprintf("%#lx", tcp->u_arg[1]);
+ 		else
+-			tprintf("{ %d }", p.__sched_priority);
++			tprintf("{ %d }", p.sched_priority);
+ 	}
+ 	return 0;
+ }
+@@ -2885,7 +2885,7 @@ sys_sched_setparam(struct tcb *tcp)
+ 		if (umove(tcp, tcp->u_arg[1], &p) < 0)
+ 			tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
+ 		else
+-			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
++			tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
+ 	}
+ 	return 0;
+ }

package/strace/patches/patch-signal_c

@@ -0,0 +1,11 @@
+--- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
++++ strace-4.8/signal.c	2013-08-14 08:50:16.000000000 +0200
+@@ -815,7 +815,7 @@ sys_sigreturn(struct tcb *tcp)
+ {
+ #if defined(ARM)
+ 	if (entering(tcp)) {
+-		struct sigcontext_struct sc;
++		struct sigcontext sc;
+ 		sigset_t sigm;
+ 		if (umove(tcp, arm_regs.ARM_sp, &sc) < 0)
+ 			return 0;

package/strace/patches/patch-time_c

@@ -0,0 +1,14 @@
+--- strace-4.8.orig/time.c	2012-05-01 23:17:51.000000000 +0200
++++ strace-4.8/time.c	2013-08-14 08:52:00.000000000 +0200
+@@ -774,7 +774,11 @@ printsigevent(struct tcb *tcp, long arg)
+ 			/* _pad[0] is the _tid field which might not be
+ 			   present in the userlevel definition of the
+ 			   struct.  */
++#if defined(__GLIBC__) || defined(__UCLIBC__)
+ 			tprintf("{%d}", sev._sigev_un._pad[0]);
++#else
++			;
++#endif
+ 		else if (sev.sigev_notify == SIGEV_THREAD)
+ 			tprintf("{%p, %p}", sev.sigev_notify_function,
+ 				sev.sigev_notify_attributes);

target/config/Config.in

@@ -659,6 +659,7 @@ config ADK_TARGET_SUFFIX
 	default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI
 	default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI
 	default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI
+	default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF
 	default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI
 	default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI
 	default "gnu"

toolchain/Makefile

@@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
 
 TARGETS:=binutils gmp mpfr mpc libelf gcc
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-TARGETS+=glibc-ports glibc
+TARGETS+=glibc
 LIBC:=glibc
 endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
@@ -45,11 +45,7 @@ download: $(DOWNLOAD)
 fixup: $(FIXUP)
 
 gcc-prepare: binutils-install gmp-install mpfr-install mpc-install libelf-install
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-$(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare
-else
 $(LIBC)-prepare: gcc-prepare kernel-headers-prepare
-endif
 gcc-configure: $(LIBC)-prepare
 $(LIBC)-compile: gcc-configure
 gcc-compile: $(LIBC)-install

toolchain/gdb/Makefile.inc

@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=	gdb
-PKG_VERSION:=	7.5
-PKG_MD5SUM:=	24a6779a9fe0260667710de1b082ef61
+PKG_VERSION:=	7.6
+PKG_MD5SUM:=	fda57170e4d11cdde74259ca575412a8
 PKG_RELEASE:=	1
 PKG_SITES:=	${MASTER_SITE_GNU:=gdb/}
 DISTFILES:=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2

toolchain/glibc-ports/Makefile

@@ -1,22 +0,0 @@
-# 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
-include ../rules.mk
-include Makefile.inc
-
-include ${TOPDIR}/mk/buildhlp.mk
-
-$(WRKBUILD)/.headers:
-	touch $@
-
-$(WRKBUILD)/.configured:
-	touch $@
-
-$(WRKBUILD)/.compiled:
-	touch $@
-
-$(WRKBUILD)/.installed:
-	touch $@
-
-include ${TOPDIR}/mk/toolchain.mk

toolchain/glibc-ports/Makefile.inc

@@ -1,8 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-PKG_NAME:=		glibc-ports
-PKG_VERSION:=		2.16.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		20c689888d89f9c11dd7f91b48ca4f69
-PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}

toolchain/glibc-ports/patches/mips.patch

@@ -1,25 +0,0 @@
-diff -Nur glibc-ports-2.16.0.orig/sysdeps/mips/mips32/Makefile glibc-ports-2.16.0/sysdeps/mips/mips32/Makefile
---- glibc-ports-2.16.0.orig/sysdeps/mips/mips32/Makefile	2012-06-21 19:08:19.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/mips/mips32/Makefile	2012-08-01 17:45:07.000000000 +0200
-@@ -1,3 +1,3 @@
--ifeq ($(filter -mabi=32,$(CC)),)
--CC += -mabi=32
--endif
-+#ifeq ($(filter -mabi=32,$(CC)),)
-+#CC += -mabi=32
-+#endif
-diff -Nur glibc-ports-2.16.0.orig/sysdeps/mips/preconfigure glibc-ports-2.16.0/sysdeps/mips/preconfigure
---- glibc-ports-2.16.0.orig/sysdeps/mips/preconfigure	2012-06-21 19:08:19.000000000 +0200
-+++ glibc-ports-2.16.0/sysdeps/mips/preconfigure	2012-08-01 17:45:07.000000000 +0200
-@@ -19,11 +19,6 @@
- 		32) machine=mips/mips32/kern64 ;;
- 		esac
- 		machine=$machine/$config_machine
--		if test $mips_config_abi != $mips_cc_abi; then
--		  # This won't make it to config.make, but we want to
--		  # set this in case configure tests depend on it.
--		  CPPFLAGS="$CPPFLAGS -mabi=$mips_config_abi"
--		fi
- 		;;
- mips*)		base_machine=mips machine=mips/mips32/$machine ;;
- esac

toolchain/glibc/Makefile

@@ -34,8 +34,6 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
 $(WRKBUILD)/.headers_configure: 
 	for abi in $(TABI); do \
 		mkdir -p $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
-		(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
-			ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); \
 		(cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
 			${GLIBC_ENV} \
 			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
@@ -60,8 +58,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 else
 $(WRKBUILD)/.headers_configure:
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
-	ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports);
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
 		${GLIBC_ENV} \
 		$(WRKBUILD)/configure \
@@ -77,7 +73,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		$(MAKE) ${GLIBC_MAKEOPTS} install-headers \
 	);
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h
 	touch $@
 endif
 
@@ -111,7 +107,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	# default libgcc searching for 64 bit libraries
 	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h
 	for abi in $(TABI); do \
 		mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \
 		$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \

toolchain/glibc/Makefile.inc

@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.16.0
+PKG_VERSION:=		2.17
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b5f786fa7df4ff947bcd240c0e595f98
+PKG_MD5SUM:=		8a7f11b9ac5d0d5efa4c82175b5a9c1b
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
@@ -15,6 +15,7 @@ GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--disable-profile \
 			--disable-debug \
 			--without-gd \
+			--disable-nscd \
 			--with-__thread \
 			--with-tls \
 			--enable-kernel="2.6.0" \

toolchain/glibc/patches/gcc_eh.patch

@@ -1,18 +0,0 @@
-diff -Nur glibc-2.16.0.orig/Makeconfig glibc-2.16.0/Makeconfig
---- glibc-2.16.0.orig/Makeconfig	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/Makeconfig	2012-09-28 20:11:14.000000000 +0200
-@@ -519,11 +519,11 @@
- ifneq ($(have-cc-with-libunwind),yes)
-   libunwind =
- else
--  libunwind = -lunwind
-+  libunwind =
- endif
--libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
-+libgcc_eh := -Wl,--as-needed $(libunwind) -Wl,--no-as-needed
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+static-gnulib := -lgcc $(libunwind)
- libc.so-gnulib := -lgcc
- endif
- +preinit = $(addprefix $(csu-objpfx),crti.o)

toolchain/glibc/patches/glibc-cross.patch

@@ -1,6 +1,6 @@
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h
---- glibc-2.16.0.orig/sunrpc/rpc/types.h	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc/types.h	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc/types.h glibc-2.17/sunrpc/rpc/types.h
+--- glibc-2.17.orig/sunrpc/rpc/types.h	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc/types.h	2013-08-12 14:59:35.000000000 +0200
 @@ -69,19 +69,25 @@
  #include <sys/types.h>
  #endif
@@ -39,21 +39,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h
  # define __daddr_t_defined
  #endif
  
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_clntout.c glibc-2.16.0/sunrpc/rpc_clntout.c
---- glibc-2.16.0.orig/sunrpc/rpc_clntout.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_clntout.c	2012-08-01 18:05:49.000000000 +0200
-@@ -31,7 +31,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--#include <rpc/types.h>
-+#include "rpc/types.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- #include "proto.h"
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
---- glibc-2.16.0.orig/sunrpc/rpc_main.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_main.c	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
+--- glibc-2.17.orig/sunrpc/rpc_main.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc_main.c	2013-08-12 14:59:37.000000000 +0200
 @@ -38,7 +38,11 @@
  #include <stdio.h>
  #include <string.h>
@@ -66,7 +54,7 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
  #include <ctype.h>
  #include <sys/types.h>
  #include <sys/param.h>
-@@ -958,10 +962,12 @@
+@@ -954,10 +958,12 @@
  	abort ();
        temp = rindex (cmd->infile, '.');
        cp = stpcpy (mkfilename, "Makefile.");
@@ -82,9 +70,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c
  
      }
    else
-diff -Nur glibc-2.16.0.orig/sunrpc/rpc_scan.c glibc-2.16.0/sunrpc/rpc_scan.c
---- glibc-2.16.0.orig/sunrpc/rpc_scan.c	2012-06-30 21:12:34.000000000 +0200
-+++ glibc-2.16.0/sunrpc/rpc_scan.c	2012-08-01 18:05:49.000000000 +0200
+diff -Nur glibc-2.17.orig/sunrpc/rpc_scan.c glibc-2.17/sunrpc/rpc_scan.c
+--- glibc-2.17.orig/sunrpc/rpc_scan.c	2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/sunrpc/rpc_scan.c	2013-08-12 14:59:37.000000000 +0200
 @@ -37,7 +37,11 @@
  #include <stdio.h>
  #include <ctype.h>

toolchain/musl/Makefile

@@ -16,7 +16,7 @@ $(WRKBUILD)/.headers:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled

tools/adk/pkgmaker.c

@@ -271,7 +271,7 @@ int main() {
 	char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url;
 	char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
 	char *pkg_need_cxx, *pkg_need_java, *pkgname;
-	char *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
+	char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs;
 	char *saveptr, *p_ptr, *s_ptr;
 	int result;
@@ -289,6 +289,7 @@ int main() {
 	pkg_arch_depends = NULL;
 	pkg_system_depends = NULL;
 	pkg_host_depends = NULL;
+	pkg_libc_depends = NULL;
 	pkg_cxx = NULL;
 	pkg_dflt = NULL;
 	pkg_cfline = NULL;
@@ -394,6 +395,8 @@ int main() {
 					snprintf(variable, MAXVAR, "PKG_DFLT_%s", pkg_name_u);
 					if ((parse_var(buf, variable, NULL, &pkg_dflt)) == 0)
 						continue;
+					if ((parse_var(buf, "PKG_LIBC_DEPENDS", NULL, &pkg_libc_depends)) == 0)
+						continue;
 					if ((parse_var(buf, "PKG_HOST_DEPENDS", NULL, &pkg_host_depends)) == 0)
 						continue;
 					if ((parse_var(buf, "PKG_ARCH_DEPENDS", NULL, &pkg_arch_depends)) == 0)
@@ -647,6 +650,23 @@ int main() {
 					fprintf(cfg, "\n");
 				}
 
+				/* create package libc dependency information */
+				if (pkg_libc_depends != NULL) {
+					token = strtok(pkg_libc_depends, " ");
+					fprintf(cfg, "\tdepends on ");
+					sp = "";
+					while (token != NULL) {
+						if(strncmp(token, "!", 1) == 0) {
+							fprintf(cfg, "%s!ADK_TARGET_LIB_%s", sp, toupperstr(token));
+							sp = " && ";
+						} else {
+							fprintf(cfg, "%sADK_TARGET_LIB_%s", sp, toupperstr(token));
+							sp = " || ";
+						}
+						token = strtok(NULL, " ");
+					}
+					fprintf(cfg, "\n");
+				}
 				/* create package target architecture dependency information */
 				if (pkg_arch_depends != NULL) {
 					token = strtok(pkg_arch_depends, " ");
@@ -902,6 +922,7 @@ int main() {
 			free(pkg_arch_depends);
 			free(pkg_system_depends);
 			free(pkg_host_depends);
+			free(pkg_libc_depends);
 			free(pkg_cxx);
 			free(pkg_dflt);
 			free(pkg_cfline);
@@ -918,6 +939,7 @@ int main() {
 			pkg_arch_depends = NULL;
 			pkg_system_depends = NULL;
 			pkg_host_depends = NULL;
+			pkg_libc_depends = NULL;
 			pkg_cxx = NULL;
 			pkg_dflt = NULL;
 			pkg_cfline = NULL;