rpms/nfs-utils/devel nfs-utils-1.2.0-nfsd-41vers.patch, NONE, 1.1 nfs-utils.spec, 1.237, 1.238

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16637

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


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/devel/nfs-utils.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- nfs-utils.spec	15 Jul 2009 14:37:40 -0000	1.237
+++ nfs-utils.spec	28 Jul 2009 12:33:38 -0000	1.238
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -25,6 +25,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
 Patch100: nfs-utils-1.2.1-rc1.patch
 Patch101: nfs-utils-1.2.1-rc2.patch
 Patch102: nfs-utils-1.2.0-proots-rel5.patch
+Patch103: nfs-utils-1.2.0-nfsd-41vers.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -79,6 +80,7 @@ This package also contains the mount.nfs
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -247,7 +249,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
-* Wed Jul 15 10:36:20 EDT 2009
+* Tue Jul 28 2009 <steved at redhat.com> 1.2.0-8
+- Fixed 4.1 versioning problem (bz 512377)
+
+* Wed Jul 15 2009 <steved at redhat.com> 1.2.0-7
 - Added upstream 1.2.1-rc2 patch
   - A large number of mount command changes.