[nfs-utils/f22] Update to latest RC release: nfs-utils-1-3-3-rc1
Steve Dickson
steved at fedoraproject.org
Thu Mar 5 19:06:47 UTC 2015
commit 3aa1a4b38ccb6b0a26f4de8c168eda00f3050aeb
Author: Steve Dickson <steved at redhat.com>
Date: Thu Feb 26 14:52:35 2015 -0500
Update to latest RC release: nfs-utils-1-3-3-rc1
Signed-off-by: Steve Dickson <steved at redhat.com>
nfs-utils-1-2-9-rc3.patch | 553 -------
nfs-utils-1-2-9-rc4.patch | 757 ----------
nfs-utils-1.2.10-rc2.patch | 1058 -------------
nfs-utils-1.3.2.rc4.patch | 3463 -------------------------------------------
nfs-utils-1.3.2.rc5.patch | 3516 --------------------------------------------
nfs-utils-1.3.3-rc1.patch | 182 +++
nfs-utils.1.2.9-rc4.patch | 1446 ------------------
nfs-utils.1.2.9-rc6.patch | 1597 --------------------
nfs-utils.spec | 9 +-
sources | 1 -
10 files changed, 187 insertions(+), 12395 deletions(-)
---
diff --git a/nfs-utils-1.3.3-rc1.patch b/nfs-utils-1.3.3-rc1.patch
new file mode 100644
index 0000000..363acf5
--- /dev/null
+++ b/nfs-utils-1.3.3-rc1.patch
@@ -0,0 +1,182 @@
+diff --git a/configure.ac b/configure.ac
+index 8e427e3..e61430f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,6 @@ AC_ARG_WITH(systemd,
+ [AC_HELP_STRING([--with-systemd@<:@=unit-dir-path@:>@],
+ [install systemd unit files @<:@Default: no, and path defaults to /usr/lib/systemd/system if not given@:>@])],
+ test "$withval" = "no" && use_systemd=0 || unitdir=$withval use_systemd=1
+- use_systemd=0
+ )
+ AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1])
+ AC_SUBST(unitdir)
+diff --git a/support/nfs/exports.c b/support/nfs/exports.c
+index eb782b9..4b17d3c 100644
+--- a/support/nfs/exports.c
++++ b/support/nfs/exports.c
+@@ -154,6 +154,7 @@ getexportent(int fromkernel, int fromexports)
+ }
+ }
+
++ xfree(ee.e_hostname);
+ ee = def_ee;
+
+ /* Check for default client */
+@@ -176,7 +177,6 @@ getexportent(int fromkernel, int fromexports)
+ if (!has_default_opts)
+ xlog(L_WARNING, "No options for %s %s: suggest %s(sync) to avoid warning", ee.e_path, exp, exp);
+ }
+- xfree(ee.e_hostname);
+ ee.e_hostname = xstrdup(hostname);
+
+ if (parseopts(opt, &ee, fromexports && !has_default_subtree_opts, NULL) < 0)
+diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
+index 941afe5..a655445 100644
+--- a/systemd/rpc-statd-notify.service
++++ b/systemd/rpc-statd-notify.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Notify NFS peers of a restart
+ Requires=network-online.target
+-After=network-online.target nss-lookup.target
++After=network.target nss-lookup.target
+
+ # if we run an nfs server, it needs to be running before we
+ # tell clients that it has restarted.
+diff --git a/tools/mountstats/mountstats.man b/tools/mountstats/mountstats.man
+index bee3f86..a9df1e4 100644
+--- a/tools/mountstats/mountstats.man
++++ b/tools/mountstats/mountstats.man
+@@ -10,7 +10,7 @@ mountstats \- Displays various NFS client per-mount statistics
+ .RB [ \-v | \-\-version ]
+ .RB [ \-f | \-\-file
+ .IR infile ]
+-.RB [ \-s | \-\-since
++.RB [ \-S | \-\-since
+ .IR sincefile ]
+ .\" .RB [ \-n | \-\-nfs | \-r | \-\-rpc | \-R | \-\-raw ]
+ .R [
+@@ -27,7 +27,7 @@ mountstats \- Displays various NFS client per-mount statistics
+ .RB [ \-v | \-\-version ]
+ .RB [ \-f | \-\-file
+ .IR infile ]
+-.RB [ \-s | \-\-since
++.RB [ \-S | \-\-since
+ .IR sincefile ]
+ .RI [ interval ]
+ .RI [ count ]
+@@ -38,7 +38,7 @@ mountstats \- Displays various NFS client per-mount statistics
+ .RB [ \-v | \-\-version ]
+ .RB [ \-f | \-\-file
+ .IR infile ]
+-.RB [ \-s | \-\-since
++.RB [ \-S | \-\-since
+ .IR sincefile ]
+ .RB [ \-3 ]
+ .RB [ \-4 ]
+@@ -128,7 +128,7 @@ parameter is specified without the
+ parameter, the command generates reports continuously. This may not be used with the
+ .BR \-f | \-\-file
+ or
+-.BR \-s | \-\-since
++.BR \-S | \-\-since
+ options.
+ .SS Options specific to the nfsstat sub-command
+ .IP "\fB\-3\fP"
+diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
+index 3d974d9..88d9fbe 100644
+--- a/utils/exportfs/exports.man
++++ b/utils/exportfs/exports.man
+@@ -218,16 +218,46 @@ This option can be very useful in some situations, but it should be
+ used with due care, and only after confirming that the client system
+ copes with the situation effectively.
+
+-The option can be explicitly disabled with
++The option can be explicitly disabled for NFSv2 and NFSv3 with
+ .IR hide .
++
++This option is not relevant when NFSv4 is use. NFSv4 never hides
++subordinate filesystems. Any filesystem that is exported will be
++visible where expected when using NFSv4.
+ .TP
+-.IR crossmnt
++.I crossmnt
+ This option is similar to
+ .I nohide
+-but it makes it possible for clients to move from the filesystem marked
+-with crossmnt to exported filesystems mounted on it. Thus when a child
+-filesystem "B" is mounted on a parent "A", setting crossmnt on "A" has
+-the same effect as setting "nohide" on B.
++but it makes it possible for clients to access all filesystems mounted
++on a filesystem marked with
++.IR crossmnt .
++Thus when a child filesystem "B" is mounted on a parent "A", setting
++crossmnt on "A" has a similar effect to setting "nohide" on B.
++
++With
++.I nohide
++the child filesystem needs to be explicitly exported. With
++.I crossmnt
++it need not. If a child of a
++.I crossmnt
++file is not explicitly exported, then it will be implicitly exported
++with the same export options as the parent, except for
++.IR fsid= .
++This makes it impossible to
++.B not
++export a child of a
++.I crossmnt
++filesystem. If some but not all subordinate filesystems of a parent
++are to be exported, then they must be explicitly exported and the
++parent should not have
++.I crossmnt
++set.
++
++The
++.I nocrossmnt
++option can explictly disable
++.I crossmnt
++if it was previously set. This is rarely useful.
+ .TP
+ .IR no_subtree_check
+ This option disables subtree checking, which has mild security
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index c23d384..7d250f9 100644
+--- a/utils/mountd/cache.c
++++ b/utils/mountd/cache.c
+@@ -376,7 +376,7 @@ static char *next_mnt(void **v, char *p)
+ *v = f;
+ } else
+ f = *v;
+- while ((me = getmntent(f)) != NULL &&
++ while ((me = getmntent(f)) != NULL && l > 1 &&
+ (strncmp(me->mnt_dir, p, l) != 0 ||
+ me->mnt_dir[l] != '/'))
+ ;
+diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
+index fd576d9..66a6eeb 100644
+--- a/utils/statd/rmtcall.c
++++ b/utils/statd/rmtcall.c
+@@ -221,6 +221,9 @@ process_reply(FD_SET_TYPE *rfds)
+ if (sockfd == -1 || !FD_ISSET(sockfd, rfds))
+ return 0;
+
++ /* Should not be processed again. */
++ FD_CLR (sockfd, rfds);
++
+ if (!(lp = recv_rply(&port)))
+ return 1;
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ simulator (--argc, ++argv); /* simulator() does exit() */
+ #endif
+
+- daemon_init(!(run_mode & MODE_NODAEMON));
++ daemon_init((run_mode & MODE_NODAEMON));
+
+ if (run_mode & MODE_LOG_STDERR) {
+ xlog_syslog(0);
diff --git a/nfs-utils.spec b/nfs-utils.spec
index ec66380..06258d3 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.3.2
-Release: 0.2%{?dist}
+Release: 1.0%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -15,8 +15,7 @@ Source2: nfs.sysconfig
Source3: nfs-utils_env.sh
Source4: lockd.conf
-Patch001: nfs-utils-1.3.2-statd-bg.patch
-Patch002: nfs-utils-1.3.2-statd-nowait.patch
+Patch001: nfs-utils-1.3.3-rc1.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -74,7 +73,6 @@ This package also contains the mount.nfs and umount.nfs program.
%setup -q
%patch001 -p1
-%patch002 -p1
%patch100 -p1
%patch101 -p1
@@ -307,6 +305,9 @@ fi
/sbin/umount.nfs4
%changelog
+* Thu Feb 26 2015 Steve Dickson <steved at redhat.com> 1.3.2-1.0
+- Update to latest RC release: nfs-utils-1-3-3-rc1
+
* Mon Feb 9 2015 Steve Dickson <steved at redhat.com> 1.3.2-0.2
- Change statd-notify.service to not wait for network to come up (bz 1183293)
- Added the rpcuser group before adding the rpcuser uid (bz 1165322)
diff --git a/sources b/sources
index 05716c6..0660fa8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8de676b9ff34b8f9addc1d0800fabdf8 nfs-utils-1.3.1.tar.xz
4cdffb2c7f7fd2bdceaba55ab1b881da nfs-utils-1.3.2.tar.xz
More information about the scm-commits
mailing list