- ocf-shellfuncs: fix syntax error in crm_mon_no_validation()

Resolves: RHEL-73689

RHEL-73689-2-ocf-shellfuncs-add-missing-variable-in-crm_mon_no_validation.patch

@@ -0,0 +1,22 @@
+From 9bb30d743d04905dec474bd71e31553e5189a570 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 11 Feb 2025 10:38:59 +0100
+Subject: [PATCH] ocf-shellfuncs: add missing variable in
+ crm_mon_no_validation()
+
+---
+ heartbeat/ocf-shellfuncs.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
+index 6b35b89c7..e834ded95 100644
+--- a/heartbeat/ocf-shellfuncs.in
++++ b/heartbeat/ocf-shellfuncs.in
+@@ -741,6 +741,7 @@ crm_mon_no_validation()
+ {
+ 	# The subshell prevents parsing error with incompatible shells
+ 	ocf_version_cmp "$OCF_RESKEY_crm_feature_set" "3.19.7"
++	res=$?
+ 	if [ $res -eq 2 ] || [ $res -eq 1 ]; then
+ 		"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q) \
+ 			${HA_SBIN_DIR}/crm_mon \$*" -- $*

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.16.0
-Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	8%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -63,7 +63,8 @@ Patch10: 	RHEL-76037-2-storage-mon-fix-daemon-mode-bug-that-caused-delayed-initi
 Patch11: 	RHEL-76037-3-storage-mon-only-use-underscores-in-functions.patch
 Patch12: 	RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch
 Patch13: 	RHEL-76037-5-storage-mon-log-storage_mon-is-already-running-in-start-action.patch
-Patch14: 	RHEL-73689-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch
+Patch14: 	RHEL-73689-1-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch
+Patch15: 	RHEL-73689-2-ocf-shellfuncs-add-missing-variable-in-crm_mon_no_validation.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -235,6 +236,7 @@ exit 1
 %patch -p1 -P 12
 %patch -p1 -P 13
 %patch -p1 -P 14
+%patch -p1 -P 15
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -553,16 +555,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Tue Feb 11 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-8
+- ocf-shellfuncs: fix syntax error in crm_mon_no_validation()
+
+  Resolves: RHEL-73689
+
 * Mon Jan 27 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-7
 - storage-mon: fix daemon mode bug that caused delayed initial score
 
   Resolves: RHEL-76037
 
-* Fri Jan 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-5
-- ocf-shellfuncs: fix syntax error in crm_mon_no_validation()
-
-  Resolves: RHEL-73689
-
 * Thu Jan 23 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-3
 - openstack-cinder-volume: wait for volume to be available
 - All agents: use grep -E/-F