git: 55071c22f12e - main - net-mgmt/crmsh: Update to 4.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Florian Smeets <flo_at_FreeBSD.org>
Date: Sat, 20 Jan 2024 17:36:18 UTC
The branch main has been updated by flo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=55071c22f12edd7b950308392ca4b4a0cc724972

commit 55071c22f12edd7b950308392ca4b4a0cc724972
Author:     Florian Smeets <flo@FreeBSD.org>
AuthorDate: 2024-01-20 17:35:22 +0000
Commit:     Florian Smeets <flo@FreeBSD.org>
CommitDate: 2024-01-20 17:35:58 +0000

    net-mgmt/crmsh: Update to 4.6.0
    
    Requested by:   Hadi Rezaee <rezaee.hadi@gmail.com>
---
 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