From 74b1a706a9e08bacde54a434b8ceb5e36075826f Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Sat, 28 Jan 2017 15:46:33 -0500
Subject: [PATCH] Corrected boot dependency in systemd files (bz 1401561)

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 rpcbind-0.2.4-systemd-service.patch | 14 ++++++++++++++
 rpcbind.service                     | 13 -------------
 rpcbind.socket                      |  8 --------
 rpcbind.spec                        |  7 ++++++-
 4 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 rpcbind-0.2.4-systemd-service.patch
 delete mode 100644 rpcbind.service
 delete mode 100644 rpcbind.socket

diff --git a/rpcbind-0.2.4-systemd-service.patch b/rpcbind-0.2.4-systemd-service.patch
new file mode 100644
index 0000000..4e5c20f
--- /dev/null
+++ b/rpcbind-0.2.4-systemd-service.patch
@@ -0,0 +1,14 @@
+diff -up rpcbind-0.2.4/systemd/rpcbind.service.in.orig rpcbind-0.2.4/systemd/rpcbind.service.in
+--- rpcbind-0.2.4/systemd/rpcbind.service.in.orig	2017-01-28 11:47:59.505282030 -0500
++++ rpcbind-0.2.4/systemd/rpcbind.service.in	2017-01-28 13:13:43.763324301 -0500
+@@ -6,8 +6,8 @@ RequiresMountsFor=@statedir@
+ 
+ # Make sure we use the IP addresses listed for
+ # rpcbind.socket, no matter how this unit is started.
+-Wants=rpcbind.socket
+-After=rpcbind.socket
++Wants=rpcbind.socket systemd-tmpfiles-setup.service
++After=rpcbind.socket systemd-tmpfiles-setup.service
+ 
+ [Service]
+ Type=notify
diff --git a/rpcbind.service b/rpcbind.service
deleted file mode 100644
index 9bdf489..0000000
--- a/rpcbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC bind service
-Requires=rpcbind.socket
-Wants=systemd-tmpfiles-setup.service
-After=systemd-tmpfiles-setup.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/sysconfig/rpcbind
-ExecStart=/sbin/rpcbind -w $RPCBIND_ARGS
-
-[Install]
-Also=rpcbind.socket
diff --git a/rpcbind.socket b/rpcbind.socket
deleted file mode 100644
index d63c1d9..0000000
--- a/rpcbind.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPCbind Server Activation Socket
-
-[Socket]
-ListenStream=/var/run/rpcbind.sock
-
-[Install]
-WantedBy=sockets.target
diff --git a/rpcbind.spec b/rpcbind.spec
index ba471aa..750674a 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -1,6 +1,6 @@
 Name:           rpcbind
 Version:        0.2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
 License:        BSD
@@ -24,6 +24,7 @@ Patch001: rpcbind-0.2.4-systemd-statdir.patch
 Patch100: rpcbind-0.2.3-systemd-envfile.patch
 Patch101: rpcbind-0.2.3-systemd-tmpfiles.patch
 Patch102: rpcbind-0.2.4-runstatdir.patch
+Patch103: rpcbind-0.2.4-systemd-service.patch
 
 Provides: portmap = %{version}-%{release}
 Obsoletes: portmap <= 4.0-65.3
@@ -42,6 +43,7 @@ RPC calls on a server on that machine.
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -135,6 +137,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Sat Jan 28 2017 Steve Dickson <steved@redhat.com> - 0.2.4-4
+- Corrected boot dependency in systemd files (bz 1401561)
+
 * Mon Jan 23 2017 Steve Dickson <steved@redhat.com> - 0.2.4-3
 - Create a systemd dependency for tmpfiles-setup.service (bz 1401561)