diff --git a/SOURCES/nfs-utils-2.3.3-nfsconf-manage-gids.patch b/SOURCES/nfs-utils-2.3.3-nfsconf-manage-gids.patch
new file mode 100644
index 0000000..43de59a
--- /dev/null
+++ b/SOURCES/nfs-utils-2.3.3-nfsconf-manage-gids.patch
@@ -0,0 +1,23 @@
+commit 268e3c0cff6d6aee3b8f5458545f8dab76d7d444
+Author: Steve Dickson <steved@redhat.com>
+Date: Mon Feb 4 15:17:42 2019 -0500
+
+ nfs.conf: Fixed manage-gids option typo
+
+ Reported-by: Adam DiFrischia <adifrischia@curtisswright.com>
+ BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=333
+ Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/nfs.conf b/nfs.conf
+index 796bee4..722b024 100644
+--- a/nfs.conf
++++ b/nfs.conf
+@@ -26,7 +26,7 @@
+ #
+ [mountd]
+ # debug=0
+-# manage_gids=n
++# manage-gids=n
+ # descriptors=0
+ # port=0
+ # threads=1
diff --git a/SOURCES/nfs-utils-2.3.3-statd-force.patch b/SOURCES/nfs-utils-2.3.3-statd-force.patch
new file mode 100644
index 0000000..24b786c
--- /dev/null
+++ b/SOURCES/nfs-utils-2.3.3-statd-force.patch
@@ -0,0 +1,73 @@
+diff -up nfs-utils-2.3.3/nfs.conf.orig nfs-utils-2.3.3/nfs.conf
+--- nfs-utils-2.3.3/nfs.conf.orig 2019-08-13 11:10:15.801644147 -0400
++++ nfs-utils-2.3.3/nfs.conf 2019-08-13 11:10:53.767959268 -0400
+@@ -65,6 +65,7 @@ use-gss-proxy=1
+ #
+ [sm-notify]
+ # debug=0
++# force=0
+ # retry-time=900
+ # outgoing-port=
+ # outgoing-addr=
+diff -up nfs-utils-2.3.3/utils/statd/sm-notify.c.orig nfs-utils-2.3.3/utils/statd/sm-notify.c
+--- nfs-utils-2.3.3/utils/statd/sm-notify.c.orig 2019-08-13 11:10:15.788644039 -0400
++++ nfs-utils-2.3.3/utils/statd/sm-notify.c 2019-08-13 11:10:53.768959276 -0400
+@@ -49,6 +49,7 @@
+ #define NLM_END_GRACE_FILE "/proc/fs/lockd/nlm_end_grace"
+
+ int lift_grace = 1;
++int force = 0;
+
+ struct nsm_host {
+ struct nsm_host * next;
+@@ -480,19 +481,10 @@ nsm_lift_grace_period(void)
+ close(fd);
+ return;
+ }
+-
+-int
+-main(int argc, char **argv)
++inline static void
++read_nfsconf(char **argv)
+ {
+- int c, sock, force = 0;
+- char * progname;
+- char * s;
+-
+- progname = strrchr(argv[0], '/');
+- if (progname != NULL)
+- progname++;
+- else
+- progname = argv[0];
++ char *s;
+
+ conf_init_file(NFS_CONFFILE);
+ xlog_from_conffile("sm-notify");
+@@ -500,10 +492,27 @@ main(int argc, char **argv)
+ opt_srcport = conf_get_str("sm-notify", "outgoing-port");
+ opt_srcaddr = conf_get_str("sm-notify", "outgoing-addr");
+ lift_grace = conf_get_bool("sm-notify", "lift-grace", lift_grace);
++
+ s = conf_get_str("statd", "state-directory-path");
+ if (s && !nsm_setup_pathnames(argv[0], s))
+ exit(1);
+ opt_update_state = conf_get_bool("sm-notify", "update-state", opt_update_state);
++ force = conf_get_bool("sm-notify", "force", force);
++}
++
++int
++main(int argc, char **argv)
++{
++ int c, sock;
++ char * progname;
++
++ progname = strrchr(argv[0], '/');
++ if (progname != NULL)
++ progname++;
++ else
++ progname = argv[0];
++
++ read_nfsconf(argv);
+
+ while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
+ switch (c) {
diff --git a/SOURCES/nfsconvert.py b/SOURCES/nfsconvert.py
index da2f621..f826107 100644
--- a/SOURCES/nfsconvert.py
+++ b/SOURCES/nfsconvert.py
@@ -104,12 +104,13 @@ CONV_STATD = {'-o': (CONF_NFS, 'statd', 'outgoing-port', '$1'),
}
# options for sm-notify found in SMNOTIFYARGS
-OPTS_SMNOTIFY = 'dm:np:v:P:'
+OPTS_SMNOTIFY = 'dm:np:v:P:f'
CONV_SMNOTIFY = {'-d': (CONF_NFS, 'sm-notify', 'debug', 'all'),
'-m': (CONF_NFS, 'sm-notify', 'retry-time', '$1'),
'-n': (CONF_NFS, 'sm-notify', 'update-state', '1'),
'-p': (CONF_NFS, 'sm-notify', 'outgoing-port', '$1'),
'-v': (CONF_NFS, 'sm-notify', 'outgoing-addr', '$1'),
+ '-f': (CONF_NFS, 'sm-notify', 'force', '1'),
'-P': (CONF_NFS, 'statd', 'state-directory-path', '$1'),
}
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index a6c1b38..a099bbe 100644
--- a/SPECS/nfs-utils.spec
+++ b/SPECS/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://linux-nfs.org/
Version: 2.3.3
-Release: 14%{?dist}
+Release: 14%{?dist}.3
Epoch: 1
# group all 32bit related archs
@@ -32,6 +32,8 @@ Patch008: nfs-utils-2.3.3-gating-tests.patch
# RHEL 8.0-Z
#
Patch009: nfs-utils-2.3.3-statd-no-notify.patch
+Patch010: nfs-utils-2.3.3-statd-force.patch
+Patch011: nfs-utils-2.3.3-nfsconf-manage-gids.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -318,6 +320,15 @@ fi
%{_libdir}/libnfsidmap.so
%changelog
+* Mon Aug 26 2019 Steve Dickson <steved@redhat.com> 2.3.3-14_0.3
+- nfs.conf: Fixed manage-gids option typo (bz 1716591)
+
+* Tue Aug 13 2019 Steve Dickson <steved@redhat.com> 2.3.3-14_0.2
+- Add a conversion for new sm-notify force option to sm-notify (bz 1716592)
+
+* Mon Aug 05 2019 Steve Dickson <steved@redhat.com> 2.3.3-14_0.1
+- Add a conversion for new sm-notify force option in nfs.conf (bz 1716592)
+
* Wed Apr 3 2019 Steve Dickson <steved@redhat.com> 2.3.3-14_0
- Add nfs.conf equivalent for the statd --no-notify cmdline option (1690280)
- Correct the modes on /etc/nfs.conf after a conversion (bz 1690266)