import OL fence-agents-4.10.0-62.el9_4.3

2024-06-13 12:33:27 +00:00 · 2024-06-13 12:33:27 +00:00 · 7e38a25aa0
commit 7e38a25aa0
parent 7dbace849d
5 changed files with 497 additions and 35 deletions
--- a/.fence-agents.metadata
+++ b/.fence-agents.metadata
@ -64,14 +64,14 @@ a0df3ebc552b551f8e99a05cf0a29ce30bef62ee SOURCES/pycparser-2.20-py2.py3-none-any
 c55d177e9484d974c95078d4ae945f89ba2c7251 SOURCES/pycryptodome-3.20.0.tar.gz
 c8307f47e3b75a2d02af72982a2dfefa3f56e407 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
 6082312a090f5be5e796e0854294da0738ec0379 SOURCES/pyparsing-3.0.1.tar.gz
-24213006f983ada342ed86ea516028fdbb1ac66f SOURCES/pyroute2-0.6.4.tar.gz
-a052fefd7a93e1e4b2ca87c6a6c242ae70f97489 SOURCES/pyroute2.core-0.6.4.tar.gz
-e58f6fa56f1baf766ba147dbc9fbfc67fa92e234 SOURCES/pyroute2.ethtool-0.6.4.tar.gz
-9de1b2825454872697339a63f4d6d06a5167fb73 SOURCES/pyroute2.ipdb-0.6.4.tar.gz
-4ce5ab32674f3d2652e2f102b2502af4d499ba6a SOURCES/pyroute2.ipset-0.6.4.tar.gz
-7dc3c981c9c991990647b74e670115395675fe04 SOURCES/pyroute2.ndb-0.6.4.tar.gz
-281fe514b28e096f9deb1121ee8340976f47e8c0 SOURCES/pyroute2.nftables-0.6.4.tar.gz
-7ecab830b1978fbd07d565872731268169847bc4 SOURCES/pyroute2.nslink-0.6.4.tar.gz
+770968018322c2b3fde684aebe964663c6f5d8c5 SOURCES/pyroute2-0.7.12.tar.gz
+086fd01f5d989a69eeda46b8a41a53ced5bb402b SOURCES/pyroute2.core-0.6.13.tar.gz
+9575a9b38119670705b0a6c2648455d97b22ddc6 SOURCES/pyroute2.ethtool-0.6.13.tar.gz
+751cb7dc70e3c1780a670c26ca5721de7caef5e7 SOURCES/pyroute2.ipdb-0.6.13.tar.gz
+c204fa61b905fe7b65e250e9204a642bbf3bb84c SOURCES/pyroute2.ipset-0.6.13.tar.gz
+d5cba2a4501ffcaf7dcf3df9e9072c4fe343fc02 SOURCES/pyroute2.ndb-0.6.13.tar.gz
+4939a1807c414682446d836307543928146bda25 SOURCES/pyroute2.nftables-0.6.13.tar.gz
+9ea5167f48860ac18a969b8830925852830297cc SOURCES/pyroute2.nslink-0.6.13.tar.gz
 c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 SOURCES/python-dateutil-2.8.2.tar.gz
 1dc2fa004aa6517f1620e55d8a7b8e68a9cf2a47 SOURCES/python-string-utils-1.0.0.tar.gz
 3005ff67df93ee276fb8631e17c677df852254ad SOURCES/python_dateutil-2.8.1-py2.py3-none-any.whl
--- a/.gitignore
+++ b/.gitignore
@ -64,14 +64,14 @@ SOURCES/pycparser-2.20-py2.py3-none-any.whl
 SOURCES/pycryptodome-3.20.0.tar.gz
 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
 SOURCES/pyparsing-3.0.1.tar.gz
