From f0e64fa470385ead68ad4c57e550aacbdc655e0c Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Tue, 3 Jan 2017 13:56:22 -0500
Subject: [PATCH] Fix boot dependency in systemd service file (bz 1401561)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 .gitignore                          |  2 ++
 rpcbind-0.2.4-systemd-statdir.patch | 27 +++++++++++++++++++++++++++
 rpcbind.spec                        | 10 +++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 rpcbind-0.2.4-systemd-statdir.patch

diff --git a/.gitignore b/.gitignore
index 7f5597c..d7a7da0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 rpcbind-0.2.4
 /rpcbind-0.2.4.tar.bz2
+x86_64
+Makefile
diff --git a/rpcbind-0.2.4-systemd-statdir.patch b/rpcbind-0.2.4-systemd-statdir.patch
new file mode 100644
index 0000000..f00b30d
--- /dev/null
+++ b/rpcbind-0.2.4-systemd-statdir.patch
@@ -0,0 +1,27 @@
+commit ee569be4d6189a68b38d2af162af00ff475b48e2
+Author: Yann Leprince <yann.leprince@ylep.fr>
+Date:   Wed Dec 21 14:32:54 2016 -0500
+
+    Fix boot dependency in systemd service file
+    
+    From: Yann Leprince <yann.leprince@ylep.fr>
+    
+    This fix ensures that a separate /var partition will be mounted before
+    rpcbind tries to write its status to /var/run.
+    
+    Acked-by: NeilBrown <neilb@suse.com>
+    Signed-off-by: Yann Leprince <yann.leprince@ylep.fr>
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
+index e7e86da..03a9e0b 100644
+--- a/systemd/rpcbind.service.in
++++ b/systemd/rpcbind.service.in
+@@ -2,6 +2,7 @@
+ Description=RPC Bind
+ Documentation=man:rpcbind(8)
+ DefaultDependencies=no
++RequiresMountsFor=@statedir@
+ 
+ # Make sure we use the IP addresses listed for
+ # rpcbind.socket, no matter how this unit is started.
diff --git a/rpcbind.spec b/rpcbind.spec
index 32b5e27..884c542 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.4
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -19,6 +19,8 @@ Requires(post): chkconfig systemd
 Requires(preun): systemd
 Requires(postun): systemd coreutils
 
+Patch001: rpcbind-0.2.4-systemd-statdir.patch
+
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
 
@@ -33,6 +35,9 @@ RPC calls on a server on that machine.
 %prep
 %setup -q
 
+# 1401561 - rpcbind-0.2.3-12.rc2.fc24 fails to start at boot 
+%patch001 -p1
+
 %patch100 -p1
 %patch101 -p1
 %build
@@ -128,6 +133,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Tue Jan  3 2017 Steve Dickson <steved@redhat.com> - 0.2.4-1
+- Fix boot dependency in systemd service file (bz 1401561)
+
 * Wed Nov 30 2016 Steve Dickson <steved@redhat.com> - 0.2.4-0
 - Update to the latest upstream release: 0.2.4