From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 8 Apr 2009 13:21:16 +0000 (+0000)
Subject: [package] update nfs-kernel-server patches and init script (#4893)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=68b397baf79abfdc0d2e4612d238a6cdd509bd56;ds=sidebyside

[package] update nfs-kernel-server patches and init script (#4893)

SVN-Revision: 15149
---

diff --git a/net/nfs-kernel-server/files/nfsd.init b/net/nfs-kernel-server/files/nfsd.init
index cbe31ceec4..a5062c3021 100644
--- a/net/nfs-kernel-server/files/nfsd.init
+++ b/net/nfs-kernel-server/files/nfsd.init
@@ -9,7 +9,6 @@ start() {
 	touch $NFS_D/rmtab
 	
 	/usr/sbin/rpc.statd
-	/usr/sbin/rpc.lockd
 	/usr/sbin/exportfs -r
 	/usr/sbin/rpc.nfsd
 	/usr/sbin/rpc.mountd
@@ -19,7 +18,6 @@ stop() {
 	killall rpc.mountd 2> /dev/null
 	killall -9 rpc.nfsd 2> /dev/null
 	/usr/sbin/exportfs -au
-	killall lockd 2> /dev/null
 	killall rpc.statd 2> /dev/null
 }
 
diff --git a/net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch b/net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch
deleted file mode 100644
index 1bdfbaa1e4..0000000000
--- a/net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.new/support/nfs/svc_socket.c
---- nfs-utils-1.1.5/support/nfs/svc_socket.c	2009-03-05 12:42:56.000000000 +0100
-+++ nfs-utils-1.1.5.new/support/nfs/svc_socket.c	2009-04-07 16:04:54.000000000 +0200
-@@ -66,7 +66,7 @@
- 
-   memset (&addr, 0, sizeof (addr));
-   addr.sin_family = AF_INET;
--
-+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
-   ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
- 			  &rpcp);
-   if (ret == 0 && rpcp != NULL)
-@@ -100,6 +100,7 @@
- 	}
-     }
-   else
-+#endif /* __UCLIBC__ */
-     {
- 	  addr.sin_port = 0;
- 	  if (bind (sock, (struct sockaddr *) &addr, len) < 0)
-diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c
---- nfs-utils-1.1.5/utils/mountd/cache.c	2009-03-05 12:42:56.000000000 +0100
-+++ nfs-utils-1.1.5.new/utils/mountd/cache.c	2009-04-07 16:11:09.000000000 +0200
-@@ -142,6 +142,7 @@
- 	pw = getpwuid(uid);
- 	if (!pw)
- 		rv = -1;
-+#ifndef __UCLIBC__
- 	else {
- 		rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
- 		if (rv == -1 && ngroups >= 100) {
-@@ -153,6 +154,7 @@
- 						  groups, &ngroups);
- 		}
- 	}
-+#endif /* __UCLIBC__ */
- 	qword_printint(f, uid);
- 	qword_printint(f, time(0)+30*60);
- 	if (rv >= 0) {
diff --git a/net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch b/net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch
new file mode 100644
index 0000000000..f6dbf7040a
--- /dev/null
+++ b/net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch
@@ -0,0 +1,37 @@
+diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c
+--- nfs-utils-1.1.5/utils/mountd/cache.c	2009-03-05 12:42:56.000000000 +0100
++++ nfs-utils-1.1.5.new/utils/mountd/cache.c	2009-04-07 16:11:09.000000000 +0200
+@@ -142,6 +142,7 @@
+ 	pw = getpwuid(uid);
+ 	if (!pw)
+ 		rv = -1;
++#ifndef __UCLIBC__
+ 	else {
+ 		rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
+ 		if (rv == -1 && ngroups >= 100) {
+@@ -153,6 +154,7 @@
+ 						  groups, &ngroups);
+ 		}
+ 	}
++#endif /* __UCLIBC__ */
+ 	qword_printint(f, uid);
+ 	qword_printint(f, time(0)+30*60);
+ 	if (rv >= 0) {
+diff -burN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.p/support/nfs/svc_socket.c
+--- nfs-utils-1.1.5/support/nfs/svc_socket.c	2009-03-05 12:42:56.000000000 +0100
++++ nfs-utils-1.1.5.p/support/nfs/svc_socket.c	2009-04-07 17:33:07.307458029 +0200
+@@ -66,9 +66,13 @@
+ 
+   memset (&addr, 0, sizeof (addr));
+   addr.sin_family = AF_INET;
+-
++#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+   ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
+ 			  &rpcp);
++#else
++  rpcp = getrpcbynumber (number);
++  ret = 0;
++#endif
+   if (ret == 0 && rpcp != NULL)
+     {
+       /* First try name.  */