update to latest upstream version

25 files changed, 3 insertions, 484 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index f65a83407..d47c27c66 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.3.0
-PKG_RELEASE:=		2
-PKG_HASH:=		25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d
+PKG_VERSION:=		1.3.2
+PKG_RELEASE:=		1
+PKG_HASH:=		5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7
 PKG_DESCR:=		network filesystem utilities
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		keyutils libtirpc rpcbind libdevmapper libpthread
diff --git a/package/nfs-utils/patches/patch-configure_ac b/package/nfs-utils/patches/patch-configure_ac
deleted file mode 100644
index e21eb4210..000000000
--- a/package/nfs-utils/patches/patch-configure_ac
+++ /dev/null
@@ -1,26 +0,0 @@
---- nfs-utils-1.3.0.orig/configure.ac	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/configure.ac	2014-05-17 21:03:27.077197789 +0200
-@@ -247,9 +247,6 @@ AC_CHECK_FUNC([connect], ,
- AC_CHECK_FUNC([getaddrinfo], ,
-               [AC_MSG_ERROR([Function 'getaddrinfo' not found.])])
- 
--AC_CHECK_FUNC([getrpcbynumber], ,
--              [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])])
--
- AC_CHECK_FUNC([getservbyname], ,
-               [AC_MSG_ERROR([Function 'getservbyname' not found.])])
- 
-@@ -408,12 +405,11 @@ AC_FUNC_STAT
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
-                gethostbyaddr gethostbyname gethostname getmntent \
--               getnameinfo getrpcbyname getifaddrs \
-+               getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \
-                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
-                ppoll realpath rmdir select socket strcasecmp strchr strdup \
-                strerror strrchr strtol strtoul sigprocmask])
- 
--
- dnl *************************************************************
- dnl Check for data sizes
- dnl *************************************************************
diff --git a/package/nfs-utils/patches/patch-support_export_hostname_c b/package/nfs-utils/patches/patch-support_export_hostname_c
deleted file mode 100644
index 56aa13139..000000000
--- a/package/nfs-utils/patches/patch-support_export_hostname_c
+++ /dev/null
@@ -1,65 +0,0 @@
---- nfs-utils-1.3.0.orig/support/export/hostname.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/export/hostname.c	2014-05-17 21:47:07.085632108 +0200
-@@ -91,7 +91,7 @@ host_ntop(const struct sockaddr *sap, ch
-  * Returns address info structure, or NULL if an error occurs.  Caller
-  * must free the returned structure with freeaddrinfo(3).
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *
- host_pton(const char *paddr)
- {
-@@ -153,7 +153,7 @@ host_pton(const char *paddr)
-  * if no information is available for @hostname.  Caller must free the
-  * returned structure with freeaddrinfo(3).
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *
- host_addrinfo(const char *hostname)
- {
-@@ -199,7 +199,7 @@ host_addrinfo(const char *hostname)
-  * the string.
-  */
- #ifdef HAVE_GETNAMEINFO
--__attribute_malloc__
-+__attribute__((__malloc__))
- char *
- host_canonname(const struct sockaddr *sap)
- {
-@@ -234,7 +234,7 @@ host_canonname(const struct sockaddr *sa
- 	return strdup(buf);
- }
- #else	/* !HAVE_GETNAMEINFO */
--__attribute_malloc__
-+__attribute__((__malloc__))
- char *
- host_canonname(const struct sockaddr *sap)
- {
-@@ -266,7 +266,7 @@ host_canonname(const struct sockaddr *sa
-  *
-  * Caller must free the returned structure with freeaddrinfo(3).
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *
- host_reliable_addrinfo(const struct sockaddr *sap)
- {
-@@ -313,7 +313,7 @@ out_free_hostname:
-  * Caller must free the returned structure with freeaddrinfo(3).
-  */
- #ifdef HAVE_GETNAMEINFO
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *
- host_numeric_addrinfo(const struct sockaddr *sap)
- {
-@@ -361,7 +361,7 @@ host_numeric_addrinfo(const struct socka
- 	return ai;
- }
- #else	/* !HAVE_GETNAMEINFO */
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *
- host_numeric_addrinfo(const struct sockaddr *sap)
- {
diff --git a/package/nfs-utils/patches/patch-support_include_conffile_h b/package/nfs-utils/patches/patch-support_include_conffile_h
deleted file mode 100644
index 308a40a4f..000000000
--- a/package/nfs-utils/patches/patch-support_include_conffile_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- nfs-utils-1.3.0.orig/support/include/conffile.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/include/conffile.h	2014-05-17 21:52:16.997590916 +0200
-@@ -33,7 +33,7 @@
- #ifndef _CONFFILE_H_
- #define _CONFFILE_H_
- 
--#include <sys/queue.h>
-+#include "queue.h"
- #include <ctype.h>
- 
- struct conf_list_node {
-@@ -49,7 +49,7 @@ struct conf_list {
- extern char    *conf_path;
- 
- extern int      conf_begin(void);
--extern int      conf_decode_base64(u_int8_t *, u_int32_t *, u_char *);
-+extern int      conf_decode_base64(uint8_t *, uint32_t *, unsigned char *);
- extern int      conf_end(int, int);
- extern void     conf_free_list(struct conf_list *);
- extern struct sockaddr *conf_get_address(char *, char *);
diff --git a/package/nfs-utils/patches/patch-support_include_exportfs_h b/package/nfs-utils/patches/patch-support_include_exportfs_h
deleted file mode 100644
index c58c0c3ec..000000000
--- a/package/nfs-utils/patches/patch-support_include_exportfs_h
+++ /dev/null
@@ -1,23 +0,0 @@
---- nfs-utils-1.3.0.orig/support/include/exportfs.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/include/exportfs.h	2014-05-17 21:47:07.085632108 +0200
-@@ -156,15 +156,15 @@ int				secinfo_addflavor(struct flav_inf
- 
- char *				host_ntop(const struct sockaddr *sap,
- 						char *buf, const size_t buflen);
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *		host_pton(const char *paddr);
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *		host_addrinfo(const char *hostname);
--__attribute_malloc__
-+__attribute__((__malloc__))
- char *				host_canonname(const struct sockaddr *sap);
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *		host_reliable_addrinfo(const struct sockaddr *sap);
--__attribute_malloc__
-+__attribute__((__malloc__))
- struct addrinfo *		host_numeric_addrinfo(const struct sockaddr *sap);
- 
- int				rmtab_read(void);
diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h
deleted file mode 100644
index 52b564bd3..000000000
--- a/package/nfs-utils/patches/patch-support_include_sockaddr_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- nfs-utils-1.3.0.orig/support/include/sockaddr.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/include/sockaddr.h	2014-05-17 21:40:15.148504458 +0200
-@@ -27,6 +27,7 @@
- #ifdef HAVE_LIBIO_H
- #include <libio.h>
- #endif
-+#include <stdlib.h>
- #include <stdbool.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/package/nfs-utils/patches/patch-support_nfs_conffile_c b/package/nfs-utils/patches/patch-support_nfs_conffile_c
deleted file mode 100644
index 0c59eea59..000000000
--- a/package/nfs-utils/patches/patch-support_nfs_conffile_c
+++ /dev/null
@@ -1,42 +0,0 @@
---- nfs-utils-1.3.0.orig/support/nfs/conffile.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/nfs/conffile.c	2014-05-17 21:30:36.886783421 +0200
-@@ -72,10 +72,10 @@ TAILQ_HEAD (conf_trans_head, conf_trans)
- /*
-  * Radix-64 Encoding.
-  */
--static const u_int8_t bin2asc[]
-+static const uint8_t bin2asc[]
-   = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- 
--static const u_int8_t asc2bin[] =
-+static const uint8_t asc2bin[] =
- {
-   255, 255, 255, 255, 255, 255, 255, 255,
-   255, 255, 255, 255, 255, 255, 255, 255,
-@@ -109,10 +109,10 @@ LIST_HEAD (conf_bindings, conf_binding)
- 
- static char *conf_addr;
- 
--static __inline__ u_int8_t
-+static __inline__ uint8_t
- conf_hash(char *s)
- {
--	u_int8_t hash = 0;
-+	uint8_t hash = 0;
- 
- 	while (*s) {
- 		hash = ((hash << 1) | (hash >> 7)) ^ tolower (*s);
-@@ -603,10 +603,10 @@ cleanup:
- 
- /* Decode a PEM encoded buffer.  */
- int
--conf_decode_base64 (u_int8_t *out, u_int32_t *len, u_char *buf)
-+conf_decode_base64 (uint8_t *out, uint32_t *len, unsigned char *buf)
- {
--	u_int32_t c = 0;
--	u_int8_t c1, c2, c3, c4;
-+	uint32_t c = 0;
-+	uint8_t c1, c2, c3, c4;
- 
- 	while (*buf) {
- 		if (*buf > 127 || (c1 = asc2bin[*buf]) == 255)
diff --git a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
deleted file mode 100644
index a6a6ce545..000000000
--- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- nfs-utils-1.2.5.orig/support/nfs/nfs_mntent.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/support/nfs/nfs_mntent.c	2012-02-27 17:39:34.000000000 +0100
-@@ -9,7 +9,7 @@
-  */
- 
- #include <stdio.h>
--#include <string.h>		/* for index */
-+#include <string.h>		/* for strchr */
- #include <ctype.h>		/* for isdigit */
- #include <sys/stat.h>		/* for umask */
- #include <unistd.h>		/* for ftruncate */
-@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) {
- 			return NULL;
- 
- 		mfp->mntent_lineno++;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
-@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) {
- 				fprintf(stderr, _("[mntent]: warning: no final "
- 					"newline at the end of %s\n"),
- 					mfp->mntent_file);
--				s = index (buf, 0);
-+				s = strchr (buf, 0);
- 			} else {
- 				mfp->mntent_errs = 1;
- 				goto err;
diff --git a/package/nfs-utils/patches/patch-support_nfs_svc_create_c b/package/nfs-utils/patches/patch-support_nfs_svc_create_c
deleted file mode 100644
index 0b2ccbe44..000000000
--- a/package/nfs-utils/patches/patch-support_nfs_svc_create_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/support/nfs/svc_create.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/nfs/svc_create.c	2014-05-17 21:47:07.089632108 +0200
-@@ -113,7 +113,7 @@ svc_create_find_xprt(const struct sockad
-  *
-  * Otherwise NULL is returned if an error occurs.
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct addrinfo *
- svc_create_bindaddr(struct netconfig *nconf, const uint16_t port)
- {
diff --git a/package/nfs-utils/patches/patch-support_nfs_svc_socket_c b/package/nfs-utils/patches/patch-support_nfs_svc_socket_c
deleted file mode 100644
index 0e2d99b87..000000000
--- a/package/nfs-utils/patches/patch-support_nfs_svc_socket_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- nfs-utils-1.3.0.orig/support/nfs/svc_socket.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/support/nfs/svc_socket.c	2014-05-17 21:03:27.077197789 +0200
-@@ -42,8 +42,14 @@ int getservport(u_long number, const cha
- 	struct servent servbuf, *servp = NULL;
- 	int ret;
- 
-+#if HAVE_GETRPCBYNUMBER_R
- 	ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
- 				&rpcp);
-+#else
-+	rpcp = getrpcbynumber(number);
-+	ret = 0;
-+#endif
-+
- 	if (ret == 0 && rpcp != NULL) {
- 		/* First try name.  */
- 		ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
diff --git a/package/nfs-utils/patches/patch-utils_exportfs_exportfs_c b/package/nfs-utils/patches/patch-utils_exportfs_exportfs_c
deleted file mode 100644
index b9cdac29f..000000000
--- a/package/nfs-utils/patches/patch-utils_exportfs_exportfs_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/exportfs/exportfs.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/exportfs/exportfs.c	2014-05-17 21:20:01.548725048 +0200
-@@ -12,6 +12,10 @@
- #include <config.h>
- #endif
- 
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/vfs.h>
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_am b/package/nfs-utils/patches/patch-utils_gssd_Makefile_am
deleted file mode 100644
index 999581560..000000000
--- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_am
+++ /dev/null
@@ -1,20 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/gssd/Makefile.am	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/gssd/Makefile.am	2014-05-20 12:19:07.116371104 +0200
-@@ -40,7 +40,7 @@ gssd_LDADD =	../../support/nfs/libnfs.a
- 		$(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS)
- gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
- 
--gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-+gssd_CFLAGS = $(AM_CFLAGS) \
- 	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
- 
- svcgssd_SOURCES = \
-@@ -61,7 +61,7 @@ svcgssd_LDADD = \
- 
- svcgssd_LDFLAGS = $(KRBLDFLAGS)
- 
--svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-+svcgssd_CFLAGS = $(AM_CFLAGS) \
- 		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS)
- 
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/package/nfs-utils/patches/patch-utils_gssd_gssd_h b/package/nfs-utils/patches/patch-utils_gssd_gssd_h
deleted file mode 100644
index 9dd1ba240..000000000
--- a/package/nfs-utils/patches/patch-utils_gssd_gssd_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/gssd/gssd.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/gssd/gssd.h	2014-05-20 12:41:40.039573389 +0200
-@@ -32,7 +32,7 @@
- #define _RPC_GSSD_H_
- 
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include "queue.h"
- #include <gssapi/gssapi.h>
- 
- #define MAX_FILE_NAMELEN	32
diff --git a/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h b/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h
deleted file mode 100644
index 5094fd8cc..000000000
--- a/package/nfs-utils/patches/patch-utils_gssd_svcgssd_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/gssd/svcgssd.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/gssd/svcgssd.h	2014-05-20 12:44:06.504736498 +0200
-@@ -32,7 +32,7 @@
- #define _RPC_SVCGSSD_H_
- 
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include "queue.h"
- #include <gssapi/gssapi.h>
- 
- void handle_nullreq(FILE *f);
diff --git a/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c b/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c
deleted file mode 100644
index b4f7e2ca6..000000000
--- a/package/nfs-utils/patches/patch-utils_idmapd_idmapd_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- nfs-utils-1.2.5.orig/utils/idmapd/idmapd.c	2011-09-24 13:55:15.000000000 +0200
-+++ nfs-utils-1.2.5/utils/idmapd/idmapd.c	2012-02-29 14:09:32.000000000 +0100
-@@ -83,11 +83,11 @@
- #endif
- 
- #ifndef NFS4NOBODY_USER
--#define NFS4NOBODY_USER "nobody"
-+#define NFS4NOBODY_USER "nfsnobody"
- #endif
- 
- #ifndef NFS4NOBODY_GROUP
--#define NFS4NOBODY_GROUP "nobody"
-+#define NFS4NOBODY_GROUP "nfsnobody"
- #endif
- 
- /* From Niels */
diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c
deleted file mode 100644
index 8f841e672..000000000
--- a/package/nfs-utils/patches/patch-utils_mount_error_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- 
- 	if (estr) {
--		if ((ptr = index(estr, ':')))
-+		if ((ptr = strchr(estr, ':')))
- 			estr = ++ptr;
- 
- 		tmp = &errbuf[spos];
diff --git a/package/nfs-utils/patches/patch-utils_mountd_cache_c b/package/nfs-utils/patches/patch-utils_mountd_cache_c
deleted file mode 100644
index 440f46d82..000000000
--- a/package/nfs-utils/patches/patch-utils_mountd_cache_c
+++ /dev/null
@@ -1,22 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/mountd/cache.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/mountd/cache.c	2014-05-17 21:57:07.653571824 +0200
-@@ -11,6 +11,10 @@
- #include <config.h>
- #endif
- 
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+
- #include <sys/types.h>
- #include <sys/select.h>
- #include <sys/stat.h>
-@@ -1339,7 +1343,7 @@ static int cache_export_ent(char *domain
- 		 */
- 		struct stat stb;
- 		size_t l = strlen(exp->e_path);
--		__dev_t dev;
-+		dev_t dev;
- 
- 		if (strlen(path) <= l || path[l] != '/' ||
- 		    strncmp(exp->e_path, path, l) != 0)
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
deleted file mode 100644
index 799a95801..000000000
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/mountd/fsloc.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/mountd/fsloc.c	2014-05-13 20:23:33.000000000 +0200
-@@ -127,7 +127,7 @@ static struct servers *method_list(char
- 	bool v6esc = false;
- 
- 	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++;
- 	list = malloc(listsize * sizeof(char *));
- 	copy = strdup(data);
diff --git a/package/nfs-utils/patches/patch-utils_mountd_v4root_c b/package/nfs-utils/patches/patch-utils_mountd_v4root_c
deleted file mode 100644
index 420744173..000000000
--- a/package/nfs-utils/patches/patch-utils_mountd_v4root_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/mountd/v4root.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/mountd/v4root.c	2014-05-17 21:59:01.129569213 +0200
-@@ -13,7 +13,7 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/queue.h>
-+#include "queue.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
diff --git a/package/nfs-utils/patches/patch-utils_nfsstat_nfsstat_c b/package/nfs-utils/patches/patch-utils_nfsstat_nfsstat_c
deleted file mode 100644
index 333d35322..000000000
--- a/package/nfs-utils/patches/patch-utils_nfsstat_nfsstat_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/nfsstat/nfsstat.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/nfsstat/nfsstat.c	2014-05-17 21:57:15.697571551 +0200
-@@ -336,7 +336,7 @@ main(int argc, char **argv)
- 
- 	struct sigaction act = {
- 		.sa_handler = unpause,
--		.sa_flags = SA_ONESHOT,
-+		.sa_flags = SA_RESETHAND,
- 	};
- 
- 	if ((progname = strrchr(argv[0], '/')))
diff --git a/package/nfs-utils/patches/patch-utils_statd_hostname_c b/package/nfs-utils/patches/patch-utils_statd_hostname_c
deleted file mode 100644
index c0863e42b..000000000
--- a/package/nfs-utils/patches/patch-utils_statd_hostname_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/statd/hostname.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/statd/hostname.c	2014-05-17 21:47:07.089632108 +0200
-@@ -105,7 +105,7 @@ statd_present_address(const struct socka
-  * Look up the hostname; report exceptional errors.  Caller must
-  * call freeaddrinfo(3) if a valid addrinfo is returned.
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct addrinfo *
- get_addrinfo(const char *hostname, const struct addrinfo *hint)
- {
-@@ -184,7 +184,7 @@ get_nameinfo(const struct sockaddr *sap,
-  * We won't monitor peers that don't have a reverse map.  The canonical
-  * name gives us a key for our monitor list.
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- char *
- statd_canonical_name(const char *hostname)
- {
-@@ -234,7 +234,7 @@ statd_canonical_name(const char *hostnam
-  * NULL if some error occurs.  Caller must free the returned
-  * list with freeaddrinfo(3).
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct addrinfo *
- statd_canonical_list(const char *hostname)
- {
diff --git a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c b/package/nfs-utils/patches/patch-utils_statd_rmtcall_c
deleted file mode 100644
index eab15c5a7..000000000
--- a/package/nfs-utils/patches/patch-utils_statd_rmtcall_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/statd/rmtcall.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/statd/rmtcall.c	2014-05-17 22:00:46.441569123 +0200
-@@ -90,8 +90,10 @@ statd_get_socket(void)
- 					__func__);
- 			break;
- 		}
-+#if 0
- 		se = getservbyport(sin.sin_port, "udp");
- 		if (se == NULL)
-+#endif
- 			break;
- 		/* rather not use that port, try again */
- 
diff --git a/package/nfs-utils/patches/patch-utils_statd_simu_c b/package/nfs-utils/patches/patch-utils_statd_simu_c
deleted file mode 100644
index 2ca71cf74..000000000
--- a/package/nfs-utils/patches/patch-utils_statd_simu_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- nfs-utils-1.2.9.orig/utils/statd/simu.c	2013-11-05 21:41:27.000000000 +0100
-+++ nfs-utils-1.2.9/utils/statd/simu.c	2014-02-20 07:25:35.000000000 +0100
-@@ -10,6 +10,7 @@
- 
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <stdlib.h>
- 
- #include "sockaddr.h"
- #include "rpcmisc.h"
diff --git a/package/nfs-utils/patches/patch-utils_statd_sm-notify_c b/package/nfs-utils/patches/patch-utils_statd_sm-notify_c
deleted file mode 100644
index 76bef0d37..000000000
--- a/package/nfs-utils/patches/patch-utils_statd_sm-notify_c
+++ /dev/null
@@ -1,38 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/statd/sm-notify.c	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/statd/sm-notify.c	2014-05-17 21:47:07.089632108 +0200
-@@ -74,7 +74,7 @@ static int		record_pid(void);
- 
- static struct nsm_host *	hosts = NULL;
- 
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct addrinfo *
- smn_lookup(const char *name)
- {
-@@ -149,7 +149,7 @@ smn_get_hostname(const struct sockaddr *
-  * if the canonical name doesn't exist or cannot be determined.
-  * The caller must free the result with free(3).
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- static char *
- smn_verify_my_name(const char *name)
- {
-@@ -189,7 +189,7 @@ smn_verify_my_name(const char *name)
- 	return retval;
- }
- 
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct nsm_host *
- smn_alloc_host(const char *hostname, const char *mon_name,
- 		const char *my_name, const time_t timestamp)
-@@ -343,7 +343,7 @@ static int smn_socket(void)
-  * If admin specified a source address or srcport, then convert those
-  * to a sockaddr and return it.   Otherwise, return an ANYADDR address.
-  */
--__attribute_malloc__
-+__attribute__((__malloc__))
- static struct addrinfo *
- smn_bind_address(const char *srcaddr, const char *srcport)
- {
diff --git a/package/nfs-utils/patches/patch-utils_statd_statd_h b/package/nfs-utils/patches/patch-utils_statd_statd_h
deleted file mode 100644
index 73625326a..000000000
--- a/package/nfs-utils/patches/patch-utils_statd_statd_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfs-utils-1.3.0.orig/utils/statd/statd.h	2014-03-25 16:12:07.000000000 +0100
-+++ nfs-utils-1.3.0/utils/statd/statd.h	2014-05-17 21:47:07.089632108 +0200
-@@ -25,7 +25,7 @@
- extern _Bool	statd_matchhostname(const char *hostname1, const char *hostname2);
- extern _Bool	statd_present_address(const struct sockaddr *sap, char *buf,
- 					const size_t buflen);
--__attribute_malloc__
-+__attribute__((__malloc__))
- extern char *	statd_canonical_name(const char *hostname);
- 
- extern void	my_svc_run(void);