From b1ca6e4e38f330b196415b2de1fc02f3d6b8f497 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Thu, 26 Dec 2024 03:11:22 +0300
Subject: [PATCH] import resource-agents-4.9.0-54.el8_10.6

---
 ...system-dont-kill-unrelated-processes.patch | 22 ++++++++++++++++
 ...-69297-2-Filesystem-update-bsd-logic.patch | 26 +++++++++++++++++++
 SPECS/resource-agents.spec                    | 11 +++++++-
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/RHEL-69297-1-Filesystem-dont-kill-unrelated-processes.patch
 create mode 100644 SOURCES/RHEL-69297-2-Filesystem-update-bsd-logic.patch

diff --git a/SOURCES/RHEL-69297-1-Filesystem-dont-kill-unrelated-processes.patch b/SOURCES/RHEL-69297-1-Filesystem-dont-kill-unrelated-processes.patch
new file mode 100644
index 0000000..ca24f32
--- /dev/null
+++ b/SOURCES/RHEL-69297-1-Filesystem-dont-kill-unrelated-processes.patch
@@ -0,0 +1,22 @@
+From 4b09b3e467a7f8076bbf20f5b027efecf16303e7 Mon Sep 17 00:00:00 2001
+From: Gianluca Piccolo <gianluca.piccolo@wuerth-phoenix.com>
+Date: Thu, 6 Jun 2024 17:34:41 +0200
+Subject: [PATCH] Fix #1944
+
+---
+ heartbeat/Filesystem | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index a445349b9..59b6c1b51 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -664,7 +664,7 @@ get_pids()
+ 		if [ "X${HOSTOS}" = "XOpenBSD" ];then
+ 			fstat | grep $dir | awk '{print $3}'
+ 		else
+-			$FUSER -m $dir 2>/dev/null
++			$FUSER -Mm $dir 2>/dev/null
+ 		fi
+ 	elif [ "$FORCE_UNMOUNT" = "safe" ]; then
+ 		procs=$(find /proc/[0-9]*/ -type l -lname "${dir}/*" -or -lname "${dir}" 2>/dev/null | awk -F/ '{print $3}')
diff --git a/SOURCES/RHEL-69297-2-Filesystem-update-bsd-logic.patch b/SOURCES/RHEL-69297-2-Filesystem-update-bsd-logic.patch
new file mode 100644
index 0000000..8299fa8
--- /dev/null
+++ b/SOURCES/RHEL-69297-2-Filesystem-update-bsd-logic.patch
@@ -0,0 +1,26 @@
+From c9ba6ac66ee27a70c69e1156f17aa6beac277bc5 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 7 Jun 2024 14:23:28 +0200
+Subject: [PATCH] Filesystem: use fuser -c on FreeBSD, as -m and -M are used
+ for other functionality
+
+---
+ heartbeat/Filesystem | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 59b6c1b51..88fe2e2eb 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -661,8 +661,10 @@ get_pids()
+ 	fi
+ 
+ 	if ocf_is_true  "$FORCE_UNMOUNT"; then
+-		if [ "X${HOSTOS}" = "XOpenBSD" ];then
++		if [ "X${HOSTOS}" = "XOpenBSD" ]; then
+ 			fstat | grep $dir | awk '{print $3}'
++		elif [ "X${HOSTOS}" = "XFreeBSD" ]; then
++			$FUSER -c $dir 2>/dev/null
+ 		else
+ 			$FUSER -Mm $dir 2>/dev/null
+ 		fi
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index f43d6e6..8fc7b44 100644
--- a/SPECS/resource-agents.spec
+++ b/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}.5
+Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.6
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -163,6 +163,8 @@ Patch66:	RHEL-15305-2-findif.sh-dont-use-table-parameter.patch
 Patch67:	RHEL-34137-aws-agents-use-curl_retry.patch
 Patch68:	RHEL-32828-db2-fix-OCF_SUCESS-typo.patch
 Patch69:	RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch
+Patch70:	RHEL-69297-1-Filesystem-dont-kill-unrelated-processes.patch
+Patch71:	RHEL-69297-2-Filesystem-update-bsd-logic.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -416,6 +418,8 @@ exit 1
 %patch -p1 -P 67 -F1
 %patch -p1 -P 68
 %patch -p1 -P 69
+%patch -p1 -P 70
+%patch -p1 -P 71
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -1005,6 +1009,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Nov 27 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.6
+- Filesystem: dont kill unrelated processes during stop-action
+
+  Resolves: RHEL-69297
+
 * Tue Oct  1 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.5
 - nfsserver: also stop rpc-statd for nfsv4_only to avoid stop failing
   in some cases