From 433c940a7f4aaeb42c3800588f3e884f9202bea8 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Jul 03 2008 15:52:18 +0000
Subject: Backported the F-8 patch that fixes sm-notify's pathname.


---

diff --git a/nfs-utils-1.1.0-smnotify-path.patch b/nfs-utils-1.1.0-smnotify-path.patch
new file mode 100644
index 0000000..c5ca70f
--- /dev/null
+++ b/nfs-utils-1.1.0-smnotify-path.patch
@@ -0,0 +1,70 @@
+commit 02968aa55972b680fa00273188da281d7612ca3e
+Author: Steve Dickson <steved@redhat.com>
+Date:   Fri Sep 14 14:19:50 2007 -0400
+
+    Changed the default paths in sm-notify to
+    /var/lib/nfs/statd which is where the locking
+    state is kept in Red Hat distros.
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
+index 98c03f9..862889f 100644
+--- a/utils/statd/sm-notify.c
++++ b/utils/statd/sm-notify.c
+@@ -24,11 +24,13 @@
+ #include <errno.h>
+ #include <grp.h>
+ 
++#define STATD_PATH_XTN "statd/"
++
+ #ifndef BASEDIR
+ # ifdef NFS_STATEDIR
+-#  define BASEDIR		NFS_STATEDIR
++#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
+ # else
+-#  define BASEDIR		"/var/lib/nfs"
++#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
+ # endif
+ #endif
+ 
+diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man
+index dd03b8d..69b7059 100644
+--- a/utils/statd/sm-notify.man
++++ b/utils/statd/sm-notify.man
+@@ -33,7 +33,7 @@ but this is configurable.
+ For each NFS client or server machine to be monitored,
+ .B rpc.statd
+ creates a file in
+-.BR /var/lib/nfs/sm ", "
++.BR /var/lib/nfs/statd/sm ", "
+ and removes the file if monitoring is no longer required.
+ .PP
+ When the machine is rebooted,
+@@ -47,7 +47,7 @@ Each machine has an
+ which is basically an integer counter that is incremented
+ each time the machine reboots. This counter is stored
+ in
+-.BR /var/lib/nfs/state ,
++.BR /var/lib/nfs/statd/state ,
+ and updated by
+ .BR sm-notify .
+ .SS Security
+@@ -149,13 +149,13 @@ By default,
+ .B sm-notify
+ forks and puts itself in the background after obtaining the
+ list of hosts from
+-.BR /var/lib/nfs/sm .
++.BR /var/lib/nfs/statd/sm .
+ .SH FILES
+-.BR /var/lib/nfs/state
++.BR /var/lib/nfs/statd/state
+ .br
+-.BR /var/lib/nfs/sm/*
++.BR /var/lib/nfs/statd/sm/*
+ .br
+-.BR /var/lib/nfs/sm.bak/*
++.BR /var/lib/nfs/statd/sm.bak/*
+ .br
+ .BR /var/run/sm-notify.pid
+ .SH SEE ALSO
diff --git a/nfs-utils-1.1.2-smnotifypath.patch b/nfs-utils-1.1.2-smnotifypath.patch
deleted file mode 100644
index 2a7f027..0000000
--- a/nfs-utils-1.1.2-smnotifypath.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up nfs-utils-1.1.2/utils/statd/sm-notify.c.orig nfs-utils-1.1.2/utils/statd/sm-notify.c
---- nfs-utils-1.1.2/utils/statd/sm-notify.c.orig	2008-03-14 11:46:29.000000000 -0400
-+++ nfs-utils-1.1.2/utils/statd/sm-notify.c	2008-07-02 18:34:24.000000000 -0400
-@@ -24,11 +24,12 @@
- #include <errno.h>
- #include <grp.h>
- 
-+#define STATD_PATH_XTN "statd/"
- #ifndef BASEDIR
- # ifdef NFS_STATEDIR
--#  define BASEDIR		NFS_STATEDIR
-+#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
- # else
--#  define BASEDIR		"/var/lib/nfs"
-+#  define BASEDIR		"/var/lib/nfs/" STATD_PATH_XTN
- # endif
- #endif
- 
-diff -up nfs-utils-1.1.2/utils/statd/sm-notify.man.orig nfs-utils-1.1.2/utils/statd/sm-notify.man
---- nfs-utils-1.1.2/utils/statd/sm-notify.man.orig	2008-03-14 11:46:29.000000000 -0400
-+++ nfs-utils-1.1.2/utils/statd/sm-notify.man	2008-07-02 18:34:13.000000000 -0400
-@@ -33,7 +33,7 @@ but this is configurable.
- For each NFS client or server machine to be monitored,
- .B rpc.statd
- creates a file in
--.BR /var/lib/nfs/sm ", "
-+.BR /var/lib/nfs/statd/sm ", "
- and removes the file if monitoring is no longer required.
- .PP
- When the machine is rebooted,
-@@ -47,7 +47,7 @@ Each machine has an
- which is basically an integer counter that is incremented
- each time the machine reboots. This counter is stored
- in
--.BR /var/lib/nfs/state ,
-+.BR /var/lib/nfs/statd/state ,
- and updated by
- .BR sm-notify .
- .SS Security
-@@ -149,13 +149,13 @@ By default,
- .B sm-notify
- forks and puts itself in the background after obtaining the
- list of hosts from
--.BR /var/lib/nfs/sm .
-+.BR /var/lib/nfs/statd/sm .
- .SH FILES
--.BR /var/lib/nfs/state
-+.BR /var/lib/nfs/statd/state
- .br
--.BR /var/lib/nfs/sm/*
-+.BR /var/lib/nfs/statd/sm/*
- .br
--.BR /var/lib/nfs/sm.bak/*
-+.BR /var/lib/nfs/statd/sm.bak/*
- .br
- .BR /var/run/sm-notify.pid
- .SH SEE ALSO
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 8d67363..5b362a7 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -31,7 +31,7 @@ Patch05: nfs-utils-1.1.0-exportfs-open.patch
 Patch06: nfs-utils-1.1.0-exportfs-man-update.patch
 Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch
 Patch08: nfs-utils-1.1.2-mount-eacces.patch
-Patch09: nfs-utils-1.1.2-smnotifypath.patch
+Patch09: nfs-utils-1.1.0-smnotify-path.patch
 
 Patch101: nfs-utils-1.1.2-tcpwrapper-fix.patch
 Patch102: nfs-utils-1.1.2-mount-retry.patch