Attachment #211446 for bug #243944





LICENSE=		GPLv2

# DEPRECATED=		fails to build with recent versions of python
# EXPIRATION_DATE=	2020-02-15

BUILD_DEPENDS=		bash:shells/bash \
			getopt>=0:misc/getopt

GH_ACCOUNT=		ClusterLabs
GH_PROJECT=		pacemaker

USES=			autoreconf corosync gmake gnome libtool ncurses pathfix \
			pkgconfig python:3.6+ shebangfix
USE_BINUTILS=		yes
USE_GNOME=		glib20
USE_LDCONFIG=		yes

Line 0 Link Here

(-)net/pacemaker1/files/patch-cts_remote.py (+11 lines)
	1	--- cts/remote.py.orig 2020-02-07 14:06:22 UTC
	2	+++ cts/remote.py
	3	@@ -125,7 +125,7 @@ class RemoteExec:
	4	'''
	5
	6	def __init__(self, rsh, silent=False):
	7	- self.async = []
	8	+ self.async_calls = []
	9	self.rsh = rsh
	10	self.silent = silent
	11	self.logger = LogFactory()




--- cts/watcher.py.orig	2020-02-07 14:06:26 UTC
+++ cts/watcher.py
@@ -140,8 +140,8 @@ class SearchObj:
         self.logger.debug(message)
 
     def harvest(self, delegate=None):
-        async = self.harvest_async(delegate)
-        async.join()
+        async_calls = self.harvest_async(delegate)
+        async_calls.join()
 
     def harvest_async(self, delegate=None):
         self.log("Not implemented")




--- tools/cibsecret.in.orig	2020-02-07 13:13:01 UTC
+++ tools/cibsecret.in
@@ -100,7 +100,7 @@ info() {
 }
 
 check_env() {
-	which md5sum >/dev/null 2>&1 ||
+	which md5 >/dev/null 2>&1 ||
 		fatal "please install md5sum to run $PROG"
 	if which pssh >/dev/null 2>&1; then
 		rsh=pssh_fun
@@ -251,7 +251,7 @@ localfiles() {
 		;;
 	"set")
 		local md5sum
-		md5sum=`printf $value | md5sum` ||
+		md5sum=`printf $value | md5` ||
 			fatal "md5sum failed to produce hash for resource $rsc parameter $param"
 		md5sum=`echo $md5sum | awk '{print $1}'`
 		mkdir -p `dirname $local_file` &&
@@ -307,7 +307,7 @@ cibsecret_check() {
 	local_md5sum=`localfiles getsum $rsc $param`
 	[ "$local_md5sum" ] ||
 		fatal "no MD5 hash for resource $rsc parameter $param"
-	md5sum=`printf "$current_local" | md5sum | awk '{print $1}'`
+	md5sum=`printf "$current_local" | md5 | awk '{print $1}'`
 	[ "$md5sum" = "$local_md5sum" ] ||
 		fatal "MD5 hash mismatch for resource $rsc parameter $param"
 }




%%PYTHON_SITELIBDIR%%/cts/CTStests.py
%%PYTHON_SITELIBDIR%%/cts/CTSvars.py
%%PYTHON_SITELIBDIR%%/cts/__init__.py
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/cts/cib_xml.py
%%PYTHON_SITELIBDIR%%/cts/environment.py
%%PYTHON_SITELIBDIR%%/cts/logging.py

Return to bug 243944

Lines 10-17 Link Here

(-)net/pacemaker1/Makefile.common (-4 / +4 lines)
10		10
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	DEPRECATED= fails to build with recent versions of python	13	# DEPRECATED= fails to build with recent versions of python
14	EXPIRATION_DATE= 2020-02-15	14	# EXPIRATION_DATE= 2020-02-15
15		15
16	BUILD_DEPENDS= bash:shells/bash \	16	BUILD_DEPENDS= bash:shells/bash \
17	getopt>=0:misc/getopt	17	getopt>=0:misc/getopt
Lines 34-41 Link Here
34	GH_ACCOUNT= ClusterLabs	34	GH_ACCOUNT= ClusterLabs
35	GH_PROJECT= pacemaker	35	GH_PROJECT= pacemaker
36		36
37	USES= autoreconf corosync gmake gnome libtool ncurses:port pathfix \	37	USES= autoreconf corosync gmake gnome libtool ncurses pathfix \
38	pkgconfig python:3.6 shebangfix	38	pkgconfig python:3.6+ shebangfix
39	USE_BINUTILS= yes	39	USE_BINUTILS= yes
40	USE_GNOME= glib20	40	USE_GNOME= glib20
41	USE_LDCONFIG= yes	41	USE_LDCONFIG= yes

Line 0 Link Here

(-)net/pacemaker1/files/patch-cts_watcher.py (+13 lines)
	1	--- cts/watcher.py.orig 2020-02-07 14:06:26 UTC
	2	+++ cts/watcher.py
	3	@@ -140,8 +140,8 @@ class SearchObj:
	4	self.logger.debug(message)
	5
	6	def harvest(self, delegate=None):
	7	- async = self.harvest_async(delegate)
	8	- async.join()
	9	+ async_calls = self.harvest_async(delegate)
	10	+ async_calls.join()
	11
	12	def harvest_async(self, delegate=None):
	13	self.log("Not implemented")

Line 0 Link Here

(-)net/pacemaker1/files/patch-tools_cibsecret.in (+29 lines)
	1	--- tools/cibsecret.in.orig 2020-02-07 13:13:01 UTC
	2	+++ tools/cibsecret.in
	3	@@ -100,7 +100,7 @@ info() {
	4	}
	5
	6	check_env() {
	7	- which md5sum >/dev/null 2>&1 \|\|
	8	+ which md5 >/dev/null 2>&1 \|\|
	9	fatal "please install md5sum to run $PROG"
	10	if which pssh >/dev/null 2>&1; then
	11	rsh=pssh_fun
	12	@@ -251,7 +251,7 @@ localfiles() {
	13	;;
	14	"set")
	15	local md5sum
	16	- md5sum=`printf $value \| md5sum` \|\|
	17	+ md5sum=`printf $value \| md5` \|\|
	18	fatal "md5sum failed to produce hash for resource $rsc parameter $param"
	19	md5sum=`echo $md5sum \| awk '{print $1}'`
	20	mkdir -p `dirname $local_file` &&
	21	@@ -307,7 +307,7 @@ cibsecret_check() {
	22	local_md5sum=`localfiles getsum $rsc $param`
	23	[ "$local_md5sum" ] \|\|
	24	fatal "no MD5 hash for resource $rsc parameter $param"
	25	- md5sum=`printf "$current_local" \| md5sum \| awk '{print $1}'`
	26	+ md5sum=`printf "$current_local" \| md5 \| awk '{print $1}'`
	27	[ "$md5sum" = "$local_md5sum" ] \|\|
	28	fatal "MD5 hash mismatch for resource $rsc parameter $param"
	29	}

Lines 88-123 Link Here

(-)net/pacemaker1/pkg-plist (-30 / +30 lines)
88	%%PYTHON_SITELIBDIR%%/cts/CTStests.py	88	%%PYTHON_SITELIBDIR%%/cts/CTStests.py
89	%%PYTHON_SITELIBDIR%%/cts/CTSvars.py	89	%%PYTHON_SITELIBDIR%%/cts/CTSvars.py
90	%%PYTHON_SITELIBDIR%%/cts/__init__.py	90	%%PYTHON_SITELIBDIR%%/cts/__init__.py
91	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.opt-1.pyc	91	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
92	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.pyc	92	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.pyc
93	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-36.opt-1.pyc	93	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
94	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-36.pyc	94	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-%%PYTHON_SUFFIX%%.pyc
95	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-36.opt-1.pyc	95	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
96	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-36.pyc	96	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-%%PYTHON_SUFFIX%%.pyc
97	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.opt-1.pyc	97	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
98	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.pyc	98	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.pyc
99	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.opt-1.pyc	99	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
100	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.pyc	100	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.pyc
101	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.opt-1.pyc	101	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
102	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.pyc	102	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.pyc
103	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.opt-1.pyc	103	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
104	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.pyc	104	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.pyc
105	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.opt-1.pyc	105	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
106	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.pyc	106	%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.pyc
107	%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.opt-1.pyc	107	%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
108	%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.pyc	108	%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
109	%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.opt-1.pyc	109	%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
110	%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.pyc	110	%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.pyc
111	%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.opt-1.pyc	111	%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
112	%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.pyc	112	%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.pyc
113	%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.opt-1.pyc	113	%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
114	%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.pyc	114	%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.pyc
115	%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.opt-1.pyc	115	%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
116	%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.pyc	116	%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.pyc
117	%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.opt-1.pyc	117	%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
118	%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.pyc	118	%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.pyc
119	%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.opt-1.pyc	119	%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
120	%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.pyc	120	%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.pyc
121	%%PYTHON_SITELIBDIR%%/cts/cib_xml.py	121	%%PYTHON_SITELIBDIR%%/cts/cib_xml.py
122	%%PYTHON_SITELIBDIR%%/cts/environment.py	122	%%PYTHON_SITELIBDIR%%/cts/environment.py
123	%%PYTHON_SITELIBDIR%%/cts/logging.py	123	%%PYTHON_SITELIBDIR%%/cts/logging.py