From nobody Sat Jan 20 17:36:18 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4THNv66D29z56LtW; Sat, 20 Jan 2024 17:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4THNv65FYsz4NfG; Sat, 20 Jan 2024 17:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705772178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXWdmPJrnmqiIGwX3FDZcmluLyOyb4A6DQIUVbVkGwY=; b=S9qygWx3vQEhJViWR8k7IpaS9YdJTivARj/f9CkG9O4BpfR3XyrJDAeCzD+M/3nxuOLKMo ed3iBZiRHVkFoyA1xrGCA1a8wnAYF1oGKsl8CXdjA+RFaYzjzJ1XH8nezefC7SqtVGANcX Ky8+gpIZfHaS5JUU7rOsUtYhDirE4++bo1PtxmBEX3MBe8I7ZmDyyoEK3pRxr9qVBOD2Q4 X1+5EyEYtQuBKLxOaP7lQBb39SlTfZygynB8sFD2kWFvgSVLCDOvSne5bmPOUdjZNDT/OY rXkICUyt8Mi3FUGihf1+YnKBCmkDPVxKns8I8pUUiCXevHuw8g7dHobb75Jf4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705772178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXWdmPJrnmqiIGwX3FDZcmluLyOyb4A6DQIUVbVkGwY=; b=ynlDrEMjcuWW5IUaHRQFFZOn97Hib7fUy/zBKLDQGGYnd+gEOdi2NVBqzEmoWvCtUZkObq sNg0vwR7JjLpUcLMn/s3c/620ZYUgU8lkCZ9/bkHHO9DsfwEKyKyzrJITEAOwqY8Unj5zM MzIxK2nfc7hjH0NnN/4t24qIr71DmspIeocqPPaS+Y9f6zR6JEPZVYxtxGtJ+if8PwCf/6 1MS/6wl2WPT5u2oy581lxJ5T2hb+ucH4oLN8C8DyaL68A4YD7R6YnchBL28R5apKhOI5ob jSR23RdwtoUm1eMX1MD6kZhO/I2BkRxLiR9SCjh7IY8jswKsaTLTu/2q0ltUAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705772178; a=rsa-sha256; cv=none; b=fja8trOQGZbp8/2QUufAbVzcrQNB7GXu3ufsj1PHaOjjxD+hoZUtMY+pi4064nGZ3544YO Ka5e3POUv52nS8OZPVWZk6PWXxWtAKTi4ImJB1ffG8MWKFanBfNAMqofvI5yTrfNxB4gfV XkGVbLEpTNHu0TW6DQI9PzEXWm16TK5CwSG3FjnTlLRu03vU7tCESsqroUkRFLcxXcEqXw VvnUsUF+k4Php8oGX8rMAQgcIiygMa0BMK3ZhnNKYRDzb4t40acRaPpL+b+OlG7Ts+XqTI mUhlVESyuNa0KnjfOl75iyCtfd/jtr3Lk3qJZV/ET2+Z0k5uX9oRPLMNLt4D7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4THNv64Jb5zksL; Sat, 20 Jan 2024 17:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40KHaI4B054834; Sat, 20 Jan 2024 17:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KHaIfT054831; Sat, 20 Jan 2024 17:36:18 GMT (envelope-from git) Date: Sat, 20 Jan 2024 17:36:18 GMT Message-Id: <202401201736.40KHaIfT054831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 55071c22f12e - main - net-mgmt/crmsh: Update to 4.6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55071c22f12edd7b950308392ca4b4a0cc724972 Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=55071c22f12edd7b950308392ca4b4a0cc724972 commit 55071c22f12edd7b950308392ca4b4a0cc724972 Author: Florian Smeets AuthorDate: 2024-01-20 17:35:22 +0000 Commit: Florian Smeets CommitDate: 2024-01-20 17:35:58 +0000 net-mgmt/crmsh: Update to 4.6.0 Requested by: Hadi Rezaee --- net-mgmt/crmsh/Makefile | 3 +-- net-mgmt/crmsh/distinfo | 6 +++--- net-mgmt/crmsh/files/patch-crmsh_utils.py | 15 ++++++++++++--- net-mgmt/crmsh/pkg-plist | 22 ++++++++++++++++++++-- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile index f2651f094195..dac1ecec98f3 100644 --- a/net-mgmt/crmsh/Makefile +++ b/net-mgmt/crmsh/Makefile @@ -1,6 +1,5 @@ PORTNAME= crmsh -PORTVERSION= 4.5.1 -PORTREVISION= 1 +DISTVERSION= 4.6.0 CATEGORIES= net-mgmt python MAINTAINER= flo@FreeBSD.org diff --git a/net-mgmt/crmsh/distinfo b/net-mgmt/crmsh/distinfo index fb7ca1d1b222..fe2e84d24d81 100644 --- a/net-mgmt/crmsh/distinfo +++ b/net-mgmt/crmsh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704825502 -SHA256 (ClusterLabs-crmsh-4.5.1_GH0.tar.gz) = 1e3e30f9fb7a3f4199eed512bba9004fe963661bd4d51ef710508a18c3e76c09 -SIZE (ClusterLabs-crmsh-4.5.1_GH0.tar.gz) = 1870939 +TIMESTAMP = 1705768385 +SHA256 (ClusterLabs-crmsh-4.6.0_GH0.tar.gz) = 006ef95137b3cf0882758b2cb6f2df633622f7736fbd33638b7d476390010a4a +SIZE (ClusterLabs-crmsh-4.6.0_GH0.tar.gz) = 1889085 diff --git a/net-mgmt/crmsh/files/patch-crmsh_utils.py b/net-mgmt/crmsh/files/patch-crmsh_utils.py index a9dbe52c0918..55c742dd2888 100644 --- a/net-mgmt/crmsh/files/patch-crmsh_utils.py +++ b/net-mgmt/crmsh/files/patch-crmsh_utils.py @@ -1,6 +1,15 @@ ---- crmsh/utils.py.orig 2021-08-12 08:25:45 UTC +--- crmsh/utils.py.orig 2024-01-09 08:38:25 UTC +++ crmsh/utils.py -@@ -1667,7 +1667,7 @@ def list_corosync_node_names(): +@@ -1564,7 +1564,7 @@ def get_pcmk_version(): + + + def get_pcmk_version(): +- cmd = "/usr/sbin/pacemakerd --version" ++ cmd = "%%PREFIX%%/sbin/pacemakerd --version" + out = sh.cluster_shell().get_stdout_or_raise_error(cmd) + version = out.split()[1] + logger.debug("Found pacemaker version: %s", version) +@@ -1725,7 +1725,7 @@ def list_corosync_node_names(): in corosync.conf ''' try: @@ -9,7 +18,7 @@ lines = open(cfg).read().split('\n') name_re = re.compile(r'\s*name:\s+(.*)') names = [] -@@ -1686,7 +1686,7 @@ def list_corosync_nodes(): +@@ -1744,7 +1744,7 @@ def list_corosync_nodes(): in corosync.conf ''' try: diff --git a/net-mgmt/crmsh/pkg-plist b/net-mgmt/crmsh/pkg-plist index feeab87372a2..31139e41c519 100644 --- a/net-mgmt/crmsh/pkg-plist +++ b/net-mgmt/crmsh/pkg-plist @@ -42,12 +42,16 @@ etc/crm/profiles.yml %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/pacemaker%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parallax%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parse%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/pyshim%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/qdevice%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ra%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/rsctest%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/sbd%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/schema%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/scripts%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/service_manager%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/sh%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ssh_key%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/template%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/term%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/tmpfiles%%PYTHON_EXT_SUFFIX%%.pyc @@ -70,6 +74,7 @@ etc/crm/profiles.yml %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_template%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_utils%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/upgradeutil%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/user_of_host%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/userdir%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/__pycache__/watchdog%%PYTHON_EXT_SUFFIX%%.pyc @@ -129,6 +134,7 @@ etc/crm/profiles.yml %%PYTHON_SITELIBDIR%%/crmsh/prun/__pycache__/runner%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/prun/prun.py %%PYTHON_SITELIBDIR%%/crmsh/prun/runner.py +%%PYTHON_SITELIBDIR%%/crmsh/pyshim.py %%PYTHON_SITELIBDIR%%/crmsh/qdevice.py %%PYTHON_SITELIBDIR%%/crmsh/ra.py %%PYTHON_SITELIBDIR%%/crmsh/report/__init__.py @@ -136,15 +142,18 @@ etc/crm/profiles.yml %%PYTHON_SITELIBDIR%%/crmsh/report/__pycache__/collect%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/report/__pycache__/constants%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/report/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/crmsh/report/__pycache__/utillib%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/crmsh/report/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/crmsh/report/collect.py %%PYTHON_SITELIBDIR%%/crmsh/report/constants.py %%PYTHON_SITELIBDIR%%/crmsh/report/core.py -%%PYTHON_SITELIBDIR%%/crmsh/report/utillib.py +%%PYTHON_SITELIBDIR%%/crmsh/report/utils.py %%PYTHON_SITELIBDIR%%/crmsh/rsctest.py %%PYTHON_SITELIBDIR%%/crmsh/sbd.py %%PYTHON_SITELIBDIR%%/crmsh/schema.py %%PYTHON_SITELIBDIR%%/crmsh/scripts.py +%%PYTHON_SITELIBDIR%%/crmsh/service_manager.py +%%PYTHON_SITELIBDIR%%/crmsh/sh.py +%%PYTHON_SITELIBDIR%%/crmsh/ssh_key.py %%PYTHON_SITELIBDIR%%/crmsh/template.py %%PYTHON_SITELIBDIR%%/crmsh/term.py %%PYTHON_SITELIBDIR%%/crmsh/tmpfiles.py @@ -167,6 +176,7 @@ etc/crm/profiles.yml %%PYTHON_SITELIBDIR%%/crmsh/ui_template.py %%PYTHON_SITELIBDIR%%/crmsh/ui_utils.py %%PYTHON_SITELIBDIR%%/crmsh/upgradeutil.py +%%PYTHON_SITELIBDIR%%/crmsh/user_of_host.py %%PYTHON_SITELIBDIR%%/crmsh/userdir.py %%PYTHON_SITELIBDIR%%/crmsh/utils.py %%PYTHON_SITELIBDIR%%/crmsh/watchdog.py @@ -253,6 +263,7 @@ man/man8/profiles.8.gz %%DATADIR%%/tests/features/constraints_bugs.feature %%DATADIR%%/tests/features/coveragerc %%DATADIR%%/tests/features/crm_report_bugs.feature +%%DATADIR%%/tests/features/crm_report_normal.feature %%DATADIR%%/tests/features/environment.py %%DATADIR%%/tests/features/geo_setup.feature %%DATADIR%%/tests/features/healthcheck.feature @@ -263,6 +274,7 @@ man/man8/profiles.8.gz %%DATADIR%%/tests/features/qdevice_validate.feature %%DATADIR%%/tests/features/resource_failcount.feature %%DATADIR%%/tests/features/resource_set.feature +%%DATADIR%%/tests/features/ssh_agent.feature %%DATADIR%%/tests/features/steps/__init__.py %%DATADIR%%/tests/features/steps/behave_agent.py %%DATADIR%%/tests/features/steps/const.py @@ -331,6 +343,7 @@ man/man8/profiles.8.gz %%DATADIR%%/tests/unittests/corosync.conf.2 %%DATADIR%%/tests/unittests/corosync.conf.3 %%DATADIR%%/tests/unittests/pacemaker.log +%%DATADIR%%/tests/unittests/pacemaker.log.2 %%DATADIR%%/tests/unittests/pacemaker_unicode.log %%DATADIR%%/tests/unittests/schemas/acls-1.1.rng %%DATADIR%%/tests/unittests/schemas/acls-1.2.rng @@ -378,8 +391,13 @@ man/man8/profiles.8.gz %%DATADIR%%/tests/unittests/test_prun.py %%DATADIR%%/tests/unittests/test_qdevice.py %%DATADIR%%/tests/unittests/test_ratrace.py +%%DATADIR%%/tests/unittests/test_report_collect.py +%%DATADIR%%/tests/unittests/test_report_core.py +%%DATADIR%%/tests/unittests/test_report_utils.py %%DATADIR%%/tests/unittests/test_sbd.py %%DATADIR%%/tests/unittests/test_scripts.py +%%DATADIR%%/tests/unittests/test_service_manager.py +%%DATADIR%%/tests/unittests/test_sh.py %%DATADIR%%/tests/unittests/test_time.py %%DATADIR%%/tests/unittests/test_ui_cluster.py %%DATADIR%%/tests/unittests/test_upgradeuitl.py