From 55ec648e228f12ce7fe612ffd84d4eced0b70502 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 06 2020 06:10:30 +0000
Subject: import fence-agents-4.2.1-59.el8


---

diff --git a/SOURCES/bz1470813-fencing-4-make-timeout-0-mean-forever.patch b/SOURCES/bz1470813-fencing-4-make-timeout-0-mean-forever.patch
new file mode 100644
index 0000000..1bd250f
--- /dev/null
+++ b/SOURCES/bz1470813-fencing-4-make-timeout-0-mean-forever.patch
@@ -0,0 +1,22 @@
+From 083ecce0e7b6cd41eef026c8a1ba986f8814a7d9 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 5 Nov 2020 11:53:55 +0100
+Subject: [PATCH] fencing: fix run_command() to allow timeout=0 to mean forever
+
+---
+ lib/fencing.py.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fencing.py.py b/lib/fencing.py.py
+index fa34f13a..9654f57b 100644
+--- a/lib/fencing.py.py
++++ b/lib/fencing.py.py
+@@ -1062,7 +1062,7 @@ def run_command(options, command, timeout=None, env=None, log_command=None):
+ 
+ 	thread = threading.Thread(target=process.wait)
+ 	thread.start()
+-	thread.join(timeout)
++	thread.join(timeout if timeout else None)
+ 	if thread.is_alive():
+ 		process.kill()
+ 		fail(EC_TIMED_OUT, stop=(int(options.get("retry", 0)) < 1))
diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec
index f91991e..fda0c54 100644
--- a/SPECS/fence-agents.spec
+++ b/SPECS/fence-agents.spec
@@ -29,7 +29,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.2.1
-Release: 58%{?alphatag:.%{alphatag}}%{?dist}
+Release: 59%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
@@ -117,6 +117,7 @@ Patch75: bz1861926-fence_lpar-fix-list-status-action.patch
 Patch76: bz1470813-fencing-1-disable-timeout.patch
 Patch77: bz1470813-fencing-2-fix-power-timeout.patch
 Patch78: bz1470813-fencing-3-make-timeout-0-mean-forever.patch
+Patch79: bz1470813-fencing-4-make-timeout-0-mean-forever.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hds_cb hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
@@ -273,6 +274,7 @@ BuildRequires: python3-google-api-client
 %patch76 -p1
 %patch77 -p1
 %patch78 -p1
+%patch79 -p1
 
 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@@ -1161,7 +1163,7 @@ Fence agent for IBM z/VM over IP.
 %endif
 
 %changelog
-* Tue Nov  3 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-58
+* Thu Nov  5 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-59
 - fencing: add disable-timeout parameter and make it true by default
   for Pacemaker 2.0+
   Resolves: rhbz#1470813, rhbz#1436429