From ee2afbb49ba881561176a597eb73783056e581cf Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 29 Oct 2025 16:44:49 +0100
Subject: [PATCH] - MailTo: add s-nail support for multiple recipients -
 oracle: improve monpassword description

  Resolves: RHEL-92707, RHEL-124881
---
 ...acle-improve-monpassword-description.patch | 23 ++++++++++++
 ...nail-support-for-multiple-recipients.patch | 36 +++++++++++++++++++
 resource-agents.spec                          | 12 ++++++-
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 RHEL-124881-oracle-improve-monpassword-description.patch
 create mode 100644 RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch

diff --git a/RHEL-124881-oracle-improve-monpassword-description.patch b/RHEL-124881-oracle-improve-monpassword-description.patch
new file mode 100644
index 0000000..c6d6827
--- /dev/null
+++ b/RHEL-124881-oracle-improve-monpassword-description.patch
@@ -0,0 +1,23 @@
+From eac983c14f4695f491fe430a78d8d18a1481c60c Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 29 Oct 2025 15:15:54 +0100
+Subject: [PATCH] oracle: improve monpassword description
+
+---
+ heartbeat/oracle | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/heartbeat/oracle b/heartbeat/oracle
+index 8cf4e3649c..c85e499833 100755
+--- a/heartbeat/oracle
++++ b/heartbeat/oracle
+@@ -132,8 +132,7 @@ that the password for this user does not expire.
+ <longdesc lang="en">
+ Password for the monitoring user. Make sure
+ that the password for this user does not expire.
+-Need to explicitly set a password to a new monitor
+-user for the security reason.
++Set to avoid using the agents default password for "monuser".
+ </longdesc>
+ <shortdesc lang="en">monpassword</shortdesc>
+ <content type="string" default="$OCF_RESKEY_monpassword_default" />
diff --git a/RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch b/RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch
new file mode 100644
index 0000000..69a636a
--- /dev/null
+++ b/RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch
@@ -0,0 +1,36 @@
+From 1e546b85010e5fdbf7a0f31207dce144c14c50ec Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 29 Oct 2025 15:17:30 +0100
+Subject: [PATCH] MailTo: add s-nail support for multiple recipients
+
+---
+ heartbeat/MailTo | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/heartbeat/MailTo b/heartbeat/MailTo
+index 56940bafaa..a3ee6a04c8 100755
+--- a/heartbeat/MailTo
++++ b/heartbeat/MailTo
+@@ -92,12 +92,16 @@ END
+ }
+ 
+ MailProgram() {
+-	$MAILCMD -s "$1" "$email"  <<EOF
+-        $Subject
+- 
+-        Command line was:
+-        $ARGS
+-EOF
++	local body="\
++$Subject
++
++Command line was:
++$ARGS"
++	if $MAILCMD -V | grep -q "^s-nail"; then
++		printf "$body" | $MAILCMD -s "$1" $(echo $email | sed "s/,\s*/ /g")
++	else
++		printf "$body" | $MAILCMD -s "$1" "$email"
++	fi
+ 	return $?
+ }
+ 
diff --git a/resource-agents.spec b/resource-agents.spec
index f01fd48..3b7ead4 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:	34%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	35%{?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
@@ -94,6 +94,8 @@ Patch41:	RHEL-115495-db2-use-reintegration-flag-to-avoid-race-condition-on-clust
 Patch42:	RHEL-124203-podman-etcd-certificate-rotation.patch
 Patch43:	RHEL-124206-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex.patch
 Patch44:	RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch
+Patch45:	RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch
+Patch46:	RHEL-124881-oracle-improve-monpassword-description.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -309,6 +311,8 @@ exit 1
 %patch -p1 -P 42
 %patch -p1 -P 43
 %patch -p1 -P 44
+%patch -p1 -P 45
+%patch -p1 -P 46
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -641,6 +645,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Oct 29 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-35
+- MailTo: add s-nail support for multiple recipients
+- oracle: improve monpassword description
+
+  Resolves: RHEL-92707, RHEL-124881
+
 * Wed Oct 29 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-34
 - db2: add "skip_basic_sql_health_check" parameter to avoid failing on
   systems with high load