Updated to latest upstream RC release: nfs-utils-1-2-2-rc3
This commit is contained in:
parent
9d5e785c8f
commit
3bed751430
@ -1,30 +0,0 @@
|
||||
commit 26a14b65991b79d317638f78dc6b4e5ac1ef712e
|
||||
Author: Neil Brown <neilb@suse.de>
|
||||
Date: Mon Dec 7 17:23:48 2009 -0500
|
||||
|
||||
mount.nfs: Retry v4 mounts with v3 on ENOENT errors
|
||||
|
||||
Retry v4 mounts with a v3 mount when the version
|
||||
is not explicitly specified and the mount fails
|
||||
with ENOENT. The will help deal with Linux servers
|
||||
that do not automatically export a pseudo root
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
|
||||
index a0b9e7f..4007150 100644
|
||||
--- a/utils/mount/stropts.c
|
||||
+++ b/utils/mount/stropts.c
|
||||
@@ -668,9 +668,10 @@ static int nfs_try_mount(struct nfsmount_info *mi)
|
||||
/*
|
||||
* To deal with legacy Linux servers that don't
|
||||
* automatically export a pseudo root, retry
|
||||
- * ENOENT errors using version 3
|
||||
+ * ENOENT errors using version 3. And for
|
||||
+ * Linux servers prior to 2.6.25, retry EPERM
|
||||
*/
|
||||
- if (errno != ENOENT)
|
||||
+ if (errno != ENOENT && errno != EPERM)
|
||||
break;
|
||||
}
|
||||
}
|
@ -1,25 +0,0 @@
|
||||
commit 2905358524c0835311501bad04c521479b0525ff
|
||||
Author: Steve Dickson <steved@redhat.com>
|
||||
Date: Thu Nov 12 14:16:12 2009 -0500
|
||||
|
||||
Remove the AI_ADDRCONFIG hint flag to getaddrinfo() when it's
|
||||
call by nfsd to set up the file descriptors that are
|
||||
sent to the kernel. The flag causes the getaddrinfo()
|
||||
to fail, with EAI_NONAME, when there is not a non-loopback
|
||||
network interface configured.
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
|
||||
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
|
||||
index 12d3253..b8028bb 100644
|
||||
--- a/utils/nfsd/nfssvc.c
|
||||
+++ b/utils/nfsd/nfssvc.c
|
||||
@@ -212,7 +212,7 @@ int
|
||||
nfssvc_set_sockets(const int family, const unsigned int protobits,
|
||||
const char *host, const char *port)
|
||||
{
|
||||
- struct addrinfo hints = { .ai_flags = AI_PASSIVE | AI_ADDRCONFIG };
|
||||
+ struct addrinfo hints = { .ai_flags = AI_PASSIVE };
|
||||
|
||||
hints.ai_family = family;
|
||||
|
3498
nfs-utils-1.2.2-rc3.patch
Normal file
3498
nfs-utils-1.2.2-rc3.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -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.1
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# group all 32bit related archs
|
||||
@ -22,9 +22,9 @@ 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.2-rc3.patch
|
||||
|
||||
Patch200: nfs-utils-1.2.0-v4root-rel9.patch
|
||||
Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
|
||||
Patch202: nfs-utils-1.2.1-mount-eperm.patch
|
||||
|
||||
Group: System Environment/Daemons
|
||||
Provides: exportfs = %{epoch}:%{version}-%{release}
|
||||
@ -76,9 +76,9 @@ This package also contains the mount.nfs and umount.nfs program.
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
|
||||
%patch100 -p1
|
||||
|
||||
%patch200 -p1
|
||||
%patch201 -p1
|
||||
%patch202 -p1
|
||||
|
||||
# Remove .orig files
|
||||
find . -name "*.orig" | xargs rm -f
|
||||
@ -250,6 +250,9 @@ fi
|
||||
%attr(4755,root,root) /sbin/umount.nfs4
|
||||
|
||||
%changelog
|
||||
* Mon Dec 14 2009 Steve Dickson <steved@redhat.com> 1.2.1-7
|
||||
- Updated to latest upstream RC release: nfs-utils-1-2-2-rc3
|
||||
|
||||
* Thu Dec 10 2009 Steve Dickson <steved@redhat.com> 1.2.1-6
|
||||
- Update the pseudo root to handle security flavors better.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user