From 4a94c3076dce579fed84d948e25add9636e7a9d6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 08 2020 10:11:01 +0000
Subject: import resource-agents-4.1.1-81.el8


---

diff --git a/SOURCES/bz1903677-ocf-shellfuncs-fix-traceback-redirection-bash5.patch b/SOURCES/bz1903677-ocf-shellfuncs-fix-traceback-redirection-bash5.patch
new file mode 100644
index 0000000..8472065
--- /dev/null
+++ b/SOURCES/bz1903677-ocf-shellfuncs-fix-traceback-redirection-bash5.patch
@@ -0,0 +1,45 @@
+From 908431d416076e3ceb70cc95871957d15265a949 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 2 Dec 2020 16:48:32 +0100
+Subject: [PATCH] ocf-shellfuncs: make ocf_is_bash4() detect Bash v4 or greater
+ (which it was supposed to according to the comments)
+
+---
+ heartbeat/ocf-shellfuncs.in | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
+index b8d47e3d5..ac75dfc87 100644
+--- a/heartbeat/ocf-shellfuncs.in
++++ b/heartbeat/ocf-shellfuncs.in
+@@ -907,13 +907,18 @@ ocf_unique_rundir()
+ # NB: FD 9 may be used for tracing with bash >= v4 in case
+ # OCF_TRACE_FILE is set to a path.
+ #
+-ocf_is_bash4() {
++ocf_bash_has_xtracefd() {
+ 	echo "$SHELL" | grep bash > /dev/null &&
+-			[ ${BASH_VERSINFO[0]} = "4" ]
++			[ ${BASH_VERSINFO[0]} -ge 4 ]
++}
++# for backwards compatibility
++ocf_is_bash4() {
++	ocf_bash_has_xtracefd
++	return $?
+ }
+ ocf_trace_redirect_to_file() {
+ 	local dest=$1
+-	if ocf_is_bash4; then
++	if ocf_bash_has_xtracefd; then
+ 		exec 9>$dest
+ 		BASH_XTRACEFD=9
+ 	else
+@@ -922,7 +927,7 @@ ocf_trace_redirect_to_file() {
+ }
+ ocf_trace_redirect_to_fd() {
+ 	local fd=$1
+-	if ocf_is_bash4; then
++	if ocf_bash_has_xtracefd; then
+ 		BASH_XTRACEFD=$fd
+ 	else
+ 		exec 2>&$fd
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 6311628..9bbaa2a 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -70,7 +70,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.1.1
-Release:	80%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	81%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -261,6 +261,7 @@ Patch169:	bz1899551-NovaEvacuate-fix-delay_evacuate-unset.patch
 Patch170:	bz1901357-crypt-1-support-symlink-devices.patch
 Patch171:	bz1902208-LVM-activate-stop-before-storage-service.patch
 Patch172:	bz1901357-crypt-2-dont-sanity-check-during-probe.patch
+Patch173:	bz1903677-ocf-shellfuncs-fix-traceback-redirection-bash5.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -589,6 +590,7 @@ exit 1
 %patch170 -p1
 %patch171 -p1
 %patch172 -p1
+%patch173 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -1152,6 +1154,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Thu Dec  3 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-81
+- ocf-shellfuncs: fix traceback redirection for Bash 5+
+
+  Resolves: rhbz#1903677
+
 * Tue Dec  1 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-80
 - crypt: support symlink devices, and dont run sanity checks for probes