.gitignore

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

.resource-agents-sap-hana.metadata

@@ -1,2 +1,2 @@
-0358e1cb7fe86b2105bd2646cbe86f3c0273844a SOURCES/ClusterLabs-resource-agents-e711383f.tar.gz
+b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
-8d25b08bed4b158d83a2884588a345374efdb500 SOURCES/SAPHanaSR-6281418.tar.gz
+95ea542f8759e90d5fd0ca512bea679d83316979 SOURCES/SAPHanaSR-e8188e0.tar.gz

SPECS/resource-agents-sap-hana.spec

@@ -20,41 +20,75 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version e711383f
+%global upstream_version e76b7d3a
 
 %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
+# installed as it's intended to conditionally select some of these, and
+# for that there are only few indicators with varying reliability:
+# - presence of systemd-defined macros (when building in a full-fledged
+#   environment, which is not the case with ordinary mock-based builds)
+# - systemd-aware rpm as manifested with the presence of particular
+#   macro (rpm itself will trivially always be present when building)
+# - existence of /usr/lib/os-release file, which is something heavily
+#   propagated by systemd project
+# - when not good enough, there's always a possibility to check
+#   particular distro-specific macros (incl. version comparison)
+%define systemd_native (%{?_unitdir:1}%{!?_unitdir:0}%{nil \
+  } || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
+  } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
+
+# determine the ras-set to process based on configure invokation
+%bcond_with rgmanager
+%bcond_without linuxha
 
 Name:		resource-agents-sap-hana
 Summary:	SAP HANA cluster resource agents
 Epoch:		1
-Version:	0.162.1
+Version:	0.162.3
 Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/SUSE/SAPHanaSR
-%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
-Group:		System Environment/Base
-%else
-Group:		Productivity/Clustering/HA
-%endif
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Source1:	%{saphana_prefix}-%{saphana_version}.tar.gz
 
 BuildArch:	noarch
 
-BuildRequires: automake autoconf gcc
+# Build dependencies
-BuildRequires: perl-interpreter python3-devel
+BuildRequires: make
+BuildRequires: automake autoconf pkgconfig gcc
+BuildRequires: perl-interpreter
 BuildRequires: libxslt glib2-devel
+BuildRequires: systemd
+BuildRequires: which
 
-%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
-BuildRequires: docbook-style-xsl docbook-dtds
+BuildRequires: python3-devel
+%else
+BuildRequires: python-devel
 %endif
 
-Requires:	resource-agents >= 4.1.1
+%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
+BuildRequires: docbook-style-xsl docbook-dtds
+%if 0%{?rhel} == 0
+BuildRequires: libnet-devel
+%endif
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:  libnet-devel
+BuildRequires:  libglue-devel
+BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
+%endif
+
+Requires:	resource-agents >= 4.8.0
 Conflicts:	%{name}-scaleout
 
-Requires:	/bin/bash /usr/bin/grep /bin/sed /bin/gawk
+Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
-Requires:	perl
+Requires: perl
 
 %description
 The SAP HANA resource agents interface with Pacemaker to allow
@@ -69,22 +103,56 @@ 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
+# 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
+
+# add patches
+# %patch0 -p1
 
 %build
 if [ ! -f configure ]; then
 	./autogen.sh
 fi
 
-%global rasset linux-ha
+%if 0%{?fedora} >= 11 || 0%{?centos} > 5 || 0%{?rhel} > 5
+CFLAGS="$(echo '%{optflags}')"
+%global conf_opt_fatal "--enable-fatal-warnings=no"
+%else
+CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
+%global conf_opt_fatal "--enable-fatal-warnings=yes"
+%endif
 
-%configure BASH_SHELL="/bin/bash" \
+%if %{with rgmanager}
+%global rasset rgmanager
+%endif
+%if %{with linuxha}
+%global rasset linux-ha
+%endif
+%if %{with rgmanager} && %{with linuxha}
+%global rasset all
+%endif
+
+export CFLAGS
+
+%configure \
+%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
 	PYTHON="%{__python3}" \
+%endif
 	%{conf_opt_fatal} \
-	--with-pkg-name=%{name} \
+%if %{defined _unitdir}
+    --with-systemdsystemunitdir=%{_unitdir} \
+%endif
+%if %{defined _tmpfilesdir}
+    --with-systemdtmpfilesdir=%{_tmpfilesdir} \
+    --with-rsctmpdir=/run/resource-agents \
+%endif
+	--with-pkg-name=resource-agents \
 	--with-ras-set=%{rasset}
 
 %if %{defined jobs}
@@ -96,6 +164,7 @@ JFLAGS="$(echo '%{_smp_mflags}')"
 make $JFLAGS
 
 %install
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # remove other agents
@@ -105,14 +174,12 @@ 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)
 rm -rf %{buildroot}/usr/share/doc/resource-agents
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{_usr}/lib/ocf/resource.d/heartbeat/SAPHana*
@@ -125,38 +192,41 @@ rm -rf %{buildroot}
 %exclude /usr/lib/systemd
 %exclude /usr/lib/tmpfiles.d
 %exclude /usr/libexec
-%exclude /usr/sbin
+%exclude /usr/sbin/ldirectord
-%exclude /usr/share/%{name}
+%exclude /usr/sbin/ocf*
+%exclude /usr/share/resource-agents
+%exclude /usr/share/pkgconfig/resource-agents.pc
 %exclude /usr/src
 
 %changelog
-* Mon Mar 20 2023 Janine Fuchs <jfuchs@redhat.com> - 0.162.1-2
+* Fri Feb 2 2024 Janine Fuchs <jfuchs@redhat.com> - 0.162.3-2
+- Rebase to SAPHanaSR 0.162.3 upstream release and include the
+  ChkSrv.py hook script to handle hanging HDBindexserver services
+
+  Resolves: RHEL-22305
+
+* Thu Mar 23 2023 Janine Fuchs <jfuchs@redhat.com> - 0.162.1-2
 - Rebase to SAPHanaSR 0.162.1 upstream release.
 
-  Resolves: rhbz#2165668
+  Resolves: rhbz#2165700
 
-* Thu Feb  3 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-7
+* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-4
-- SAPHana/SAPHanaTopology: follow OCF standard for version and OCF
-  version in metadata
-
-  Resolves: rhbz#2050205
-
-* Tue Feb  1 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-6
-- SAPHana/SAPHanaTopology: add systemd support
-
-  Resolves: rhbz#2026273
-
-* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-4
 - SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
   metadata
 
-  Resolves: rhbz#2026727
+  Resolves: rhbz#2027423
 
-* Thu Jul 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-3
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.155.0-2.1
-- SAPHana: use actual_mode from global.ini and fallback to mode when
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  it's not set
+  Related: rhbz#1991688
 
-  Resolves: rhbz#1855885
+* 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
 - Rebase to SAPHanaSR 0.154.0 upstream release.