From 396dfac0afb999353a80c427a33f8d3bb100f579 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 8 Apr 2009 13:21:16 +0000
Subject: [PATCH] [package] update nfs-kernel-server patches and init script
 (#4893)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15149 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/nfs-kernel-server/files/nfsd.init         |  2 -
 ...clibc.patch => 001-nfs_utils_uclibc.patch} | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)
 rename net/nfs-kernel-server/patches/{001-nfs_utils_1.0.6_uclibc.patch => 001-nfs_utils_uclibc.patch} (73%)

diff --git a/net/nfs-kernel-server/files/nfsd.init b/net/nfs-kernel-server/files/nfsd.init
index cbe31ceec..a5062c302 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_uclibc.patch
similarity index 73%
rename from net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch
rename to net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch
index 1bdfbaa1e..f6dbf7040 100644
--- a/net/nfs-kernel-server/patches/001-nfs_utils_1.0.6_uclibc.patch
+++ b/net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch
@@ -1,23 +1,3 @@
-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
@@ -37,3 +17,21 @@ diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/
  	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.  */