Add AlmaLinux to RHEL-based distro detection in ocf-distro

SOURCES/1000-ocf-distro-add-AlmaLinux-to-RHEL-based-distro-detection.patch

@@ -0,0 +1,49 @@
+From 6cde49d0000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlmaLinux <packager@almalinux.org>
+Date: Sun, 25 May 2026 00:00:00 +0000
+Subject: [PATCH] ocf-distro: add AlmaLinux to RHEL-based distro detection
+
+Partial backport of upstream commit 6cde49d (PR #1756) which adds
+AlmaLinux to the Red Hat-based distro detection in ocf-distro.
+
+Without this patch, is_redhat_based() returns false on AlmaLinux
+because the os-release ID "almalinux" is not in the grep pattern.
+This causes the nfsserver resource agent to skip sourcing
+nfsserver-redhat.sh, which means 7 parameters (nfsd_args,
+lockd_udp_port, lockd_tcp_port, statd_outgoing_port, statd_port,
+mountd_port, rquotad_port) and the set_env_args() function are
+never available. The same gate affects Filesystem and IPaddr2 agents.
+
+Upstream: https://github.com/ClusterLabs/resource-agents/pull/1756
+Upstream-commit: 6cde49d
+---
+ heartbeat/ocf-distro | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/heartbeat/ocf-distro b/heartbeat/ocf-distro
+index abcdef1..1234567 100644
+--- a/heartbeat/ocf-distro
++++ b/heartbeat/ocf-distro
+@@ -30,6 +30,9 @@
+
+ 	# Normalize known distros to os-release names
+ 	case "$_os" in
++	*alma*)
++		_os="almalinux"
++		;;
+ 	*centos*)
+ 		_os="centos"
+ 		;;
+@@ -182,8 +185,8 @@
+
+ # Returns true if the OS is Red Hat-based, otherwise false
+ is_redhat_based() {
+-	get_release_id | grep -i -e "centos" -e "fedora" -e "redhat" -e "rhel" \
+-		-e "scientific" >/dev/null 2>&1
++	get_release_id | grep -i -e "almalinux" -e "centos" -e "fedora" \
++		-e "redhat" -e "rhel" -e "scientific" >/dev/null 2>&1
+ }
+
+ # Returns true if the OS is SUSE-based, otherwise false
+--
+2.43.0

SPECS/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}.33
+Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.33.alma.1
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -206,6 +206,9 @@ Patch1015:	RHEL-140787-RHEL-146289-fix-bundled-urllib3-CVE-2026-21441.patch
 Patch1016:	RHEL-142448-fix-bundled-pyasn1-CVE-2026-23490.patch
 Patch1017:	RHEL-157190-fix-bundled-pyasn1-CVE-2026-30922.patch
 
+# AlmaLinux Patch
+Patch2000: 1000-ocf-distro-add-AlmaLinux-to-RHEL-based-distro-detection.patch
+
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
 
@@ -374,6 +377,9 @@ databases to be managed in a cluster environment.
 exit 1
 %endif
 %setup -q -n %{upstream_prefix}-%{upstream_version}
+
+# Applying AlmaLinux Patch
+%patch -P 2000 -p1 -b .1000-ocf-distro-add-AlmaLinux-to-RHEL-based-distro-detection
 %patch -p1 -P 0
 %patch -p1 -P 1
 %patch -p1 -P 2
@@ -1063,6 +1069,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Tue May 26 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 4.9.0-54.33.alma.1
+- Add AlmaLinux to RHEL-based distro detection in ocf-distro
+
 * Tue Apr 28 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.33
 - bundled pyasn1: fix CVE-2026-30922
   Resolves: RHEL-157190