-SOURCES/pyroute2-0.6.4.tar.gz
-SOURCES/pyroute2.core-0.6.4.tar.gz
-SOURCES/pyroute2.ethtool-0.6.4.tar.gz
-SOURCES/pyroute2.ipdb-0.6.4.tar.gz
-SOURCES/pyroute2.ipset-0.6.4.tar.gz
-SOURCES/pyroute2.ndb-0.6.4.tar.gz
-SOURCES/pyroute2.nftables-0.6.4.tar.gz
-SOURCES/pyroute2.nslink-0.6.4.tar.gz
+SOURCES/pyroute2-0.7.12.tar.gz
+SOURCES/pyroute2.core-0.6.13.tar.gz
+SOURCES/pyroute2.ethtool-0.6.13.tar.gz
+SOURCES/pyroute2.ipdb-0.6.13.tar.gz
+SOURCES/pyroute2.ipset-0.6.13.tar.gz
+SOURCES/pyroute2.ndb-0.6.13.tar.gz
+SOURCES/pyroute2.nftables-0.6.13.tar.gz
+SOURCES/pyroute2.nslink-0.6.13.tar.gz
 SOURCES/python-dateutil-2.8.2.tar.gz
 SOURCES/python-string-utils-1.0.0.tar.gz
 SOURCES/python_dateutil-2.8.1-py2.py3-none-any.whl
