From f6e169fb37f1201b5f8d87e1da61725a9a67bffa Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Sun, 1 Feb 2015 12:54:55 -0500 Subject: [PATCH] statd: Fix test for foreground mode (bz 1188040) Signed-off-by: Steve Dickson --- nfs-utils-1.2.1-statd-bg.patch | 25 +++++++++++++++++++++++++ nfs-utils.spec | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 nfs-utils-1.2.1-statd-bg.patch diff --git a/nfs-utils-1.2.1-statd-bg.patch b/nfs-utils-1.2.1-statd-bg.patch new file mode 100644 index 0000000..dbfb6e5 --- /dev/null +++ b/nfs-utils-1.2.1-statd-bg.patch @@ -0,0 +1,25 @@ +commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 +Author: Chris Mayo +Date: Sun Feb 1 12:03:46 2015 -0500 + + statd: Fix test for foreground mode + + daemon_init parameter has the opposite sense + to code removed in commit 7addf9d + + Signed-off-by: Chris Mayo + Signed-off-by: Steve Dickson + +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 734995b..d503c9c 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.0%{?dist} +Release: 0.1%{?dist} Epoch: 1 # group all 32bit related archs @@ -15,6 +15,8 @@ Source2: nfs.sysconfig Source3: nfs-utils_env.sh Source4: lockd.conf +Patch001: nfs-utils-1.2.1-statd-bg.patch + Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch @@ -70,6 +72,8 @@ This package also contains the mount.nfs and umount.nfs program. %prep %setup -q +%patch001 -p1 + %patch100 -p1 %patch101 -p1 %patch102 -p1 @@ -293,6 +297,9 @@ fi /sbin/umount.nfs4 %changelog +* Sun Feb 1 2015 Steve Dickson 1.3.2-0.1 +- statd: Fix test for foreground mode (bz 1188040) + * Sat Jan 31 2015 Steve Dickson 1.3.2-0.0 - Updated to latest upstream release: 1-3-2