.gitignore

@@ -1,2 +1,2 @@
-SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
+SOURCES/ClusterLabs-resource-agents-204f1461.tar.gz
-SOURCES/SAPHanaSR-6281418.tar.gz
+SOURCES/SAPHanaSR-e8188e0.tar.gz

.resource-agents-sap-hana.metadata

@@ -1,2 +1,2 @@
-b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
+3124f2b6488612b441323f570b64a40cd673b5ea SOURCES/ClusterLabs-resource-agents-204f1461.tar.gz
-8d25b08bed4b158d83a2884588a345374efdb500 SOURCES/SAPHanaSR-6281418.tar.gz
+95ea542f8759e90d5fd0ca512bea679d83316979 SOURCES/SAPHanaSR-e8188e0.tar.gz

SOURCES/RHEL-59660-fix-SAPHanaTopology-regression.patch

@@ -0,0 +1,43 @@
+From 6062afd4f2da3972e3469b2ab8491e3314296efe Mon Sep 17 00:00:00 2001
+From: AngelaBriel <abriel@suse.com>
+Date: Thu, 22 Feb 2024 15:38:11 +0100
+Subject: [PATCH] fix regression in topology (bsc#1219785)
+
+---
+ ra/SAPHanaTopology | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/ra/SAPHanaTopology b/ra/SAPHanaTopology
+index 5c4f6838..8630dd8c 100755
+--- a/ra/SAPHanaTopology
++++ b/ra/SAPHanaTopology
+@@ -873,7 +873,6 @@ function sht_monitor() {
+     return $rc
+ }
+ 
+-
+ #
+ # function: sht_status - get status of a hana instance (os tools only)
+ # params:   -
+@@ -1004,21 +1003,6 @@ function sht_stop_clone() {
+     return $rc
+ }
+ 
+-#
+-# function: sht_monitor
+-# this function should never be called currently.
+-# it is intended for future releases which might support un-cloned resources
+-# for now it is only used to print a reasonable error message in case of
+-# non-cloned resources instead of 'command not found'
+-#
+-function sht_monitor() {
+-    if ! is_clone; then
+-        super_ocf_log error "RA: resource is not defined as clone. This is not supported (OCF_ERR_UNIMPLEMENTED)"
+-        return "$OCF_ERR_UNIMPLEMENTED"
+-    else
+-        return "$OCF_SUCCESS"
+-    fi
+-}
+ 
+ #
+ # function: sht_monitor_clone - monitor a hana clone instance

SPECS/resource-agents-sap-hana.spec

@@ -20,10 +20,10 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version e76b7d3a
+%global upstream_version 204f1461
 
 %global saphana_prefix SAPHanaSR
-%global saphana_version 6281418
+%global saphana_version e8188e0
 
 # Whether this platform defaults to using systemd as an init system
 # (needs to be evaluated prior to BuildRequires being enumerated and
@@ -45,23 +45,24 @@
 %bcond_with rgmanager
 %bcond_without linuxha
 
-Name:		resource-agents-sap-hana
+Name:     resource-agents-sap-hana
-Summary:	SAP HANA cluster resource agents
+Summary:  SAP HANA cluster resource agents
-Epoch:		1
+Epoch:    1
-Version:	0.162.1
+Version:  0.162.3
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:  5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
-License:	GPLv2+
+License:  GPLv2+
-URL:		https://github.com/SUSE/SAPHanaSR
+URL:      https://github.com/SUSE/SAPHanaSR
-Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
+Source0:  %{upstream_prefix}-%{upstream_version}.tar.gz
-Source1:	%{saphana_prefix}-%{saphana_version}.tar.gz
+Source1:  %{saphana_prefix}-%{saphana_version}.tar.gz
 
-BuildArch:	noarch
+Patch0:   RHEL-59660-fix-SAPHanaTopology-regression.patch
+
+BuildArch:  noarch
 
 # Build dependencies
 BuildRequires: make
 BuildRequires: automake autoconf pkgconfig gcc
-BuildRequires: perl-interpreter
+BuildRequires: libxslt glib2-devel libqb-devel
-BuildRequires: libxslt glib2-devel
 BuildRequires: systemd
 BuildRequires: which
 
@@ -84,11 +85,10 @@ BuildRequires:  libglue-devel
 BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
 %endif
 
-Requires:	resource-agents >= 4.8.0
+Requires:   resource-agents >= 4.8.0
-Conflicts:	%{name}-scaleout
+Conflicts:  %{name}-scaleout
 
 Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
-Requires: perl
 
 %description
 The SAP HANA resource agents interface with Pacemaker to allow
@@ -98,19 +98,34 @@ SAP instances to be managed in a cluster environment.
 %setup -q -n %{upstream_prefix}-%{upstream_version}
 %setup -q -T -D -a 1 -n %{upstream_prefix}-%{upstream_version}
 
-# add SAPHana agents to Makefile.am
+# Add patches before moving files
+%patch -d %{saphana_prefix}-%{saphana_version} -p1 -P 0
+
+### add SAPHana agents to Makefile.am
 mv %{saphana_prefix}-%{saphana_version}/ra/SAPHana* heartbeat
-sed -i -e '/			SAPInstance		\\/a\			SAPHana			\\\n			SAPHanaTopology		\\' heartbeat/Makefile.am
-sed -i -e '/                          ocf_heartbeat_SAPInstance.7 \\/a\                          ocf_heartbeat_SAPHana.7 \\\n                          ocf_heartbeat_SAPHanaTopology.7 \\' doc/man/Makefile.am
 
-# change provider company
+# Find the existing SAPInstance entry in the list and add 2 new after in corresponding formatting.
+# heartbeat/Makefile.am indents by 3 tabs in the target list
+sed -i -e 's/\(\t\tSAPInstance\t\t\\\)/\1\n\t\t\tSAPHana\t\t\t\\\n\t\t\tSAPHanaTopology\t\\/' heartbeat/Makefile.am
+
+# Find the existing SAPInstance entry in the list and add 2 new after in corresponding formatting.
+# doc/man/Makefile.am indents by 26 spaces in the target list
+sed -i -e 's/\( \{26\}ocf_heartbeat_SAPInstance.7 \\\)/\1\n'\
+'                          ocf_heartbeat_SAPHana.7 \\\n'\
+'                          ocf_heartbeat_SAPHanaTopology.7 \\/' doc/man/Makefile.am
+
+# change provider company in hook scripts
 sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py
+sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py
 
-#%patch0 -p1
+# rename patterns to remove "sus" prefix in hook script
+sed -i -e 's/susChkSrv/ChkSrv/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py
+sed -i -e 's/suschksrv/chksrv/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py
+sed -i -e 's/sustkover_timeout/tkover_timeout/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py
 
 %build
 if [ ! -f configure ]; then
-	./autogen.sh
+    ./autogen.sh
 fi
 
 %if 0%{?fedora} >= 11 || 0%{?centos} > 5 || 0%{?rhel} > 5
@@ -135,9 +150,9 @@ export CFLAGS
 
 %configure \
 %if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
-	PYTHON="%{__python3}" \
+    PYTHON="%{__python3}" \
 %endif
-	%{conf_opt_fatal} \
+    %{conf_opt_fatal} \
 %if %{defined _unitdir}
     --with-systemdsystemunitdir=%{_unitdir} \
 %endif
@@ -145,16 +160,10 @@ export CFLAGS
     --with-systemdtmpfilesdir=%{_tmpfilesdir} \
     --with-rsctmpdir=/run/resource-agents \
 %endif
-	--with-pkg-name=resource-agents \
+    --with-pkg-name=resource-agents \
-	--with-ras-set=%{rasset}
+    --with-ras-set=%{rasset}
-
-%if %{defined jobs}
-JFLAGS="$(echo '-j%{jobs}')"
-%else
-JFLAGS="$(echo '%{_smp_mflags}')"
-%endif
 
-make $JFLAGS
+make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -167,6 +176,7 @@ find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \;
 mkdir -p %{buildroot}/%{_datadir}/SAPHanaSR/srHook
 cp -r %{saphana_prefix}-%{saphana_version}/srHook/global.ini %{buildroot}/%{_datadir}/SAPHanaSR/srHook
 cp -r %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py %{buildroot}/%{_datadir}/SAPHanaSR/srHook
+cp -r %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py %{buildroot}/%{_datadir}/SAPHanaSR/srHook/ChkSrv.py
 
 ## tree fixup
 # remove docs (there is only one and they should come from doc sections in files)
@@ -191,40 +201,21 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %exclude /usr/src
 
 %changelog
-* Thu Mar 23 2023 Janine Fuchs <jfuchs@redhat.com> - 0.162.1-2
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.162.3-5.1
-- Rebase to SAPHanaSR 0.162.1 upstream release.
+- Bump release for October 2024 mass rebuild:
-
+  Resolves: RHEL-64018
-  Resolves: rhbz#2165700
-
-* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-4
-- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
-  metadata
-
-  Resolves: rhbz#2027423
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.155.0-2.1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jun 14 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-2
-- Add CI gating tests
-
-  Resolves: rhbz#1960247
-
-* Mon Jun  7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-1
-- Rebase to SAPHanaSR 0.155.0 upstream release.
 
-* Fri Feb 14 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-2
+* Fri Sep 20 2024 Janine Fuchs <jfuchs@redhat.com> - 0.162.3-5
-- Rebase to SAPHanaSR 0.154.0 upstream release.
+- Fix regression in SAPHanaTopology agent.
+  Resolves: RHEL-59661
 
-  Resolves: rhbz#1802104
+* Fri Jun 28 2024 Janine Fuchs <jfuchs@redhat.com> - 0.162.3-4
+- Add package to RHEL 10.
 
-* Fri Sep  6 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.152.22-1
+  Resolves: RHEL-40574
-- SAPHanaTopology: make multi instance aware (MCOS)
 
-  Resolves: rhbz#1738205
+- Remove dependency on perl.
 
-* Tue Jul 30 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.152.21-4
+  Resolves: RHEL-40355
-- Initial build as separate package
 
-  Resolves: rhbz#1688344
+# vim:set ai ts=4 sw=4 sts=4 et: