[Debian-ha-maintainers] Bug#1136163: trixie-pu: package resource-agents/1:4.16.0-3+deb13u2

[Valentin Vidic]

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: resource-agents at packages.debian.org
Control: affects -1 + src:resource-agents
User: release.debian.org at packages.debian.org
Usertags: pu

[ Reason ]
In #1133386 user reported syntax error with one agent after
the upgrade to trixie.

[ Impact ]
Some agents might not work correctly after the upgrade.

[ Tests ]
Build package and run automated tests.

[ Risks ]
Risk is low because it only fixes few affected agents.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Fix the bash syntax error in function used by a few agents.

[ Other info ]
Problem was already fixed upstream in v4.17.0.


diff -Nru resource-agents-4.16.0/debian/changelog resource-agents-4.16.0/debian/changelog
--- resource-agents-4.16.0/debian/changelog	2025-08-24 17:03:01.000000000 +0200
+++ resource-agents-4.16.0/debian/changelog	2026-05-10 10:17:59.000000000 +0200
@@ -1,3 +1,9 @@
+resource-agents (1:4.16.0-3+deb13u2) trixie; urgency=medium
+
+  * debian/patches: fix bash syntax error (Closes: #1133386)
+
+ -- Valentin Vidic <vvidic at debian.org>  Sun, 10 May 2026 10:17:59 +0200
+
 resource-agents (1:4.16.0-3+deb13u1) trixie; urgency=medium
 
   * debian/patches: fix to avoid duplicate route issues (Closes: #1109925)
diff -Nru resource-agents-4.16.0/debian/patches/bash-syntax-error.patch resource-agents-4.16.0/debian/patches/bash-syntax-error.patch
--- resource-agents-4.16.0/debian/patches/bash-syntax-error.patch	1970-01-01 01:00:00.000000000 +0100
+++ resource-agents-4.16.0/debian/patches/bash-syntax-error.patch	2026-05-10 10:17:59.000000000 +0200
@@ -0,0 +1,21 @@
+From 17bf880b110c59a69e677b3961b0ebe4e9a483d9 Mon Sep 17 00:00:00 2001
+From: Sergey Safarov <s.safarov at anycast-lb.net>
+Date: Sun, 12 Jan 2025 20:02:53 +0200
+Subject: [PATCH] ocf-shellfuncs: fixed bash systax error added at
+ a25f08cf98d784894df9c52960eff5ccef059393
+
+---
+ heartbeat/ocf-shellfuncs.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/heartbeat/ocf-shellfuncs.in
++++ b/heartbeat/ocf-shellfuncs.in
+@@ -733,7 +733,7 @@
+ 	# The subshell prevents parsing error with incompatible shells
+ 	ocf_version_cmp "$OCF_RESKEY_crm_feature_set" "3.19.7"
+ 	if [ $res -eq 2 ] || [ $res -eq 1 ]; then
+-		"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q \
++		"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q) \
+ 			${HA_SBIN_DIR}/crm_mon \$*" -- $*
+ 	else
+ 		"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q | sed 's/validate-with=\"[^\"]*\"/validate-with=\"none\"/') \
diff -Nru resource-agents-4.16.0/debian/patches/series resource-agents-4.16.0/debian/patches/series
--- resource-agents-4.16.0/debian/patches/series	2025-08-24 17:03:01.000000000 +0200
+++ resource-agents-4.16.0/debian/patches/series	2026-05-10 10:17:59.000000000 +0200
@@ -7,3 +7,4 @@
 reproducible.patch
 var-run.patch
 duplicate-route.patch
+bash-syntax-error.patch