rpms/nfs-utils/F-12 nfs-utils-1.2.0-mntconf-vers.patch, 1.1, 1.2 nfs-utils.spec, 1.244, 1.245
Steve Dickson
steved at fedoraproject.org
Fri Oct 2 15:34:49 UTC 2009
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14234
Modified Files:
nfs-utils-1.2.0-mntconf-vers.patch nfs-utils.spec
Log Message:
- Fixed a whole where '-o v4' was not overriding the
version in the conf file.
nfs-utils-1.2.0-mntconf-vers.patch:
configfile.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
Index: nfs-utils-1.2.0-mntconf-vers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils-1.2.0-mntconf-vers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nfs-utils-1.2.0-mntconf-vers.patch 30 Sep 2009 19:18:22 -0000 1.1
+++ nfs-utils-1.2.0-mntconf-vers.patch 2 Oct 2009 15:34:49 -0000 1.2
@@ -1,7 +1,7 @@
diff -up nfs-utils-1.2.0/utils/mount/configfile.c.orig nfs-utils-1.2.0/utils/mount/configfile.c
---- nfs-utils-1.2.0/utils/mount/configfile.c.orig 2009-09-30 11:38:53.745992000 -0400
-+++ nfs-utils-1.2.0/utils/mount/configfile.c 2009-09-30 13:49:38.480625000 -0400
-@@ -185,6 +185,19 @@ void free_all(void)
+--- nfs-utils-1.2.0/utils/mount/configfile.c.orig 2009-10-02 11:10:01.000000000 -0400
++++ nfs-utils-1.2.0/utils/mount/configfile.c 2009-10-02 11:14:30.000000000 -0400
+@@ -185,6 +185,20 @@ void free_all(void)
free(entry);
}
}
@@ -10,10 +10,11 @@ diff -up nfs-utils-1.2.0/utils/mount/con
+{
+ int i;
+
-+ if (strcasecmp(field, "nfsvers") == 0 ||
-+ strcasecmp(field, "vers") == 0) {
-+ for (i=0; versions[i]; i++)
-+ if (strncasecmp(mopt, versions[i], strlen(versions[i])) == 0)
++ if (strncmp("mountvers", field, strlen("mountvers") != 0 &&
++ (strcasecmp(field, "nfsvers") == 0 ||
++ strcasecmp(field, "vers") == 0))) {
++ for (i=0; versions[i]; i++)
++ if (strcasestr(mopt, versions[i]) != NULL)
+ return 1;
+ }
+ return 0;
@@ -21,7 +22,7 @@ diff -up nfs-utils-1.2.0/utils/mount/con
/*
* Parse the given section of the configuration
* file to if there are any mount options set.
-@@ -207,6 +220,12 @@ conf_parse_mntopts(char *section, char *
+@@ -207,6 +221,12 @@ conf_parse_mntopts(char *section, char *
snprintf(buf, BUFSIZ, "%s=", node->field);
if (opts && strcasestr(opts, buf) != NULL)
continue;
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-12/nfs-utils.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- nfs-utils.spec 30 Sep 2009 19:18:22 -0000 1.244
+++ nfs-utils.spec 2 Oct 2009 15:34:49 -0000 1.245
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -268,6 +268,10 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Fri Oct 2 2009 Steve Dickson <steved at redhat.com> 1.2.0-15
+- Fixed a whole where '-o v4' was not overriding the
+ version in the conf file.
+
* Wed Sep 30 2009 Steve Dickson <steved at redhat.com> 1.2.0-14
- Change the nfsmount.conf file to define v3 as the default
protocol version.
More information about the scm-commits
mailing list