Sat Jan 5 14:27:48 UTC 2008

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27534

Modified Files:
	nfs-utils-1.1.0-exp-subtree-warn-off.patch 
	nfs-utils-1.1.0-exportfs-open.patch 
	nfs-utils-1.1.0-nfs-man.patch nfs-utils.spec nfslock.init 
Removed Files:
	nfs-utils-1.0.12-mountd-memleak.patch 
	nfs-utils-1.0.12-mtab-mis-unlock.patch 
	nfs-utils-1.0.12-nfsd-macargs.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 
	nfs-utils-1.1.0-smnotify-path.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.


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/devel/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	5 Jan 2008 14:27:40 -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	2007-10-18 23:07:28.000000000 -0400
++++ nfs-utils-1.1.1/support/nfs/exports.c	2008-01-05 09:01:50.000000000 -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;

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

Index: nfs-utils-1.1.0-exportfs-open.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.1.0-exportfs-open.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.0-exportfs-open.patch	16 Aug 2007 02:44:53 -0000	1.1
+++ nfs-utils-1.1.0-exportfs-open.patch	5 Jan 2008 14:27:40 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up nfs-utils-1.1.0/support/nfs/xio.c.orig nfs-utils-1.1.0/support/nfs/xio.c
---- nfs-utils-1.1.0/support/nfs/xio.c.orig	2007-05-10 23:40:57.000000000 -0400
-+++ nfs-utils-1.1.0/support/nfs/xio.c	2007-08-15 22:23:13.000000000 -0400
-@@ -54,13 +54,20 @@ xflock(char *fname, char *type)
+diff -up nfs-utils-1.1.1/support/nfs/xio.c.save nfs-utils-1.1.1/support/nfs/xio.c
+--- nfs-utils-1.1.1/support/nfs/xio.c.save	2007-10-18 23:07:28.000000000 -0400
++++ nfs-utils-1.1.1/support/nfs/xio.c	2008-01-05 08:27:35.000000000 -0500
+@@ -54,13 +54,19 @@ xflock(char *fname, char *type)
  {
  	struct sigaction sa, oldsa;
  	int		readonly = !strcmp(type, "r");
@@ -9,15 +9,13 @@
  	struct flock	fl = { readonly? F_RDLCK : F_WRLCK, SEEK_SET, 0, 0, 0 };
  	int		fd;
  
--	if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT))) < 0) {
--		xlog(L_WARNING, "could not open %s for locking", fname);
-+	if (readonly) 
+-	if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT), 0644)) < 0) {
++	if (readonly)
 +		fd = open(fname, O_RDONLY);
 +	else
 +		fd = open(fname, (O_RDWR|O_CREAT), mode);
 +	if (fd < 0) {
-+		xlog(L_WARNING, "could not %s %s for locking", 
-+			(readonly ? "open" : "create"), fname);
+ 		xlog(L_WARNING, "could not open %s for locking", fname);
  		return -1;
  	}
 +

nfs-utils-1.1.0-nfs-man.patch:

Index: nfs-utils-1.1.0-nfs-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils-1.1.0-nfs-man.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.1.0-nfs-man.patch	4 Jan 2008 15:08:11 -0000	1.1
+++ nfs-utils-1.1.0-nfs-man.patch	5 Jan 2008 14:27:40 -0000	1.2
@@ -4,15 +4,15 @@
 
     Incorporated Chuck Lever's and Don Domingo's changes to the
     nfs(5) manual page.
-    
+
     Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
     Signed-off-by: Don Domingo <ddomingo at redhat.com>
     Signed-off-by: Steve Dickson <steved at redhat.com>
 
-diff -up nfs-utils-1.1.0/utils/mount/nfs.man.orig nfs-utils-1.1.0/utils/mount/nfs.man
---- nfs-utils-1.1.0/utils/mount/nfs.man.orig	2007-12-17 08:16:15.000000000 -0500
-+++ nfs-utils-1.1.0/utils/mount/nfs.man	2008-01-04 10:02:33.000000000 -0500
-@@ -1,498 +1,1233 @@
+diff -up nfs-utils-1.1.1/utils/mount/nfs.man.save nfs-utils-1.1.1/utils/mount/nfs.man
+--- nfs-utils-1.1.1/utils/mount/nfs.man.save	2007-10-18 23:07:28.000000000 -0400
++++ nfs-utils-1.1.1/utils/mount/nfs.man	2008-01-05 08:34:22.000000000 -0500
+@@ -1,510 +1,1233 @@
 -.\" nfs.5 "Rick Sladkey" <jrs at world.std.com>
 -.\" Wed Feb  8 12:52:42 1995, faith at cs.unc.edu: updates for Ross Biro's
 -.\" patches. "
@@ -853,77 +853,13 @@
 +and chooses an appropriate transport for each service.
 +Refer to the TRANSPORT METHODS section for more details.
  .TP 1.5i
--.I clientaddr=n
--On a multi-homed client, this
--causes the client to use a specific callback address when
--communicating with an NFS version 4 server.
--This option is currently ignored.
--.TP 1.5i
--.I sec=mode
--Same as \f3sec=mode\f1 for the nfs filesystem type (see above).
--.TP 1.5i
--.I bg
--If an NFS mount attempt times out, retry the mount
--in the background.
--After a mount operation is backgrounded, all subsequent mounts
--on the same NFS server will be backgrounded immediately, without
--first attempting the mount.
--A missing mount point is treated as a timeout,
--to allow for nested NFS mounts.
--.TP 1.5i
--.I fg
--If the first NFS mount attempt times out, retry the mount
--in the foreground.
--This is the complement of the
--.I bg
--option, and also the default behavior.
--.TP 1.5i
--.I soft
--If an NFS file operation has a major timeout then report an I/O error to
--the calling program.
--The default is to continue retrying NFS file operations indefinitely.
--.TP 1.5i
--.I hard
--If an NFS file operation has a major timeout then report
--"server not responding" on the console and continue retrying indefinitely.
--This is the default.
--.TP 1.5i
--.I intr
--If an NFS file operation has a major timeout and it is hard mounted,
--then allow signals to interupt the file operation and cause it to
--return EINTR to the calling program.  The default is to not
--allow file operations to be interrupted.
--.TP 1.5i
--.I nocto
--Suppress the retrieval of new attributes when creating a file.
--.TP 1.5i
--.I noac
--Disable attribute caching, and force synchronous writes.
--This extracts a
--server performance penalty but it allows two different NFS clients
--to get reasonable good results when both clients are actively
--writing to common filesystem on the server.
--.TP 1.5i
--.I nosharecache
--As of kernel 2.6.18, it is no longer possible to mount the same
--same filesystem with different mount options to a new mountpoint.
--It was deemed unsafe to do so, since cached data cannot be shared
--between the two mountpoints. In consequence, files or directories
--that were common to both mountpoint subtrees could often be seen to
--be out of sync following an update.
--.br
--This option allows administrators to select the pre-2.6.18 behaviour,
--permitting the same filesystem to be mounted with different mount
--options.
--.br
--.B Beware:
--Use of this option is not recommended unless you are certain that there
--are no hard links or subtrees of this mountpoint that are mounted
--elsewhere.
--.P
--All of the non-value options have corresponding nooption forms.
--For example, nointr means don't allow file operations to be
--interrupted.
+-.I clientaddr=n.n.n.n
+-Specifies a single IPv4 address in dotted-quad form that
+-the NFS client advertises to allow servers to perform
+-NFSv4 callback requests against files on this mount point.
+-If the server is not able to establish callback connections
+-to clients, performance may degrade, or accesses to
+-files may temporarily hang.
 +.B udp
 +The
 +.B udp
@@ -963,14 +899,16 @@
 +The mount request fails if the server's rpcbind service is not available,
 +the server's mountd service is not registered with its rpcbind service,
 +or the server's mountd service is not available on the advertised port.
-+.IP
+ .IP
 +This option can be used when mounting an NFS server
 +through a firewall that blocks the rpcbind protocol.
 +.TP 1.5i
 +.BI mounthost= name
 +The hostname of the host running mountd.
-+If this option is not specified, the
-+.BR mount (8)
+ If this option is not specified, the
+ .BR mount (8)
+-command attempts to discover an appropriate callback
+-address automatically.
 +command assumes that the mountd service runs
 +on the same host as the NFS service.
 +.TP 1.5i
@@ -1170,7 +1108,77 @@
 +If this option is not specified, the
 +.BR mount (8)
 +command attempts to discover an appropriate callback address automatically.
-+The automatic discovery process is not perfect, however.
+ The automatic discovery process is not perfect, however.
+-In the presence of multiple client network interfaces, special
+-routing policies, or atypical network topologies, the exact
+-address to use for callbacks may be nontrivial to determine,
+-and should be explicitly set using this mount option.
+-.TP 1.5i
+-.I sec=mode
+-Same as \f3sec=mode\f1 for the nfs filesystem type (see above).
+-.TP 1.5i
+-.I bg
+-If an NFS mount attempt times out, retry the mount
+-in the background.
+-After a mount operation is backgrounded, all subsequent mounts
+-on the same NFS server will be backgrounded immediately, without
+-first attempting the mount.
+-A missing mount point is treated as a timeout,
+-to allow for nested NFS mounts.
+-.TP 1.5i
+-.I fg
+-If the first NFS mount attempt times out, retry the mount
+-in the foreground.
+-This is the complement of the
+-.I bg
+-option, and also the default behavior.
+-.TP 1.5i
+-.I soft
+-If an NFS file operation has a major timeout then report an I/O error to
+-the calling program.
+-The default is to continue retrying NFS file operations indefinitely.
+-.TP 1.5i
+-.I hard
+-If an NFS file operation has a major timeout then report
+-"server not responding" on the console and continue retrying indefinitely.
+-This is the default.
+-.TP 1.5i
+-.I intr
+-If an NFS file operation has a major timeout and it is hard mounted,
+-then allow signals to interupt the file operation and cause it to
+-return EINTR to the calling program.  The default is to not
+-allow file operations to be interrupted.
+-.TP 1.5i
+-.I nocto
+-Suppress the retrieval of new attributes when creating a file.
+-.TP 1.5i
+-.I noac
+-Disable attribute caching, and force synchronous writes.
+-This extracts a
+-server performance penalty but it allows two different NFS clients
+-to get reasonable good results when both clients are actively
+-writing to common filesystem on the server.
+-.TP 1.5i
+-.I nosharecache
+-As of kernel 2.6.18, it is no longer possible to mount the same
+-same filesystem with different mount options to a new mountpoint.
+-It was deemed unsafe to do so, since cached data cannot be shared
+-between the two mountpoints. In consequence, files or directories
+-that were common to both mountpoint subtrees could often be seen to
+-be out of sync following an update.
+-.br
+-This option allows administrators to select the pre-2.6.18 behaviour,
+-permitting the same filesystem to be mounted with different mount
+-options.
+-.br
+-.B Beware:
+-Use of this option is not recommended unless you are certain that there
+-are no hard links or subtrees of this mountpoint that are mounted
+-elsewhere.
+-.P
+-All of the non-value options have corresponding nooption forms.
+-For example, nointr means don't allow file operations to be
+-interrupted.
 +In the presence of multiple client network interfaces,
 +special routing policies,
 +or atypical network topologies,


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- nfs-utils.spec	4 Jan 2008 15:08:11 -0000	1.159
+++ nfs-utils.spec	5 Jan 2008 14:27:40 -0000	1.160
@@ -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: 8%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -25,18 +25,11 @@
 Patch00: nfs-utils-1.0.5-statdpath.patch
 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.0-nfs-man.patch
+Patch03: nfs-utils-1.1.0-showmount-rpcerror.patch
+Patch04: nfs-utils-1.1.0-exp-subtree-warn-off.patch
+Patch05: nfs-utils-1.1.0-exportfs-open.patch
+Patch06: nfs-utils-1.1.0-exportfs-man-update.patch
+Patch07: nfs-utils-1.1.0-nfs-man.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -97,13 +90,6 @@
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -201,10 +187,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
@@ -274,8 +260,11 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Fri Jan  4 2008 Steve Dickson <steved at redhat.com>  1.1.0-8
-- Updated nfs(5) manual page.
+* Sat Jan  5 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.
 
 * Tue Dec 04 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.1.0-7
  - Rebuild for openldap bump


Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/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	5 Jan 2008 14:27:40 -0000	1.19
@@ -55,6 +55,9 @@
     if [ ! -f /var/lock/subsys/nfslock ]; then
 	# Start daemons.
 	if [ "$USERLAND_LOCKD" ]; then
+	  # Make sure locks are recovered
+	  rm -f /var/run/sm-notify.pid
+
 	  echo -n $"Starting NFS locking: "
 	  daemon rpc.lockd
 	  echo
@@ -98,6 +101,7 @@
 	RETVAL=$?
 	echo
 	rm -f /var/lock/subsys/nfslock
+	rm -f /var/run/sm-notify.pid
 	return $RETVAL
 }
 


--- nfs-utils-1.0.12-mountd-memleak.patch DELETED ---


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


--- nfs-utils-1.0.12-nfsd-macargs.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 ---


--- nfs-utils-1.1.0-smnotify-path.patch DELETED ---


