Date: Fri, 7 Feb 2020 17:25:39 +0000 (UTC) From: =?UTF-8?Q?Vin=c3=adcius_Zavam?= <egypcio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525493 - in head/net/pacemaker2: . files Message-ID: <202002071725.017HPd1T045182@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: egypcio Date: Fri Feb 7 17:25:39 2020 New Revision: 525493 URL: https://svnweb.freebsd.org/changeset/ports/525493 Log: net/pacemaker2: base ncurses, py37- support, and un-deprecate it follow ports@r525492. PR: 243944 Submitted by: swills Added: head/net/pacemaker2/files/patch-tools_cibsecret.in (contents, props changed) Modified: head/net/pacemaker2/Makefile head/net/pacemaker2/pkg-plist Modified: head/net/pacemaker2/Makefile ============================================================================== --- head/net/pacemaker2/Makefile Fri Feb 7 17:23:49 2020 (r525492) +++ head/net/pacemaker2/Makefile Fri Feb 7 17:25:39 2020 (r525493) @@ -2,6 +2,7 @@ # $FreeBSD$ PORTVERSION= 2.0.3 +PORTREVISION= 1 PKGNAMESUFFIX= 2 .include "${.CURDIR}/../pacemaker1/Makefile.common" Added: head/net/pacemaker2/files/patch-tools_cibsecret.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pacemaker2/files/patch-tools_cibsecret.in Fri Feb 7 17:25:39 2020 (r525493) @@ -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/pacemaker2/pkg-plist ============================================================================== --- head/net/pacemaker2/pkg-plist Fri Feb 7 17:23:49 2020 (r525492) +++ head/net/pacemaker2/pkg-plist Fri Feb 7 17:25:39 2020 (r525493) @@ -84,36 +84,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_common.cpython-36.opt-1.pyc -%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-36.pyc -%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-36.opt-1.pyc -%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.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_common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002071725.017HPd1T045182>