From ab29d76183c2e510e716c53ba43c3cbef04025e1 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 3 Feb 2026 10:58:08 +0100 Subject: [PATCH] - portblock: portblock: check correct binary during validate-all Resolves: RHEL-116149, RHEL-116152 --- ...k-correct-binary-during-validate-all.patch | 25 +++++++++++++++++++ resource-agents.spec | 14 ++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch diff --git a/RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch b/RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch new file mode 100644 index 0000000..e60d1b4 --- /dev/null +++ b/RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch @@ -0,0 +1,25 @@ +From 14801ef5feeaa83c226bafd59061824d3f84924a Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 3 Feb 2026 10:47:23 +0100 +Subject: [PATCH] portblock: check correct binary during validate-all + +--- + heartbeat/portblock | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/portblock b/heartbeat/portblock +index 4fc9c2bb8..20a84c21a 100755 +--- a/heartbeat/portblock ++++ b/heartbeat/portblock +@@ -761,9 +761,9 @@ PortValidateAll() + { + case $FIREWALL in + nft) +- check_binary $IPTABLES ;; +- iptables) + check_binary $NFTABLES ;; ++ iptables) ++ check_binary $IPTABLES ;; + esac + + case $protocol in diff --git a/resource-agents.spec b/resource-agents.spec index 6343b2c..7b0f812 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.16.0 -Release: 50%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 51%{?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 @@ -115,6 +115,7 @@ Patch62: RHEL-133928-podman-etcd-align-variable-names-with-etcd-3.6-pod-manifest Patch63: RHEL-139066-podman-etcd-verify-no-containers-running-or-being-deleted.patch Patch64: RHEL-50380-powervs-subnet-wait-for-IP.patch Patch65: RHEL-143524-powervs-move-ip-powervs-subnet-fix-error-logging.patch +Patch66: RHEL-116149-RHEL-116152-4-check-correct-binary-during-validate-all.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -351,6 +352,7 @@ exit 1 %patch -p1 -P 63 %patch -p1 -P 64 %patch -p1 -P 65 +%patch -p1 -P 66 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -683,6 +685,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Feb 3 2026 Oyvind Albrigtsen - 4.16.0-51 +- portblock: add promotable and nftables support, and method and + status_check parameters + + Resolves: RHEL-116149, RHEL-116152 + * Thu Jan 22 2026 Oyvind Albrigtsen - 4.16.0-50 - powervs-move-ip/powervs-subnet: fix error logging @@ -780,12 +788,10 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents Resolves: RHEL-124203, RHEL-124206 * Wed Oct 22 2025 Oyvind Albrigtsen - 4.16.0-32 -- portblock: add promotable and nftables support, and method and - status_check parameters - db2: use reintegration flag to avoid race condition on cluster reintegration - Resolves: RHEL-116149, RHEL-116152, RHEL-115495 + Resolves: RHEL-115495 * Fri Oct 10 2025 Oyvind Albrigtsen - 4.16.0-31 - podman-etcd: add automatic learner member promotion