diff --git a/nfs-utils-1.2.0-nfsd-41vers.patch b/nfs-utils-1.2.0-nfsd-41vers.patch new file mode 100644 index 0000000..f90612b --- /dev/null +++ b/nfs-utils-1.2.0-nfsd-41vers.patch @@ -0,0 +1,28 @@ +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)", diff --git a/nfs-utils.spec b/nfs-utils.spec index 98e0089..781ba98 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser 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-warn-off.patch 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 and umount.nfs program. %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 1.2.0-8 +- Fixed 4.1 versioning problem (bz 512377) + +* Wed Jul 15 2009 1.2.0-7 - Added upstream 1.2.1-rc2 patch - A large number of mount command changes.