rpms/nfs-utils/F-11 nfs-utils-1.2.0-nfsd-41vers.patch, NONE, 1.1 nfs-utils.spec, 1.229, 1.230

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18255

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.2.0-nfsd-41vers.patch 
Log Message:
Fixed 4.1 versioning problem (bz 513496)


nfs-utils-1.2.0-nfsd-41vers.patch:
 nfssvc.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE nfs-utils-1.2.0-nfsd-41vers.patch ---
diff -up nfs-utils-1.2.0/support/nfs/nfssvc.c.orig nfs-utils-1.2.0/support/nfs/nfssvc.c
--- nfs-utils-1.2.0/support/nfs/nfssvc.c.orig	2009-06-02 10:43:05.000000000 -0400
+++ nfs-utils-1.2.0/support/nfs/nfssvc.c	2009-07-27 11:22:13.000000000 -0400
@@ -127,17 +127,19 @@ nfssvc_versbits(unsigned int ctlbits, in
 	if (fd < 0)
 		return;
 
+	n = minorvers4 >= 0 ? minorvers4 : -minorvers4;
+	if (n >= NFSD_MINMINORVERS4 && n <= NFSD_MAXMINORVERS4)
+		    off += snprintf(ptr+off, BUFSIZ - off, "%c4.%d ",
+				    minorvers4 > 0 ? '+' : '-',
+				    n);
+
 	for (n = NFSD_MINVERS; n <= NFSD_MAXVERS; n++) {
 		if (NFSCTL_VERISSET(ctlbits, n))
 		    off += snprintf(ptr+off, BUFSIZ - off, "+%d ", n);
 		else
 		    off += snprintf(ptr+off, BUFSIZ - off, "-%d ", n);
 	}
-	n = minorvers4 >= 0 ? minorvers4 : -minorvers4;
-	if (n >= NFSD_MINMINORVERS4 && n <= NFSD_MAXMINORVERS4)
-		    off += snprintf(ptr+off, BUFSIZ - off, "%c4.%d",
-				    minorvers4 > 0 ? '+' : '-',
-				    n);
+
 	snprintf(ptr+off, BUFSIZ - off, "\n");
 	if (write(fd, buf, strlen(buf)) != strlen(buf)) {
 		syslog(LOG_ERR, "nfssvc: Setting version failed: errno %d (%s)", 


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- nfs-utils.spec	11 Jun 2009 18:04:04 -0000	1.229
+++ nfs-utils.spec	27 Jul 2009 18:14:37 -0000	1.230
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -22,6 +22,8 @@ Patch00: nfs-utils-1.0.5-statdpath.patch
 Patch01: nfs-utils-1.1.0-smnotify-path.patch
 Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
 
+Patch100: nfs-utils-1.2.0-nfsd-41vers.patch
+
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
 Provides: nfsstat     = %{epoch}:%{version}-%{release}
@@ -71,6 +73,8 @@ This package also contains the mount.nfs
 %patch01 -p1
 %patch02 -p1
 
+%patch100 -p1
+
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
@@ -236,6 +240,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Jul 27 2009 <steved at redhat.com> 1.2.0-4
+- Fixed 4.1 versioning problem (bz 513496)
+
 * Wed Jun 10 2009 <steved at redhat.com> 1.2.0-3
 - Updated init scripts to add dependencies
   on other system facilities (bz 475133)