--- a/SOURCES/RHEL-35273-fence_eps-add-fence_epsr2-for-ePowerSwitch-R2-and-newer.patch
+++ b/SOURCES/RHEL-35273-fence_eps-add-fence_epsr2-for-ePowerSwitch-R2-and-newer.patch
@ -0,0 +1,380 @@
+From 55451b6fd007e6f9a6d6860e95304b7c5c27cc1b Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 2 May 2024 15:10:16 +0200
+Subject: [PATCH 1/2] fencing: add support for docs["agent_name"] to use the
+ main agent name when generating manpages
+
+---
+ lib/fencing.py.py                 | 12 +++++++++---
+ tests/data/metadata/fence_eps.xml |  9 ++++++---
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/lib/fencing.py.py b/lib/fencing.py.py
+index 511eb2689..66e2ff156 100644
+--- a/lib/fencing.py.py
+++ b/lib/fencing.py.py
+@@ -603,7 +603,7 @@ def usage(avail_opt):
+ 		if len(value["help"]) != 0:
+ 			print("   " + _join_wrap([value["help"]], first_indent=3))
+ 
+-def metadata(options, avail_opt, docs):
+def metadata(options, avail_opt, docs, agent_name=os.path.basename(sys.argv[0])):
+ 	# avail_opt has to be unique, if there are duplicities then they should be removed
+ 	sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt)) if "longopt" in all_opt[key]]
+ 	# Find keys that are going to replace inconsistent names
+@@ -617,7 +617,7 @@ def metadata(options, avail_opt, docs):
+                docs["longdesc"] = re.sub(r"\\f[BPIR]|\.P|\.TP|\.br\n", r"", docs["longdesc"])
+ 
+ 	print("<?xml version=\"1.0\" ?>")
+-	print("<resource-agent name=\"" + os.path.basename(sys.argv[0]) + \
+	print("<resource-agent name=\"" + agent_name + \
+ 			"\" shortdesc=\"" + docs["shortdesc"] + "\" >")
+ 	for (symlink, desc) in docs.get("symlink", []):
+ 		print("<symlink name=\"" + symlink + "\" shortdesc=\"" + desc + "\"/>")
+@@ -928,9 +928,15 @@ def show_docs(options, docs=None):
+ 		sys.exit(0)
+ 
+ 	if options.get("--action", "") in ["metadata", "manpage"]:
+		if options["--action"] == "metadata" or "agent_name" not in docs:
+			agent_name=os.path.basename(sys.argv[0])
+		else:
+			agent_name=docs["agent_name"]
+
+
+ 		if "port_as_ip" in device_opt:
+ 			device_opt.remove("separator")
+-		metadata(options, device_opt, docs)
+		metadata(options, device_opt, docs, agent_name)
+ 		sys.exit(0)
+ 
+ 	if "--version" in options:
+diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml
+index 3f9ebdc22..a3aeb1aea 100644
+--- a/tests/data/metadata/fence_eps.xml
+++ b/tests/data/metadata/fence_eps.xml
+@@ -1,9 +1,12 @@
+ <?xml version="1.0" ?>
+ <resource-agent name="fence_eps" shortdesc="Fence agent for ePowerSwitch" >
+-<longdesc>fence_eps is a Power Fencing agent which can be used with the ePowerSwitch 8M+ power switch to fence connected machines. Fence agent works ONLY on 8M+ device, because this is only one, which has support for hidden page feature. 
+<symlink name="fence_epsr2" shortdesc="Fence agent for ePowerSwitch R2 and newer"/>
+<longdesc>fence_eps is a Power Fencing agent which can be used with the ePowerSwitch 8M+ power switch to fence connected machines. It ONLY works on 8M+ devices, as they support the hidden page feature. 
+ 
+-Agent basically works by connecting to hidden page and pass appropriate arguments to GET request. This means, that hidden page feature must be enabled and properly configured.</longdesc>
+-<vendor-url>http://www.epowerswitch.com</vendor-url>
+The agent works by connecting to the hidden page and pass the appropriate arguments to GET request. This means, that the hidden page feature must be enabled and properly configured. 
+
+NOTE: In most cases you want to use fence_epsr2, as fence_eps only works with older hardware.</longdesc>
+<vendor-url>https://www.neol.com</vendor-url>
+ <parameters>
+ 	<parameter name="action" unique="0" required="1">
+ 		<getopt mixed="-o, --action=[action]" />
+
+From 639f5293e0b2c0153ea01bf37534b74f436dd630 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 13 Feb 2024 11:11:25 +0100
+Subject: [PATCH 2/2] fence_eps: add fence_epsr2 for ePowerSwitch R2 and newer
+
+---
+ agents/eps/fence_eps.py             |  46 ++++---
+ fence-agents.spec.in                |   4 +-
+ tests/data/metadata/fence_epsr2.xml | 178 ++++++++++++++++++++++++++++
+ 3 files changed, 211 insertions(+), 17 deletions(-)
+ create mode 100644 tests/data/metadata/fence_epsr2.xml
+
+diff --git a/agents/eps/fence_eps.py b/agents/eps/fence_eps.py
+index 81e439533..1e6bda099 100644
+--- a/agents/eps/fence_eps.py
+++ b/agents/eps/fence_eps.py
+@@ -3,8 +3,8 @@
+ # The Following Agent Has Been Tested On:
+ # ePowerSwitch 8M+ version 1.0.0.4
+ 
+-import sys, re
+-import base64, string, socket
+import sys, os, re
+import base64, socket
+ import logging
+ import atexit
+ sys.path.append("@FENCEAGENTSLIBDIR@")
+@@ -37,7 +37,7 @@ def eps_run_command(options, params):
+ 				options["--password"] = "" # Default is empty password
+ 
+ 			# String for Authorization header
+-			auth_str = 'Basic ' + string.strip(base64.encodestring(options["--username"]+':'+options["--password"]))
+			auth_str = 'Basic ' + str(base64.encodebytes(bytes(options["--username"]+':'+options["--password"], "utf-8")).decode("utf-8").strip())
+ 			logging.debug("Authorization: %s\n", auth_str)
+ 			conn.putheader('Authorization', auth_str)
+ 
+@@ -60,16 +60,22 @@ def eps_run_command(options, params):
+ 		logging.error("Failed: {}".format(str(e)))
+ 		fail(EC_LOGIN_DENIED)
+ 
+-	return result
+	return result.decode("utf-8", "ignore")
+ 
+ def get_power_status(conn, options):
+ 	del conn
+ 	ret_val = eps_run_command(options, "")
+ 
+ 	result = {}
+-	status = re.findall(r"p(\d{2})=(0|1)\s*\<br\>", ret_val.lower())
+	if os.path.basename(sys.argv[0]) == "fence_eps":
+		status = re.findall(r"p(\d{2})=(0|1)\s*\<br\>", ret_val.lower())
+	elif os.path.basename(sys.argv[0]) == "fence_epsr2":
+		status = re.findall(r"m0:o(\d)=(on|off)\s*", ret_val.lower())
+ 	for out_num, out_stat in status:
+-		result[out_num] = ("", (out_stat == "1" and "on" or "off"))
+		if os.path.basename(sys.argv[0]) == "fence_eps":
+			result[out_num] = ("", (out_stat == "1" and "on" or "off"))
+		elif os.path.basename(sys.argv[0]) == "fence_epsr2":
+			result[out_num] = ("", out_stat)
+ 
+ 	if not options["--action"] in ['monitor', 'list']:
+ 		if not options["--plug"] in result:
+@@ -81,7 +87,12 @@ def get_power_status(conn, options):
+ 
+ def set_power_status(conn, options):
+ 	del conn
+-	eps_run_command(options, "P%s=%s"%(options["--plug"], (options["--action"] == "on" and "1" or "0")))
+	if os.path.basename(sys.argv[0]) == "fence_eps":
+		eps_run_command(options, "P%s=%s"%(options["--plug"], (options["--action"] == "on" and "1" or "0")))
+	elif os.path.basename(sys.argv[0]) == "fence_epsr2":
+		if options["--action"] == "reboot":
+			options["--action"] = "off"
+		eps_run_command(options, "M0:O%s=%s"%(options["--plug"], options["--action"]))
+ 
+ # Define new option
+ def eps_define_new_opts():
+@@ -107,20 +118,25 @@ def main():
+ 	options = check_input(device_opt, process_input(device_opt))
+ 
+ 	docs = {}
+	docs["agent_name"] = "fence_eps"
+ 	docs["shortdesc"] = "Fence agent for ePowerSwitch"
+-	docs["longdesc"] = "fence_eps is a Power Fencing agent \
+	docs["longdesc"] = os.path.basename(sys.argv[0]) + " is a Power Fencing agent \
+ which can be used with the ePowerSwitch 8M+ power switch to fence \
+-connected machines. Fence agent works ONLY on 8M+ device, because \
+-this is only one, which has support for hidden page feature. \
+connected machines. It ONLY works on 8M+ devices, as \
+they support the hidden page feature. \
+ \n.TP\n\
+-Agent basically works by connecting to hidden page and pass \
+-appropriate arguments to GET request. This means, that hidden \
+-page feature must be enabled and properly configured."
+-	docs["vendorurl"] = "http://www.epowerswitch.com"
+The agent works by connecting to the hidden page and pass \
+the appropriate arguments to GET request. This means, that the hidden \
+page feature must be enabled and properly configured. \
+\n.TP\n\
+NOTE: In most cases you want to use fence_epsr2, as fence_eps \
+only works with older hardware."
+	docs["vendorurl"] = "https://www.neol.com"
+	docs["symlink"] = [("fence_epsr2", "Fence agent for ePowerSwitch R2 and newer")]
+ 	show_docs(options, docs)
+ 
+ 	run_delay(options)
+-	#Run fence action. Conn is None, beacause we always need open new http connection
+	#Run fence action. Conn is None, because we always need open new http connection
+ 	result = fence_action(None, options, set_power_status, get_power_status, get_power_status)
+ 
+ 	sys.exit(result)
+diff --git a/fence-agents.spec.in b/fence-agents.spec.in
+index e139e6da5..5b8066122 100644
+--- a/fence-agents.spec.in
+++ b/fence-agents.spec.in
+@@ -597,8 +597,8 @@ BuildArch: noarch
+ Fence agent for ePowerSwitch 8M+ power switches that are accessed
+ via the HTTP(s) protocol.
+ %files eps
+-%{_sbindir}/fence_eps
+-%{_mandir}/man8/fence_eps.8*
+%{_sbindir}/fence_eps*
+%{_mandir}/man8/fence_eps*.8*
+ 
+ %package gce
+ License: GPL-2.0-or-later AND LGPL-2.0-or-later
+diff --git a/tests/data/metadata/fence_epsr2.xml b/tests/data/metadata/fence_epsr2.xml
+new file mode 100644
+index 000000000..37074e052
+--- /dev/null
+++ b/tests/data/metadata/fence_epsr2.xml
+@@ -0,0 +1,178 @@
+<?xml version="1.0" ?>
+<resource-agent name="fence_epsr2" shortdesc="Fence agent for ePowerSwitch" >
+<symlink name="fence_epsr2" shortdesc="Fence agent for ePowerSwitch R2 and newer"/>
+<longdesc>fence_epsr2 is a Power Fencing agent which can be used with the ePowerSwitch 8M+ power switch to fence connected machines. It ONLY works on 8M+ devices, as they support the hidden page feature. 
+
+The agent works by connecting to the hidden page and pass the appropriate arguments to GET request. This means, that the hidden page feature must be enabled and properly configured. 
+
+NOTE: In most cases you want to use fence_epsr2, as fence_eps only works with older hardware.</longdesc>
+<vendor-url>https://www.neol.com</vendor-url>
+<parameters>
+	<parameter name="action" unique="0" required="1">
+		<getopt mixed="-o, --action=[action]" />
+		<content type="string" default="reboot"  />
+		<shortdesc lang="en">Fencing action</shortdesc>
+	</parameter>
+	<parameter name="hidden_page" unique="0" required="0" deprecated="1">
+		<getopt mixed="-c, --page=[page]" />
+		<content type="string" default="hidden.htm"  />
+		<shortdesc lang="en">Name of hidden page</shortdesc>
+	</parameter>
+	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
+		<getopt mixed="-a, --ip=[ip]" />
+		<content type="string"  />
+		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+	</parameter>
+	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+		<getopt mixed="-a, --ip=[ip]" />
+		<content type="string"  />
+		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+	</parameter>
+	<parameter name="ipport" unique="0" required="0">
+		<getopt mixed="-u, --ipport=[port]" />
+		<content type="integer" default="80"  />
+		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+	</parameter>
+	<parameter name="login" unique="0" required="0" deprecated="1">
+		<getopt mixed="-l, --username=[name]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login name</shortdesc>
+	</parameter>
+	<parameter name="page" unique="0" required="0" obsoletes="hidden_page">
+		<getopt mixed="-c, --page=[page]" />
+		<content type="string" default="hidden.htm"  />
+		<shortdesc lang="en">Name of hidden page</shortdesc>
+	</parameter>
+	<parameter name="passwd" unique="0" required="0" deprecated="1">
+		<getopt mixed="-p, --password=[password]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login password or passphrase</shortdesc>
+	</parameter>
+	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
+		<getopt mixed="-S, --password-script=[script]" />
+		<content type="string"  />
+		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+	</parameter>
+	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+		<getopt mixed="-p, --password=[password]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login password or passphrase</shortdesc>
+	</parameter>
+	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+		<getopt mixed="-S, --password-script=[script]" />
+		<content type="string"  />
+		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+	</parameter>
+	<parameter name="plug" unique="0" required="1" obsoletes="port">
+		<getopt mixed="-n, --plug=[id]" />
+		<content type="string"  />
+		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+	</parameter>
+	<parameter name="port" unique="0" required="1" deprecated="1">
+		<getopt mixed="-n, --plug=[id]" />
+		<content type="string"  />
+		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+	</parameter>
+	<parameter name="username" unique="0" required="0" obsoletes="login">
+		<getopt mixed="-l, --username=[name]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login name</shortdesc>
+	</parameter>
+	<parameter name="quiet" unique="0" required="0">
+		<getopt mixed="-q, --quiet" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
+	</parameter>
+	<parameter name="verbose" unique="0" required="0">
+		<getopt mixed="-v, --verbose" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
+	</parameter>
+	<parameter name="verbose_level" unique="0" required="0">
+		<getopt mixed="--verbose-level" />
+		<content type="integer"  />
+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
+	</parameter>
+	<parameter name="debug" unique="0" required="0" deprecated="1">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<content type="string"  />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="version" unique="0" required="0">
+		<getopt mixed="-V, --version" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display version information and exit</shortdesc>
+	</parameter>
+	<parameter name="help" unique="0" required="0">
+		<getopt mixed="-h, --help" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display help and exit</shortdesc>
+	</parameter>
+	<parameter name="plug_separator" unique="0" required="0">
+		<getopt mixed="--plug-separator=[char]" />
+		<content type="string" default=","  />
+		<shortdesc lang="en">Separator for plug parameter when specifying more than 1 plug</shortdesc>
+	</parameter>
+	<parameter name="separator" unique="0" required="0">
+		<getopt mixed="-C, --separator=[char]" />
+		<content type="string" default=","  />
+		<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
+	</parameter>
+	<parameter name="delay" unique="0" required="0">
+		<getopt mixed="--delay=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
+	</parameter>
+	<parameter name="disable_timeout" unique="0" required="0">
+		<getopt mixed="--disable-timeout=[true/false]" />
+		<content type="string"  />
+		<shortdesc lang="en">Disable timeout (true/false) (default: true when run from Pacemaker 2.0+)</shortdesc>
+	</parameter>
+	<parameter name="login_timeout" unique="0" required="0">
+		<getopt mixed="--login-timeout=[seconds]" />
+		<content type="second" default="5"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
+	</parameter>
+	<parameter name="power_timeout" unique="0" required="0">
+		<getopt mixed="--power-timeout=[seconds]" />
+		<content type="second" default="20"  />
+		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="power_wait" unique="0" required="0">
+		<getopt mixed="--power-wait=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="shell_timeout" unique="0" required="0">
+		<getopt mixed="--shell-timeout=[seconds]" />
+		<content type="second" default="3"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
+	</parameter>
+	<parameter name="stonith_status_sleep" unique="0" required="0">
+		<getopt mixed="--stonith-status-sleep=[seconds]" />
+		<content type="second" default="1"  />
+		<shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
+	</parameter>
+	<parameter name="retry_on" unique="0" required="0">
+		<getopt mixed="--retry-on=[attempts]" />
+		<content type="integer" default="1"  />
+		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+	</parameter>
+</parameters>
+<actions>
+	<action name="on" automatic="0"/>
+	<action name="off" />
+	<action name="reboot" />
+	<action name="status" />
+	<action name="list" />
+	<action name="list-status" />
+	<action name="monitor" />
+	<action name="metadata" />
+	<action name="manpage" />
+	<action name="validate-all" />
+</actions>
+</resource-agent>
--- a/SOURCES/RHEL-36482-kubevirt-fix-bundled-jinja2-CVE-2024-34064.patch
+++ b/SOURCES/RHEL-36482-kubevirt-fix-bundled-jinja2-CVE-2024-34064.patch
@ -0,0 +1,65 @@
+From d655030770081e2dfe46f90e27620472a502289d Mon Sep 17 00:00:00 2001
+From: David Lord <davidism@gmail.com>
+Date: Thu, 2 May 2024 09:14:00 -0700
+Subject: [PATCH] disallow invalid characters in keys to xmlattr filter
+
+---
+ CHANGES.rst           |  6 ++++++
+ src/jinja2/filters.py | 22 +++++++++++++++++-----
+ tests/test_filters.py | 11 ++++++-----
+ 3 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/kubevirt/jinja2/filters.py b/kubevirt/jinja2/filters.py
+index 4cf3c11fb..acd11976e 100644
+--- a/kubevirt/jinja2/filters.py
+++ b/kubevirt/jinja2/filters.py
+@@ -250,7 +250,9 @@ def do_items(value: t.Union[t.Mapping[K, V], Undefined]) -> t.Iterator[t.Tuple[K
+     yield from value.items()
+ 
+ 
+-_space_re = re.compile(r"\s", flags=re.ASCII)
+# Check for characters that would move the parser state from key to value.
+# https://html.spec.whatwg.org/#attribute-name-state
+_attr_key_re = re.compile(r"[\s/>=]", flags=re.ASCII)
+ 
+ 
+ @pass_eval_context
+@@ -259,8 +261,14 @@ def do_xmlattr(
+ ) -> str:
+     """Create an SGML/XML attribute string based on the items in a dict.
+ 
+-    If any key contains a space, this fails with a ``ValueError``. Values that
+-    are neither ``none`` nor ``undefined`` are automatically escaped.
+    **Values** that are neither ``none`` nor ``undefined`` are automatically
+    escaped, safely allowing untrusted user input.
+
+    User input should not be used as **keys** to this filter. If any key
+    contains a space, ``/`` solidus, ``>`` greater-than sign, or ``=`` equals
+    sign, this fails with a ``ValueError``. Regardless of this, user input
+    should never be used as keys to this filter, or must be separately validated
+    first.
+ 
+     .. sourcecode:: html+jinja
+ 
+@@ -280,6 +288,10 @@ def do_xmlattr(
+     As you can see it automatically prepends a space in front of the item
+     if the filter returned something unless the second parameter is false.
+ 
+    .. versionchanged:: 3.1.4
+        Keys with ``/`` solidus, ``>`` greater-than sign, or ``=`` equals sign
+        are not allowed.
+
+     .. versionchanged:: 3.1.3
+         Keys with spaces are not allowed.
+     """
+@@ -289,8 +301,8 @@ def do_xmlattr(
+         if value is None or isinstance(value, Undefined):
+             continue
+ 
+-        if _space_re.search(key) is not None:
+-            raise ValueError(f"Spaces are not allowed in attributes: '{key}'")
+        if _attr_key_re.search(key) is not None:
+            raise ValueError(f"Invalid character in attribute name: {key!r}")
+ 
+         items.append(f'{escape(key)}="{escape(value)}"')
+ 
--- a/SPECS/fence-agents.spec
+++ b/SPECS/fence-agents.spec
@ -59,7 +59,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.10.0
-Release: 62%{?alphatag:.%{alphatag}}%{?dist}
+Release: 62%{?alphatag:.%{alphatag}}%{?dist}.3
 License: GPLv2+ and LGPLv2+
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@ -135,14 +135,14 @@ Source1050: protobuf-3.17.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
 Source1051: pyasn1-0.4.8-py2.py3-none-any.whl
 Source1052: pyasn1_modules-0.2.8-py2.py3-none-any.whl
 Source1053: pyparsing-2.4.7-py2.py3-none-any.whl
-Source1054: pyroute2-0.6.4.tar.gz
-Source1055: pyroute2.core-0.6.4.tar.gz
-Source1056: pyroute2.ethtool-0.6.4.tar.gz
-Source1057: pyroute2.ipdb-0.6.4.tar.gz
-Source1058: pyroute2.ipset-0.6.4.tar.gz
-Source1059: pyroute2.ndb-0.6.4.tar.gz
-Source1060: pyroute2.nftables-0.6.4.tar.gz
-Source1061: pyroute2.nslink-0.6.4.tar.gz
+Source1054: pyroute2-0.7.12.tar.gz
+Source1055: pyroute2.core-0.6.13.tar.gz
+Source1056: pyroute2.ethtool-0.6.13.tar.gz
+Source1057: pyroute2.ipdb-0.6.13.tar.gz
+Source1058: pyroute2.ipset-0.6.13.tar.gz
+Source1059: pyroute2.ndb-0.6.13.tar.gz
+Source1060: pyroute2.nftables-0.6.13.tar.gz
+Source1061: pyroute2.nslink-0.6.13.tar.gz
 Source1062: pytz-2021.1-py2.py3-none-any.whl
 Source1063: rsa-4.7.2-py3-none-any.whl
 Source1064: setuptools-57.0.0-py3-none-any.whl
@ -241,10 +241,12 @@ Patch49: RHEL-14344-fence_zvmip-1-document-user-permissions.patch
 Patch50: RHEL-14030-1-all-agents-metadata-update-IO-Power-Network.patch
 Patch51: RHEL-14030-2-fence_cisco_mds-undo-metadata-change.patch
 Patch52: RHEL-14344-fence_zvmip-2-fix-manpage-formatting.patch
+Patch53: RHEL-35273-fence_eps-add-fence_epsr2-for-ePowerSwitch-R2-and-newer.patch

 ### HA support libs/utils ###
 # all archs
 Patch1000: bz2217902-1-kubevirt-fix-bundled-dateutil-CVE-2007-4559.patch
+Patch1001: RHEL-36482-kubevirt-fix-bundled-jinja2-CVE-2024-34064.patch
 # cloud (x86_64 only)
 Patch2000: bz2217902-2-aws-awscli-azure-fix-bundled-dateutil-CVE-2007-4559.patch

@ -410,6 +412,7 @@ BuildRequires: %{systemd_units}
 %patch -p1 -P 50
 %patch -p1 -P 51
 %patch -p1 -P 52
+%patch -p1 -P 53 -F2

 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -448,6 +451,7 @@ rm -rf kubevirt/rsa*
 # regular patch doesnt work in build-section
 pushd support
 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1000}
+/usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH1001}

 %ifarch x86_64
 /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 < %{PATCH2000}
@ -633,14 +637,14 @@ Provides: bundled(python-protobuf) = 3.17.3
 Provides: bundled(python-pyasn1) = 0.4.8
 Provides: bundled(python-pyasn1-modules) = 0.2.8
 Provides: bundled(python-pyparsing) = 2.4.7
-Provides: bundled(python-pyroute2) = 0.6.4
-Provides: bundled(python-pyroute2-core) = 0.6.4
-Provides: bundled(python-pyroute2-ethtool) = 0.6.4
-Provides: bundled(python-pyroute2-ipdb) = 0.6.4
-Provides: bundled(python-pyroute2-ipset) = 0.6.4
-Provides: bundled(python-pyroute2-ndb) = 0.6.4
-Provides: bundled(python-pyroute2-nftables) = 0.6.4
-Provides: bundled(python-pyroute2-nslink) = 0.6.4
+Provides: bundled(python-pyroute2) = 0.7.12
+Provides: bundled(python-pyroute2-core) = 0.6.13
+Provides: bundled(python-pyroute2-ethtool) = 0.6.13
+Provides: bundled(python-pyroute2-ipdb) = 0.6.13
+Provides: bundled(python-pyroute2-ipset) = 0.6.13
+Provides: bundled(python-pyroute2-ndb) = 0.6.13
+Provides: bundled(python-pyroute2-nftables) = 0.6.13
+Provides: bundled(python-pyroute2-nslink) = 0.6.13
 Provides: bundled(python-pytz) = 2021.1
 Provides: bundled(python-rsa) = 4.7.2
 Provides: bundled(python-setuptools) = 57.0.0
@ -920,8 +924,8 @@ BuildArch: noarch
 Fence agent for ePowerSwitch 8M+ power switches that are accessed
 via the HTTP(s) protocol.
 %files eps
-%{_sbindir}/fence_eps
-%{_mandir}/man8/fence_eps.8*
+%{_sbindir}/fence_eps*
+%{_mandir}/man8/fence_eps*.8*

 %ifarch x86_64
 %package gce
@ -1486,6 +1490,19 @@ are located on corosync cluster nodes.
 %endif

 %changelog
+* Thu May 16 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62.3
+- bundled jinja2: fix CVE-2024-34064
+  Resolves: RHEL-36482
+
+* Fri May  3 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62.2
+- fence_eps: add fence_epsr2 for ePowerSwitch R2 and newer
+  Resolves: RHEL-35273
+
+* Thu Mar 21 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62.1
+- ha-cloud-support: upgrade bundled pyroute2 libs to fix issue in
+  gcp-vpc-move-route's stop-action
+  Resolves: RHEL-29668
+
 * Thu Jan 18 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-62
 - bundled urllib3: fix CVE-2023-45803
  Resolves: RHEL-18139