From af1fa63571fb52505624c96aa51a5aabfd653cfa Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:17:42 +0000
Subject: [PATCH] auto-import nfs-utils-0.3.3-4 from nfs-utils-0.3.3-4.src.rpm

---
 .cvsignore     |  2 +-
 nfs-utils.spec | 24 +++++++++++-------------
 nfs.init       |  9 ++-------
 sources        |  2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 807d317..5dab2ba 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-nfs-utils-0.3.1.tar.gz
+nfs-utils-0.3.3.tar.gz
 nfs.doc.tar.gz
diff --git a/nfs-utils.spec b/nfs-utils.spec
index f9da75a..4b827e1 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,19 +1,17 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 0.3.1
-Release: 14.72
+Version: 0.3.3
+Release: 4
 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
 Source11: nfslock.init
-Patch0: nfs-utils-0.3.1-drop-privs.patch
+Patch0: nfs-utils-0.3.3.drop-privs.patch
 Patch1: nfs-utils-0.2beta-nowrap.patch
 Patch2: no-chroot.patch
-Patch3: nfs-utils-0.3.1-statd-manpage.patch
+Patch3: nfs-utils-0.3.3.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,8 +46,6 @@ clients which are mounted on that host.
 %patch3 -p1 -b .statd-manpage
 %patch4 -p1 -b .eepro-support
 %patch5 -p1 -b .time-h
-%patch6 -p1 -b .syslog-level
-%patch7 -p1 -b .secfix
 
 %build
 #
@@ -136,12 +132,14 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
-* Fri Jun 20 2003 Steve Dickson <SteveD@RedHat.com>
-- Added mountd security fix
+* Mon Feb 18 2002 Bob Matthews <bmatthews@redhat.com>
+- "service nfs restart" should start services even if currently 
+-   not running (#59469)
+- bump version to 0.3.3-4
 
-* Tue Oct 16 2001 Bob Matthews <bmatthews@redhat.com>
-- cvs branch for 7.2 errata
-- user nfsnobody should be a system account (#54221)
+* Wed Oct  3 2001 Bob Matthews <bmatthews@redhat.com>
+- Move to nfs-utils-0.3.3
+- Make nfsnobody a system account (#54221)
 
 * Tue Aug 21 2001 Bob Matthews <bmatthews@redhat.com>
 - if UID 65534 is unassigned, add user nfsnobody (#22865)
diff --git a/nfs.init b/nfs.init
index 2341514..5342988 100755
--- a/nfs.init
+++ b/nfs.init
@@ -92,13 +92,8 @@ case "$1" in
 	fi
 	;;
   restart)
-	echo -n "Restarting NFS services: "
-	echo -n "rpc.mountd "
-	killproc rpc.mountd
-	daemon rpc.mountd $RPCMOUNTDOPTS
-	/usr/sbin/exportfs -r
-	touch /var/lock/subsys/nfs
-	echo
+	$0 stop || :
+	$0 start 
 	;;
   reload)
 	/usr/sbin/exportfs -r
diff --git a/sources b/sources
index e73376d..bb5c24d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7acac2d055067d48bf5bc4b4d0fc630f  nfs-utils-0.3.1.tar.gz
+a33ad83846a7ca49af3b3106badf7af6  nfs-utils-0.3.3.tar.gz
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz