.gitignore

@@ -1 +1 @@
-sap_cluster_connector-5d8a0ed.tar.gz
+SOURCES/sap_cluster_connector-f3644f5.tar.gz

.sap-cluster-connector.metadata

@@ -0,0 +1 @@
+4f1e98fe6ac60a513a1ce47b433b4fa637070be5 SOURCES/sap_cluster_connector-f3644f5.tar.gz

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

@@ -0,0 +1,38 @@
+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,27 +20,26 @@
 #
 
 %global sap_script_prefix sap_cluster_connector
-%global sap_script_hash 5d8a0ed
+%global sap_script_hash f3644f5
 
-Name:       sap-cluster-connector
-Summary:    SAP cluster connector script
-Version:    3.0.1
-Release:    9%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
-License:    GPLv2+
-URL:        https://github.com/redhat-sap/sap_cluster_connector
+Name:		sap-cluster-connector
+Summary:	SAP cluster connector script
+Version:	3.0.1
+Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+License:	GPLv2+
+URL:		https://github.com/fdanapfel/sap_cluster_connector
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
-Group:      System Environment/Base
+Group:		System Environment/Base
 %else
-Group:      Productivity/Clustering/HA
+Group:		Productivity/Clustering/HA
 %endif
-Source0:    %{sap_script_prefix}-%{sap_script_hash}.tar.gz
+Source0:	%{sap_script_prefix}-%{sap_script_hash}.tar.gz
+Patch0: 	bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch
 
-BuildArch:  noarch
+BuildArch:	noarch
 
-BuildRequires: perl-generators
-
-Requires:   resource-agents-sap >= 4.8.0
-Requires:   perl-interpreter
+Requires:	resource-agents-sap >= 4.1.1-28
+Requires:	perl
 
 %description
 The SAP connector script interface with Pacemaker to allow SAP
@@ -48,18 +47,21 @@ 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
-cp sap_cluster_connector %{buildroot}/%{_bindir}
-cp -rv {run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
-gzip man/*.8
-cp man/*.8.gz %{buildroot}/%{_mandir}/man8
+cp redhat/sap_cluster_connector %{buildroot}/%{_bindir}
+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)
@@ -68,22 +70,12 @@ cp man/*.8.gz %{buildroot}/%{_mandir}/man8
 %{_datadir}/sap_cluster_connector
 
 %changelog
-* Wed Jan 29 2025 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-9
-- Fix compatibility with pacemaker 3.0.
+* Thu Apr 30 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-5
+- sap-cluster-connector: allow dashes/underscores in nodenames
 
-  Resolves: RHEL-76764
+  Resolves: rhbz#1827096
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.1-8.1
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Tue Jun 25 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-4
+- Initial build as separate package
 
-* Tue Jul 02 2024 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-8
-- Add package to RHEL 10.
-
-  Resolves: RHEL-40576
-
-- Changed perl dependency to perl-interpreter.
-
-  Resolves: RHEL-45726
-
-# vim:set ai ts=2 sw=2 sts=2 et:
+  Resolves: rhbz#1688346

sources

@@ -1 +0,0 @@
-SHA512 (sap_cluster_connector-5d8a0ed.tar.gz) = ce2ea2146ea4c1f45d0c0ca4402508c224bab42ab77ac8d06917d88ab027bf193a1c631ea2776499176e07af400c7fecaa0c2e0f00bd180ead5ef339883e7bea