.gitignore

@@ -1 +1 @@
-SOURCES/sap_cluster_connector-f3644f5.tar.gz
+SOURCES/sap_cluster_connector-42d6ce2.tar.gz

.sap-cluster-connector.metadata

@@ -1 +1 @@
-4f1e98fe6ac60a513a1ce47b433b4fa637070be5 SOURCES/sap_cluster_connector-f3644f5.tar.gz
+3806780db10228227b87cf4c425cddc2baacfd89 SOURCES/sap_cluster_connector-42d6ce2.tar.gz

SOURCES/bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch

@@ -1,38 +0,0 @@
-From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001
-From: Frank Danapfel <frank.danapfel@redhat.com>
-Date: Tue, 21 Apr 2020 14:11:36 +0200
-Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn
- function
-
----
- redhat/sap_cluster_connector | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/redhat/sap_cluster_connector b/redhat/sap_cluster_connector
-index a88b27a..6250887 100755
---- a/redhat/sap_cluster_connector
-+++ b/redhat/sap_cluster_connector
-@@ -401,7 +401,7 @@ sub list_sap_nodes {
- 	chomp $crm_res_location_in;
- 	#printf "DBG: where-result: %s\n", $crm_res_location_in;
- 	my $current_node="";
--	if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+(\w+)\W*/ ) {
-+	if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+([a-zA-Z0-9_-]+)/ ) {
- 		#printf "DBG: where-result: match\n";
- 		$current_node = $2;
- 	}
-@@ -425,12 +425,12 @@ sub list_sap_nodes {
- 	while (<PTEST>) {
- 		chomp;
- 		# printf "%s\n", $_;
--		if ( /^group_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
-+		if ( /^group_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
- 			# printf "DBG: group 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
- 			$resource{$1}->{nodes}->{$2}->{gc}=$3;
- 			push(@{$resource{$1}->{priorities}->{$3}}, $2);
- 		}
--		if ( /^native_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
-+		if ( /^native_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
- 			# printf "DBG: native 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
- 			$resource{$1}->{nodes}->{$2}->{nc}=$3;
- 			push(@{$resource{$1}->{priorities}->{$3}}, $2);

SPECS/sap-cluster-connector.spec

@@ -20,12 +20,12 @@
 #
 
 %global sap_script_prefix sap_cluster_connector
-%global sap_script_hash f3644f5
+%global sap_script_hash 42d6ce2
 
 Name:		sap-cluster-connector
 Summary:	SAP cluster connector script
 Version:	3.0.1
-Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
 License:	GPLv2+
 URL:		https://github.com/fdanapfel/sap_cluster_connector
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -34,11 +34,10 @@ Group:		System Environment/Base
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{sap_script_prefix}-%{sap_script_hash}.tar.gz
-Patch0: 	bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch
 
 BuildArch:	noarch
 
-Requires:	resource-agents-sap >= 4.1.1-28
+Requires:	resource-agents-sap >= 4.8.0
 Requires:	perl
 
 %description
@@ -47,11 +46,11 @@ instances to be managed in a cluster environment.
 
 %prep
 %setup -q -n %{sap_script_prefix}-%{sap_script_hash}
-%patch0 -p1
 
 %build
 
 %install
+rm -rf %{buildroot}
 test -d %{buildroot}/%{_bindir} || mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_datadir}/sap_cluster_connector
 mkdir -p %{buildroot}/%{_mandir}/man8
@@ -60,9 +59,6 @@ cp -rv redhat/{run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
 gzip redhat/man/*.8
 cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{_bindir}/sap_cluster_connector
@@ -70,7 +66,16 @@ rm -rf %{buildroot}
 %{_datadir}/sap_cluster_connector
 
 %changelog
-* Thu Apr 30 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-5
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-7.1
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jun 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-7
+- Initial build
+
+  Resolves: rhbz#1960248
+
+* Mon May 10 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-6
 - sap-cluster-connector: allow dashes/underscores in nodenames
 
   Resolves: rhbz#1827096