rpms/nfs-utils/F-8 .cvsignore, 1.20, 1.21 nfs-utils-1.1.0-exp-subtree-warn-off.patch, 1.1, 1.2 nfs-utils.spec, 1.158, 1.159 nfslock.init, 1.18, 1.19 sources, 1.21, 1.22 nfs-utils-1.0.12-mtab-mis-unlock.patch, 1.1, NONE nfs-utils-1.0.12-nfsd-macargs.patch, 1.1, NONE nfs-utils-1.1.0-exportfs-open.patch, 1.1, NONE nfs-utils-1.1.0-gssglue.patch, 1.1, NONE nfs-utils-1.1.0-mount-nosharecache.patch, 1.1, NONE nfs-utils-1.1.0-mount-v4-errors.patch, 1.1, NONE

Steve Dickson (steved) fedora-extras-commits at redhat.com
Mon Mar 3 18:52:12 UTC 2008 

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11433

Modified Files:
	.cvsignore nfs-utils-1.1.0-exp-subtree-warn-off.patch 
	nfs-utils.spec nfslock.init sources 
Removed Files:
	nfs-utils-1.0.12-mtab-mis-unlock.patch 
	nfs-utils-1.0.12-nfsd-macargs.patch 
	nfs-utils-1.1.0-exportfs-open.patch 
	nfs-utils-1.1.0-gssglue.patch 
	nfs-utils-1.1.0-mount-nosharecache.patch 
	nfs-utils-1.1.0-mount-v4-errors.patch 
Log Message:
- Updated to latest upstream release, nfs-utils-1.1.1
- Added the removal of sm-notify.pid to nfslock init script.
- Changed spec file to use condrestart instead of condstop
  when calling init scripts.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	30 Jul 2007 10:10:07 -0000	1.20
+++ .cvsignore	3 Mar 2008 18:51:35 -0000	1.21
@@ -10,3 +10,4 @@
 nfs-utils-1.0.11.tar.bz2
 nfs-utils-1.0.12.tar.bz2
 nfs-utils-1.1.0.tar.bz2
+nfs-utils-1.1.1.tar.bz2

nfs-utils-1.1.0-exp-subtree-warn-off.patch:

