From a71e87ad8f02c9e01e079ef305fe74c313c5ae23 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 20 Feb 2025 15:01:12 +0100
Subject: [PATCH] - portblock: fix iptables version detection

  Resolves: RHEL-79823
---
 RHEL-79823-portblock-fix-version-detection.patch | 12 ++++++------
 resource-agents.spec                             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/RHEL-79823-portblock-fix-version-detection.patch b/RHEL-79823-portblock-fix-version-detection.patch
index 9dd32a4..c70ecea 100644
--- a/RHEL-79823-portblock-fix-version-detection.patch
+++ b/RHEL-79823-portblock-fix-version-detection.patch
@@ -1,5 +1,5 @@
---- a/heartbeat/portblock	2025-02-18 09:36:56.833697633 +0100
-+++ b/heartbeat/portblock	2025-02-18 09:37:51.838016505 +0100
+--- a/heartbeat/portblock	2025-02-20 14:54:18.047134471 +0100
++++ b/heartbeat/portblock	2025-02-20 14:09:44.546869740 +0100
 @@ -25,6 +25,7 @@
  # Defaults
  OCF_RESKEY_protocol_default=""
@@ -163,19 +163,19 @@
  SayActive()
  {
 -  echo "$CMD DROP rule for INPUT chain [$*]  is running (OK)"
-+  echo "$CMD DROP rule [$*]  is running (OK)"
++  ocf_log debug "$CMD DROP rule [$*]  is running (OK)"
  }
  
  SayConsideredActive()
  {
 -  echo "$CMD DROP rule for INPUT chain [$*] considered to be running (OK)"
-+  echo "$CMD DROP rule [$*] considered to be running (OK)"
++  ocf_log debug "$CMD DROP rule [$*] considered to be running (OK)"
  }
  
  SayInactive()
  {
 -  echo "$CMD DROP rule for INPUT chain [$*] is inactive"
-+  echo "$CMD DROP rule [$*] is inactive"
++  ocf_log debug "$CMD DROP rule [$*] is inactive"
  }
  
 -#IptablesStatus  {udp|tcp} portno,portno ip {block|unblock}
@@ -291,7 +291,7 @@
 +  op=$1 proto=$2 ports=$3 ip=$4 chain=$5
 +  active=0; chain_isactive "$proto" "$ports" "$ip" "$chain" && active=1
 +  want_active=0; [ "$op" = "-I" ] && want_active=1
-+  echo "active: $active want_active: $want_active"
++  ocf_log debug "active: $active want_active: $want_active"
 +  if [ $active -eq $want_active ] ; then
 +    : Chain already in desired state
    else
diff --git a/resource-agents.spec b/resource-agents.spec
index a312275..8e9a7e4 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -73,7 +73,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.9
+Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.10
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -1015,7 +1015,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Tue Feb 18 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.9
+* Thu Feb 20 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.10
 - portblock: fix iptables version detection
 
   Resolves: RHEL-79823