svn commit: r525492 - in head/net/pacemaker1: . files
Vinícius Zavam
egypcio at FreeBSD.org
Fri Feb 7 17:23:51 UTC 2020
Author: egypcio
Date: Fri Feb 7 17:23:49 2020
New Revision: 525492
URL: https://svnweb.freebsd.org/changeset/ports/525492
Log:
net/pacemaker1: base ncurses, py37- support, and un-deprecate it
Makefiles
- un-deprecate the port; bump PORTREVISION;
- apply certain patches only if PYTHON_SUFFIX > 36;
- use base system's ncurses instead of ports';
pkg-plist: use %%PYTHON_SUFFIX%%, instead of its value
files/*
- extra*.py: https://docs.python.org/3/whatsnew/3.7.html
- patch-tools_cibsecret.in: make proper use of `md5`
PR: 243944
Submitted by: swills
Added:
head/net/pacemaker1/files/extra-patch-cts_remote.py (contents, props changed)
head/net/pacemaker1/files/extra-patch-cts_watcher.py (contents, props changed)
head/net/pacemaker1/files/patch-tools_cibsecret.in (contents, props changed)
Modified:
head/net/pacemaker1/Makefile
head/net/pacemaker1/Makefile.common
head/net/pacemaker1/pkg-plist
Modified: head/net/pacemaker1/Makefile
==============================================================================
--- head/net/pacemaker1/Makefile Fri Feb 7 17:00:10 2020 (r525491)
+++ head/net/pacemaker1/Makefile Fri Feb 7 17:23:49 2020 (r525492)
@@ -1,8 +1,8 @@
-
# Created by: David Shane Holden <dpejesh at yahoo.com>
# $FreeBSD$
PORTVERSION= 1.1.22
+PORTREVISION= 1
PKGNAMESUFFIX= 1
.include "${.CURDIR}/Makefile.common"
@@ -23,10 +23,17 @@ SHEBANG_FILES+= cts/cts \
REPLACE_ARGS_GETOPT= -e 's,getopt,${LOCALBASE}/bin/getopt,'
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_SUFFIX} > 36
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cts_remote.py \
+ ${PATCHDIR}/extra-patch-cts_watcher.py
+.endif
+
post-patch: post-patch-common
@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount
@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master
@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_report.in
@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_standby
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/net/pacemaker1/Makefile.common
==============================================================================
--- head/net/pacemaker1/Makefile.common Fri Feb 7 17:00:10 2020 (r525491)
+++ head/net/pacemaker1/Makefile.common Fri Feb 7 17:23:49 2020 (r525492)
@@ -9,10 +9,8 @@ MAINTAINER= egypcio at FreeBSD.org
COMMENT= Scalable High-Availability cluster resource manager
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= fails to build with recent versions of python
-EXPIRATION_DATE= 2020-02-15
-
BUILD_DEPENDS= bash:shells/bash \
getopt>=0:misc/getopt
LIB_DEPENDS= libgnutls.so:security/gnutls \
@@ -34,8 +32,8 @@ USE_GITHUB= yes
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
Added: head/net/pacemaker1/files/extra-patch-cts_remote.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pacemaker1/files/extra-patch-cts_remote.py Fri Feb 7 17:23:49 2020 (r525492)
@@ -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()
Added: head/net/pacemaker1/files/extra-patch-cts_watcher.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pacemaker1/files/extra-patch-cts_watcher.py Fri Feb 7 17:23:49 2020 (r525492)
@@ -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")
Added: head/net/pacemaker1/files/patch-tools_cibsecret.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/pacemaker1/files/patch-tools_cibsecret.in Fri Feb 7 17:23:49 2020 (r525492)
@@ -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"
+ }
Modified: head/net/pacemaker1/pkg-plist
==============================================================================
--- head/net/pacemaker1/pkg-plist Fri Feb 7 17:00:10 2020 (r525491)
+++ head/net/pacemaker1/pkg-plist Fri Feb 7 17:23:49 2020 (r525492)
@@ -88,36 +88,36 @@ lib/ocf/resource.d/pacemaker/remote
%%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
More information about the svn-ports-head
mailing list