From 426d8c6b058d757cccdde47d148e15ec50280a93 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:15:57 +0000
Subject: auto-import changelog data from nfs-utils-0.3.1-6.71.src.rpm

Tue Apr 10 2001 Michael K. Johnson <johnsonm@redhat.com>
- do not start lockd on kernel 2.2.18 or higher (done automatically)

---

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 8369492..e05a9e2 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 0.3.1
-Release: 5
+Release: 6.71
 Source0: ftp://nfs.sourceforge.net/pub/nfs/nfs-utils-%{version}.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 Source10: nfs.init
@@ -13,6 +13,7 @@ Patch3: nfs-utils-0.3.1-statd-manpage.patch
 Patch4: eepro-support.patch
 Patch5: time-h.patch
 Patch6: syslog-level.patch
+Patch7: nfs-utils-1.0.3-mountd.secfix.patch
 Group: System Environment/Daemons
 Obsoletes: nfs-server
 Obsoletes: knfsd
@@ -48,6 +49,7 @@ clients which are mounted on that host.
 %patch4 -p1 -b .eepro-support
 %patch5 -p1 -b .time-h
 %patch6 -p1 -b .syslog-level
+%patch7 -p1 -b .secfix
 
 %build
 #
@@ -126,6 +128,9 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Apr 10 2001 Michael K. Johnson <johnsonm@redhat.com>
+- do not start lockd on kernel 2.2.18 or higher (done automatically)
+
 * Fri Mar 30 2001 Preston Brown <pbrown@redhat.com>
 - don't use rquotad from here now; quota package contains a version that 
   works with 2.4 (#33738)
diff --git a/nfslock.init b/nfslock.init
index afe958b..72e0454 100755
--- a/nfslock.init
+++ b/nfslock.init
@@ -23,6 +23,7 @@ fi
 [ ${NETWORKING} = "no" ] && exit 0
 
 KERNVER=`uname -r | awk -F . '{ print $1.$2 }'`
+KERNREL=`uname -r | awk -F '[.-]' '{ print $3 }'`
 
 RETVAL=0
 
@@ -34,7 +35,7 @@ fi
 start() {
 	# Start daemons.
 	echo $"Starting NFS file locking services: "
-	if [ "$KERNVER" -lt 24 ]; then
+	if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then
 	  echo -n $"Starting NFS lockd: "
 	  daemon rpc.lockd
 	  echo
@@ -50,7 +51,7 @@ start() {
 stop() {
 	# Stop daemons.
 	echo $"Shutting down NFS file locking services: "
-	if [ "$KERNVER" -lt 24 ]; then 
+	if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then
 	   echo -n $"Shutting down NFS lockd: "
 	   killproc lockd
 	   echo
@@ -72,7 +73,7 @@ case "$1" in
   	stop
 	;;
   status)
-        if [ "$KERNVER" -lt 24 ]; then
+	if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then
 	  status lockd
 	fi 
 	status rpc.statd
@@ -86,7 +87,7 @@ case "$1" in
 	  echo start; exit 0
 	fi
 	/sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
-	if [ "$KERNVER" -lt 24 ]; then 
+	if [ "$KERNVER" -lt 24 -a "$KERNREL" -lt 18 ]; then
 	   /sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
 	else
 	   LOCKD=0