Index: nfs-utils-1.1.0-exp-subtree-warn-off.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils-1.1.0-exp-subtree-warn-off.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.0-exp-subtree-warn-off.patch	30 Jul 2007 10:10:07 -0000	1.1
+++ nfs-utils-1.1.0-exp-subtree-warn-off.patch	3 Mar 2008 18:51:35 -0000	1.2
@@ -1,11 +1,12 @@
---- nfs-utils-1.1.0/support/nfs/exports.c.orig	2007-05-10 23:40:57.000000000 -0400
-+++ nfs-utils-1.1.0/support/nfs/exports.c	2007-07-16 09:13:40.000000000 -0400
-@@ -355,7 +355,7 @@ static int valid_uuid(char *uuid)
- static int
+diff -up nfs-utils-1.1.1/support/nfs/exports.c.orig nfs-utils-1.1.1/support/nfs/exports.c
+--- nfs-utils-1.1.1/support/nfs/exports.c.orig	2008-03-03 13:14:34.558044000 -0500
++++ nfs-utils-1.1.1/support/nfs/exports.c	2008-03-03 13:15:39.380142000 -0500
+@@ -484,7 +484,7 @@ static int
  parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
  {
+ 	struct sec_entry *p;
 -	int	had_subtree_opt = 0;
 +	int	had_subtree_opt = 1;
  	char 	*flname = efname?efname:"command line";
  	int	flline = efp?efp->x_line:0;
- 
+ 	unsigned int active = 0;


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfs-utils.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- nfs-utils.spec	7 Jan 2008 19:04:11 -0000	1.158
+++ nfs-utils.spec	3 Mar 2008 18:51:35 -0000	1.159
@@ -1,8 +1,8 @@
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
-Version: 1.1.0
-Release: 7%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -26,18 +26,12 @@
 Patch01: nfs-utils-1.0.6-mountd.patch
 Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch
 Patch03: nfs-utils-1.0.12-mountd-memleak.patch
-Patch04: nfs-utils-1.0.12-nfsd-macargs.patch
-Patch05: nfs-utils-1.0.12-mtab-mis-unlock.patch
-Patch06: nfs-utils-1.1.0-exp-subtree-warn-off.patch
-Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
-Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
-Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
-Patch10: nfs-utils-1.1.0-exportfs-open.patch
-Patch11: nfs-utils-1.1.0-smnotify-path.patch
-Patch12: nfs-utils-1.1.0-exportfs-man-update.patch
-Patch13: nfs-utils-1.1.0-gssglue.patch
-Patch14: nfs-utils-1.1.1-mountd-man.patch
-Patch15: nfs-utils-1.1.0-fsloc-nohide.patch
+Patch04: nfs-utils-1.1.0-showmount-rpcerror.patch
+Patch05: nfs-utils-1.1.0-exp-subtree-warn-off.patch
+Patch06: nfs-utils-1.1.0-smnotify-path.patch
+Patch07: nfs-utils-1.1.0-exportfs-man-update.patch
+Patch08: nfs-utils-1.1.1-mountd-man.patch
+Patch09: nfs-utils-1.1.0-fsloc-nohide.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -100,12 +94,6 @@
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -203,10 +191,10 @@
 
 %preun
 if [ "$1" = "0" ]; then
-    /etc/rc.d/init.d/nfs condstop
-    /etc/rc.d/init.d/rpcgssd condstop
-    /etc/rc.d/init.d/rpcidmapd condstop
-    /etc/rc.d/init.d/nfslock condstop
+    /etc/rc.d/init.d/nfs condrestart
+    /etc/rc.d/init.d/rpcgssd condrestart
+    /etc/rc.d/init.d/rpcidmapd condrestart
+    /etc/rc.d/init.d/nfslock condrestart
     /sbin/chkconfig --del rpcidmapd
     /sbin/chkconfig --del rpcgssd
     /sbin/chkconfig --del rpcsvcgssd
@@ -276,6 +264,12 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Mar  3 2008 Steve Dickson <steved at redhat.com>  1.1.1-1
+- Updated to latest upstream release, nfs-utils-1.1.1
+- Added the removal of sm-notify.pid to nfslock init script.
+- Changed spec file to use condrestart instead of condstop
+  when calling init scripts.
+
 * Mon Jan  7 2008 Steve Dickson <steved at redhat.com>  1.1.0-7
 - Fixed typo in rpc.mountd man page
 - Turn on 'nohide' automatically for all refer exports (bz 313561)


Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/nfslock.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nfslock.init	30 Jul 2007 10:10:07 -0000	1.18
+++ nfslock.init	3 Mar 2008 18:51:35 -0000	1.19
@@ -54,6 +54,10 @@
 start() {
     if [ ! -f /var/lock/subsys/nfslock ]; then
 	# Start daemons.
+
+	# Make sure locks are recovered
+	rm -f /var/run/sm-notify.pid
+
 	if [ "$USERLAND_LOCKD" ]; then
 	  echo -n $"Starting NFS locking: "
 	  daemon rpc.lockd
@@ -98,6 +102,7 @@
 	RETVAL=$?
 	echo
 	rm -f /var/lock/subsys/nfslock
+	rm -f /var/run/sm-notify.pid
 	return $RETVAL
 }
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-8/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	30 Jul 2007 10:10:07 -0000	1.21
+++ sources	3 Mar 2008 18:51:35 -0000	1.22
@@ -1,2 +1,2 @@
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
-42d92ed97f7d4071a017ccac8055cf51  nfs-utils-1.1.0.tar.bz2
+d2a7815329405172b29f051fcffe3c94  nfs-utils-1.1.1.tar.bz2


--- nfs-utils-1.0.12-mtab-mis-unlock.patch DELETED ---


--- nfs-utils-1.0.12-nfsd-macargs.patch DELETED ---


--- nfs-utils-1.1.0-exportfs-open.patch DELETED ---


--- nfs-utils-1.1.0-gssglue.patch DELETED ---


--- nfs-utils-1.1.0-mount-nosharecache.patch DELETED ---


--- nfs-utils-1.1.0-mount-v4-errors.patch DELETED ---

More information about the fedora-extras-commits mailing list