From 310ea5840b76f5c2770faed5341f7588df66a10b Mon Sep 17 00:00:00 2001 From: Peter Wagner <​tripolar@gmx.at> Date: Wed, 5 Jun 2013 18:36:16 +0000 Subject: [PATCH] update to v1.2.8 SVN-Revision: 36857 --- net/nfs-kernel-server/Makefile | 4 ++-- .../patches/100-nfs_utils_uclibc.patch | 17 ++--------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index b64a08819..59cacd8d0 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server -PKG_VERSION:=1.2.7 +PKG_VERSION:=1.2.8 PKG_RELEASE:=1 -PKG_MD5SUM:=3b5ca797197765dc0c3a4122720c7716 +PKG_MD5SUM:=6e7d97de51e428a0b8698c16ca23db77 PKG_SOURCE_URL:=@SF/nfs PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 diff --git a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch index 15c8c4a68..5e4877ef4 100644 --- a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch +++ b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch @@ -1,16 +1,3 @@ ---- a/support/include/sockaddr.h -+++ b/support/include/sockaddr.h -@@ -20,7 +20,10 @@ - #ifndef NFS_UTILS_SOCKADDR_H - #define NFS_UTILS_SOCKADDR_H - -+/* uClibc doesn't have/need libio.h */ -+#ifndef __UCLIBC__ - #include -+#endif - #include - #include - #include --- a/support/nfs/svc_socket.c +++ b/support/nfs/svc_socket.c @@ -40,10 +40,13 @@ int getservport(u_long number, const cha @@ -31,7 +18,7 @@ ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c -@@ -168,6 +168,7 @@ static void auth_unix_gid(FILE *f) +@@ -166,6 +166,7 @@ static void auth_unix_gid(FILE *f) pw = getpwuid(uid); if (!pw) rv = -1; @@ -39,7 +26,7 @@ else { rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); if (rv == -1 && ngroups >= groups_len) { -@@ -182,6 +183,7 @@ static void auth_unix_gid(FILE *f) +@@ -180,6 +181,7 @@ static void auth_unix_gid(FILE *f) } } } -- 2.30.2