Attachment 211446 Details for Bug 243944 – [PATCH] net/pacemaker1: use base's ncurses, build against python37, un-deprecate

[patch] [PATCH] net/pacemaker1: use base's ncurses, build against python37, un-deprecate

PR243944.diff (text/plain), 9.04 KB, created by Vinícius Zavam on 2020-02-07 14:27:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vinícius Zavam

Created: 2020-02-07 14:27:14 UTC

Size: 9.04 KB

patch

obsolete

>Index: net/pacemaker1/Makefile.common
>===================================================================
>--- net/pacemaker1/Makefile.common	(revision 525488)
>+++ net/pacemaker1/Makefile.common	(working copy)
>@@ -10,8 +10,8 @@
> 
> LICENSE=		GPLv2
> 
>-DEPRECATED=		fails to build with recent versions of python
>-EXPIRATION_DATE=	2020-02-15
>+# DEPRECATED=		fails to build with recent versions of python
>+# EXPIRATION_DATE=	2020-02-15
> 
> BUILD_DEPENDS=		bash:shells/bash \
> 			getopt>=0:misc/getopt
>@@ -34,8 +34,8 @@
> GH_ACCOUNT=		ClusterLabs
> GH_PROJECT=		pacemaker
> 
>-USES=			autoreconf corosync gmake gnome libtool ncurses:port pathfix \
>-			pkgconfig python:3.6 shebangfix
>+USES=			autoreconf corosync gmake gnome libtool ncurses pathfix \
>+			pkgconfig python:3.6+ shebangfix
> USE_BINUTILS=		yes
> USE_GNOME=		glib20
> USE_LDCONFIG=		yes
>Index: net/pacemaker1/files/patch-cts_remote.py
>===================================================================
>--- net/pacemaker1/files/patch-cts_remote.py	(nonexistent)
>+++ net/pacemaker1/files/patch-cts_remote.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- cts/remote.py.orig	2020-02-07 14:06:22 UTC
>++++ cts/remote.py
>+@@ -125,7 +125,7 @@ class RemoteExec:
>+     '''
>+ 
>+     def __init__(self, rsh, silent=False):
>+-        self.async = []
>++        self.async_calls = []
>+         self.rsh = rsh
>+         self.silent = silent
>+         self.logger = LogFactory()
>
>Property changes on: net/pacemaker1/files/patch-cts_remote.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/pacemaker1/files/patch-cts_watcher.py
>===================================================================
>--- net/pacemaker1/files/patch-cts_watcher.py	(nonexistent)
>+++ net/pacemaker1/files/patch-cts_watcher.py	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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")
>
>Property changes on: net/pacemaker1/files/patch-cts_watcher.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/pacemaker1/files/patch-tools_cibsecret.in
>===================================================================
>--- net/pacemaker1/files/patch-tools_cibsecret.in	(nonexistent)
>+++ net/pacemaker1/files/patch-tools_cibsecret.in	(working copy)
>@@ -0,0 +1,29 @@
>+--- 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"
>+ }
>
>Property changes on: net/pacemaker1/files/patch-tools_cibsecret.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/pacemaker1/pkg-plist
>===================================================================
>--- net/pacemaker1/pkg-plist	(revision 525488)
>+++ net/pacemaker1/pkg-plist	(working copy)
>@@ -88,36 +88,36 @@
> %%PYTHON_SITELIBDIR%%/cts/CTStests.py
> %%PYTHON_SITELIBDIR%%/cts/CTSvars.py
> %%PYTHON_SITELIBDIR%%/cts/__init__.py
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_ais.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_lha.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-36.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-36.pyc
>+%%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

Actions: View | Diff

Attachments on bug 243944: 211430 | 211446