rpms/nfs-utils/F-11 nfs-utils-1.2.0-mount-sizeof.patch, NONE, 1.1 nfs-utils.spec, 1.231, 1.232
Steve Dickson
steved at fedoraproject.org
Mon Oct 19 16:56:23 UTC 2009
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2626
Modified Files:
nfs-utils.spec
Added Files:
nfs-utils-1.2.0-mount-sizeof.patch
Log Message:
Make sure stack variables are are initialized correctly (bz 528776)
nfs-utils-1.2.0-mount-sizeof.patch:
stropts.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE nfs-utils-1.2.0-mount-sizeof.patch ---
diff -up nfs-utils-1.2.0/utils/mount/stropts.c.orig nfs-utils-1.2.0/utils/mount/stropts.c
--- nfs-utils-1.2.0/utils/mount/stropts.c.orig 2009-10-19 11:14:41.000000000 -0400
+++ nfs-utils-1.2.0/utils/mount/stropts.c 2009-10-19 12:25:38.000000000 -0400
@@ -431,11 +431,11 @@ static struct mount_options *nfs_rewrite
struct mount_options *options;
struct sockaddr_storage nfs_address;
struct sockaddr *nfs_saddr = (struct sockaddr *)&nfs_address;
- socklen_t nfs_salen;
+ socklen_t nfs_salen = sizeof(nfs_address);
struct pmap nfs_pmap;
struct sockaddr_storage mnt_address;
struct sockaddr *mnt_saddr = (struct sockaddr *)&mnt_address;
- socklen_t mnt_salen;
+ socklen_t mnt_salen = sizeof(mnt_address);
struct pmap mnt_pmap;
options = po_split(str);
@@ -573,7 +573,12 @@ static int nfs_try_nfs23mount(struct nfs
if (nfs_sys_mount(mi, "nfs", *extra_opts))
return 1;
+ /*
+ * The kernel returns EOPNOTSUPP if the RPC bind failed,
+ * and EPROTONOSUPPORT if the version isn't supported.
if (nfs_is_permanent_error(errno))
+ */
+ if (errno != EOPNOTSUPP && errno != EPROTONOSUPPORT)
return 0;
return nfs_retry_nfs23mount(mi);
@@ -639,7 +644,6 @@ static int nfsmount_fg(struct nfsmount_i
for (;;) {
if (nfs_try_mount(mi))
return EX_SUCCESS;
-
if (nfs_is_permanent_error(errno))
break;
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-11/nfs-utils.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- nfs-utils.spec 9 Sep 2009 12:05:12 -0000 1.231
+++ nfs-utils.spec 19 Oct 2009 16:56:23 -0000 1.232
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting cl
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -24,6 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-war
Patch100: nfs-utils-1.2.0-nfsd-41vers.patch
Patch101: nfs-utils-1.2.0-permerrors.patch
+Patch102: nfs-utils-1.2.0-mount-sizeof.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@@ -78,6 +79,8 @@ This package also contains the mount.nfs
%patch100 -p1
# 521638 - Bogus error when mounting stopped server
%patch101 -p1
+# 528776 - NFS to remote non-root volume fails as of latest F-11 update
+%patch102 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@@ -244,6 +247,10 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
+* Mon Oct 19 2009 Steve Dickson <steved at redhat.com> 1.2.0-6
+- Rolled back the 1.2.0-5 fix
+- Make sure stack variables are are initialized correctly (bz 528776)
+
* Wed Sep 9 2009 <steved at redhat.com> 1.2.0-5
- Fixed incorrect error given when server is down (bz 521638)
More information about the fedora-extras-commits
mailing list