merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'

     and '893542e48954804c96a716027237dc29c119d78b'

2 files changed, 88 insertions, 3 deletions

diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver
index 4ff75916d0..0e9d7be787 100644
--- a/packages/nfs-utils/files/nfsserver
+++ b/packages/nfs-utils/files/nfsserver
@@ -2,16 +2,15 @@
 #
 # Startup script for nfs-utils
 #
-# The nfsd kernel module must exist along with its dependencies
-modprobe -n nfsd || exit 0
 #
 # The environment variable NFS_SERVERS may be set in /etc/default/nfsd
 # Other control variables may be overridden here too
 test -r /etc/default/nfsd && . /etc/default/nfsd
 #
-# Location of exectuables:
+# Location of executables:
 test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/mountd
 test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/nfsd
+test -x "$NFS_STATD" || NFS_STATD=/usr/sbin/statd
 #
 # The user mode program must also exist (it just starts the kernel
 # threads using the kernel module code).
@@ -106,6 +105,20 @@ stop_nfsd(){
 		echo failed
 	fi
 }
+
+#statd
+start_statd(){
+	echo -n "starting statd: "
+	start-stop-daemon --start --exec "$NFS_STATD"
+	echo done
+}
+stop_statd(){
+	# WARNING: this kills any process with the executable
+	# name 'statd'.
+	echo -n 'stopping statd: '
+	start-stop-daemon --stop --quiet --signal 1 --name statd
+	echo done
+}
 #----------------------------------------------------------------------
 #
 # supported options:
@@ -118,15 +131,19 @@ case "$1" in
 start)	create_directories
 	start_nfsd "$NFS_SERVERS"
 	start_mountd
+	start_statd
 	test -r /etc/exports && exportfs -a;;
 stop)	exportfs -ua
+	stop_statd
 	stop_mountd
 	stop_nfsd;;
 reload)	test -r /etc/exports && exportfs -r;;
 restart)exportfs -ua
 	stop_mountd
+	stop_statd
 	# restart does not restart the kernel threads,
 	# only the user mode processes
 	start_mountd
+	start_statd
 	test -r /etc/exports && exportfs -a;;
 esac
diff --git a/packages/nfs-utils/files/uclibc_bzero_fix.patch b/packages/nfs-utils/files/uclibc_bzero_fix.patch
new file mode 100644
index 0000000000..9a276d326e
--- /dev/null
+++ b/packages/nfs-utils/files/uclibc_bzero_fix.patch
@@ -0,0 +1,68 @@
+---
+ support/nfs/svc_socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
+===================================================================
+--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
++++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
+@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
+ 	}
+     }
+ 
+-  __bzero ((char *) &addr, sizeof (addr));
++  memset ((char *) &addr,0, sizeof (addr));
+   addr.sin_family = AF_INET;
+ 
+ #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+---
+ support/nfs/svc_socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
+===================================================================
+--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
++++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
+@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
+ 	}
+     }
+ 
+-  __bzero ((char *) &addr, sizeof (addr));
++  memset ((char *) &addr,0, sizeof (addr));
+   addr.sin_family = AF_INET;
+ 
+ #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+---
+ support/nfs/svc_socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
+===================================================================
+--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
++++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
+@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
+ 	}
+     }
+ 
+-  __bzero ((char *) &addr, sizeof (addr));
++  memset ((char *) &addr,0, sizeof (addr));
+   addr.sin_family = AF_INET;
+ 
+ #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+---
+ support/nfs/svc_socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: nfs-utils-1.0.6/support/nfs/svc_socket.c
+===================================================================
+--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c	2007-05-27 16:14:09.000000000 +0100
++++ nfs-utils-1.0.6/support/nfs/svc_socket.c	2007-05-28 22:43:55.000000000 +0100
+@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int
+ 	}
+     }
+ 
+-  __bzero ((char *) &addr, sizeof (addr));
++  memset ((char *) &addr,0, sizeof (addr));
+   addr.sin_family = AF_INET;
+ 
+ #ifndef __UCLIBC__	/* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */