[watchdog] Resolves: 1012930

[aledvink]

commit fd5bf35a290a6abc6187bab6d75228aac7cf2434
Author: Ales Ledvinka <aledvink at redhat.com>
Date:   Thu Nov 7 14:41:52 2013 +0100

    Resolves: 1012930

 0004-watchdog-5.13-rhseldoc.patch |   49 +++++++++++++++++++++++++++----------
 watchdog.spec                     |    8 +++---
 2 files changed, 40 insertions(+), 17 deletions(-)
---
diff --git a/0004-watchdog-5.13-rhseldoc.patch b/0004-watchdog-5.13-rhseldoc.patch
index 1777969..9501994 100644
--- a/0004-watchdog-5.13-rhseldoc.patch
+++ b/0004-watchdog-5.13-rhseldoc.patch
@@ -1,6 +1,6 @@
-diff -up ./watchdog.8.sepol ./watchdog.8
---- ./watchdog.8.sepol	2013-11-06 17:11:19.714506564 +0100
-+++ ./watchdog.8	2013-11-07 11:30:33.001952183 +0100
+diff -up ./watchdog.8.rhseldoc ./watchdog.8
+--- ./watchdog.8.rhseldoc	2013-02-01 12:15:44.000000000 +0100
++++ ./watchdog.8	2013-11-07 14:22:13.048209132 +0100
 @@ -216,6 +216,15 @@ a given interface for traffic. If no tra
  considered unreachable causing a soft reboot or action from the 
  repair binary.
@@ -37,18 +37,19 @@ diff -up ./watchdog.8.sepol ./watchdog.8
  .SH "TEST DIRECTORY"
  Executables placed in the test directory are discovered by watchdog on 
  startup and are automatically executed.  They are bounded time-wise by
-@@ -365,6 +380,8 @@ return a non-zero value so the machine w
+@@ -365,6 +380,9 @@ return a non-zero value so the machine w
  Note that the watchdog daemon may interpret and act upon any of the reserved
  return codes noted in the Check Binary section prior to calling a given
  command in "repair" mode.
 +.SH SELINUX
-+
++The directories /etc/watchdog.d/ and /usr/libexec/watchdog/scripts/ are
++recognized locations for custom executables.
  .SH BUGS
  None known so far.
  .SH AUTHORS
-diff -up ./watchdog.conf.5.sepol ./watchdog.conf.5
---- ./watchdog.conf.5.sepol	2013-11-07 11:31:32.490482673 +0100
-+++ ./watchdog.conf.5	2013-11-07 11:33:02.501181770 +0100
+diff -up ./watchdog.conf.5.rhseldoc ./watchdog.conf.5
+--- ./watchdog.conf.5.rhseldoc	2013-02-01 12:15:44.000000000 +0100
++++ ./watchdog.conf.5	2013-11-07 14:20:42.027278353 +0100
 @@ -97,6 +97,8 @@ interfaces.
  .TP
  test-binary = <testbin>
@@ -67,15 +68,37 @@ diff -up ./watchdog.conf.5.sepol ./watchdog.conf.5
  .TP
  repair-timeout = <timeout in seconds>
  repair command may only run for <timeout> seconds. Set to 0 for unlimited.
-diff -up ./watchdog.conf.sepol ./watchdog.conf
---- ./watchdog.conf.sepol	2013-11-07 11:33:48.919481740 +0100
-+++ ./watchdog.conf	2013-11-07 11:34:39.581772407 +0100
+@@ -122,6 +126,7 @@ Set the schedule priority for realtime m
+ .TP
+ test-directory = <test directory>
+ Set the directory to run user test/repair scripts.  Default is '/etc/watchdog.d'
++The /etc/watchdog.d/ is recognized by SELinux policy.
+ See the Test Directory section in watchdog(8) for more information.
+ .TP
+ log-dir = <log directory>
+diff -up ./watchdog.conf.rhseldoc ./watchdog.conf
+--- ./watchdog.conf.rhseldoc	2013-02-01 12:15:44.000000000 +0100
++++ ./watchdog.conf	2013-11-07 14:35:49.997934254 +0100
 @@ -15,6 +15,8 @@
  # To get the real size, check how large the pagesize is on your machine.
  #min-memory		= 1
  
-+#With enforcing SELinux policy please use the /usr/libexec/watchdog/scripts/
-+#for your test-binary and repair-binary configuration.
++# With enforcing SELinux policy please use the /usr/libexec/watchdog/scripts/
++# or /etc/watchdog.d/ for your test-binary and repair-binary configuration.
  #repair-binary		= /usr/sbin/repair
  #repair-timeout		= 
  #test-binary		= 
+@@ -37,6 +39,13 @@
+ realtime		= yes
+ priority		= 1
+ 
++# When using custom service pid check with custom service
++# systemd unit file please be aware the "Requires="
++# does dependent service deactivation.
++# Using "Before=watchdog.service" or "Before=watchdog-ping.service"
++# in the custom service unit file may be the desired operation instead.
++# See man 5 systemd.unit for more details.
++#
+ # Check if rsyslogd is still running by enabling the following line
+ #pidfile		= /var/run/rsyslogd.pid   
+ 
diff --git a/watchdog.spec b/watchdog.spec
index f495f7a..221ce36 100644
--- a/watchdog.spec
+++ b/watchdog.spec
@@ -45,10 +45,10 @@ expiration) initiated by the BMC.
  
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1 -b .help
+%patch2 -p1 -b .keepalive
+%patch3 -p1 -b .rhsel
+%patch4 -p1 -b .rhseldoc
 
 cp %{SOURCE2} .
 cp %{SOURCE3} .