Attachment #223702 for bug #254652

View | Details | Raw Unified | Return to bug 254652
Collapse All | Expand All




# Created by: David Shane Holden <dpejesh@yahoo.com>
# $FreeBSD$

PORTNAME=		crmsh
PORTVERSION=		4.3.0
CATEGORIES=		net-mgmt python

MAINTAINER=		egypcio@FreeBSD.org

LICENSE=		GPLv2
LICENSE_FILE=		${WRKSRC}/COPYING

DEPRECATED=	Uses deprecated version of python
EXPIRATION_DATE=	2020-09-15

# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
# because the crmsh build uses autotools which then calls setup.py.
BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}

			${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}

USES=			autoreconf gmake python:3.6+ shebangfix
USE_GITHUB=		yes
GH_ACCOUNT=		ClusterLabs
GNU_CONFIGURE=		yes

NO_ARCH=		yes

SHEBANG_FILES=		bin/crm \
			hb_report/hb_report.in \
			scripts/*/*.py \
			test/cib-tests.sh \
			test/docker_scripts.sh \
			test/evaltest.sh \
			test/list-undocumented-commands.py \
			utils/crm_clean.py \


post-patch:
	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/config.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py
	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/crmsh/ui_analyze.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.py
	@${REINPLACE_CMD} 's,%%PYTHON_CMD%%,${PYTHON_CMD},g' ${WRKSRC}/hb_report/hb_report.in
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/openais_conf_support.sh
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.sh
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py
	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py


Lines 1-3 Link Here

(-)net-mgmt/crmsh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600084758	1	TIMESTAMP = 1617001681
2	SHA256 (ClusterLabs-crmsh-3.0.5_GH0.tar.gz) = 38c01ca0432e13874c42497e56980f922817dec1668866eefe9f2eb19a6b702a	2	SHA256 (ClusterLabs-crmsh-4.3.0_GH0.tar.gz) = 0053679a9006cf884acdfd63a2a02d0890ae31bef0dc03749756b23e737d2a09
3	SIZE (ClusterLabs-crmsh-3.0.5_GH0.tar.gz) = 979507	3	SIZE (ClusterLabs-crmsh-4.3.0_GH0.tar.gz) = 1090338

Lines 1-6 Link Here

(-)net-mgmt/crmsh/files/patch-Makefile.am (-5 / +5 lines)
1	--- Makefile.am.orig 2017-01-31 14:52:10 UTC	1	--- Makefile.am.orig 2021-02-19 01:48:25 UTC
2	+++ Makefile.am	2	+++ Makefile.am 2021-03-30
3	@@ -51,7 +51,8 @@ endif	3	@@ -51,7 +51,8 @@
4	install-data-hook:	4	install-data-hook:
5	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \	5	mkdir -p $(DESTDIR)$(datadir)/@PACKAGE@/; \
6	for d in $$(cat data-manifest); do \	6	for d in $$(cat data-manifest); do \
Lines 10-16 Link Here
10	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \	10	mv $(DESTDIR)$(datadir)/@PACKAGE@/test $(DESTDIR)$(datadir)/@PACKAGE@/tests; \
11	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter	11	cp test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/@PACKAGE@/tests/testcases/configbasic-xml.filter
12		12
13	@@ -66,7 +67,7 @@ all-local:	13	@@ -69,7 +70,7 @@
14	--build-base $(shell readlink -f $(builddir))/build \	14	--build-base $(shell readlink -f $(builddir))/build \
15	--verbose)	15	--verbose)
16		16
Lines 18-21 Link Here
18	+python_prefix = --prefix=$(prefix) --root=$(DESTDIR)	18	+python_prefix = --prefix=$(prefix) --root=$(DESTDIR)
19		19
20	install-exec-local:	20	install-exec-local:
21	-mkdir -p $(DESTDIR)$(pkgpythondir)	21	$(INSTALL) -d -m 770 $(DESTDIR)/${localstatedir}/log/crmsh

Line 0 Link Here

(-)net-mgmt/crmsh/files/patch-crmsh_config.py (+11 lines)
	1	--- crmsh/config.py.orig 2021-02-19 01:48:25 UTC
	2	+++ crmsh/config.py
	3	@@ -40,7 +40,7 @@
	4	return dirs
	5
	6
	7	-_SYSTEMWIDE = '/etc/crm/crm.conf'
	8	+_SYSTEMWIDE = '%%PREFIX%%/etc/crm/crm.conf'
	9	_PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME, 'crm.conf')
	10
	11	_PATHLIST = {

Lines 1-6 Link Here

(-)net-mgmt/crmsh/files/patch-crmsh_corosync.py (-2 / +2 lines)
1	--- crmsh/corosync.py.orig 2018-04-19 03:47:12 UTC	1	--- crmsh/corosync.py.orig 2021-02-19 01:48:25 UTC
2	+++ crmsh/corosync.py	2	+++ crmsh/corosync.py
3	@@ -14,7 +14,7 @@ from .msg import err_buf, common_debug	3	@@ -16,7 +16,7 @@
4		4
5		5
6	def conf():	6	def conf():

Line 0 Link Here

(-)net-mgmt/crmsh/files/patch-crmsh_ui__analyze.py (+11 lines)
	1	--- crmsh/ui_analyze.py.orig 2021-02-19 01:48:25 UTC
	2	+++ crmsh/ui_analyze.py
	3	@@ -6,7 +6,7 @@
	4
	5	from . import command
	6	from . import utils
	7	-sys.path.append("/usr/share/crmsh")
	8	+sys.path.append("%%DATADIR%%")
	9	from preflight_check import main
	10
	11




--- crmsh/utils.py.orig	2021-02-19 01:48:25 UTC
+++ crmsh/utils.py
@@ -1100,7 +1100,7 @@
         return "heartbeat"
     elif is_process("[a]isexec"):
         return "openais"

         return "corosync"
     return ""
 
@@ -1663,7 +1663,7 @@
     in corosync.conf
     '''
     try:

         lines = open(cfg).read().split('\n')
         name_re = re.compile(r'\s*name:\s+(.*)')
         names = []
@@ -1682,7 +1682,7 @@
     in corosync.conf
     '''
     try:




--- hb_report/hb_report.in.orig	2017-07-21 09:17:13 UTC
+++ hb_report/hb_report.in
@@ -203,11 +203,11 @@ time2str() {
 }
 # try to figure out where pacemaker ... etc
 get_pe_state_dir() {
-	PE_STATE_DIR=`python -c "import crmsh.config; print crmsh.config.path.pe_state_dir"`
+	PE_STATE_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.pe_state_dir)"`
 	test -d "$PE_STATE_DIR"
 }
 get_cib_dir() {
-	CIB_DIR=`python -c "import crmsh.config; print crmsh.config.path.crm_config"`
+	CIB_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.crm_config)"`
 	test -d "$CIB_DIR"
 }
 get_pe_state_dir2() {
@@ -357,7 +357,7 @@ is_our_log() {
 	local cat
 	cat=`find_decompressor $logf`
 	local first_time="`$cat $logf | head -10 | find_first_ts`"
-	local last_time="`$cat $logf | tail -10 | tac | find_first_ts`"
+	local last_time="`$cat $logf | tail -10 | tail -r | find_first_ts`"
 	if [ x = "x$first_time" -o x = "x$last_time" ]; then
 		return 0 # skip (empty log?)
 	fi
@@ -467,7 +467,7 @@ loginfo() {
 	local logf=$1
 	local fake=$2
 	local nextpos
-	nextpos=`python -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
+	nextpos=`%%PYTHON_CMD%% -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
 	if [ "$fake" ]; then
 		echo "synthetic:$logf $nextpos"
 	else
@@ -1206,7 +1206,7 @@ which which >/dev/null 2>&1 ||
 	fatal "please install the which(1) program"
 
 WE=`uname -n`  # who am i?
-tmpdir=`mktemp -t -d .hb_report.workdir.XXXXXX` ||
+tmpdir=`mktemp -d` ||
 	fatal "disk full"
 add_tmpfiles $tmpdir
 WORKDIR=$tmpdir
@@ -1322,7 +1322,7 @@ glibc
 "
 case "$CLUSTER_TYPE" in
 openais)
-	CONF=/etc/corosync/corosync.conf # corosync?
+	CONF=%%PREFIX%%/etc/corosync/corosync.conf # corosync?
 	if test -f $CONF; then
 		CORES_DIRS="$CORES_DIRS /var/lib/corosync"
 	else




--- hb_report/openais_conf_support.sh.orig	2018-04-19 04:02:39 UTC
+++ hb_report/openais_conf_support.sh
@@ -70,8 +70,8 @@ getlogvars() {
 }
 cluster_info() {
 	: echo "openais version: how?"
-	if [ "$CONF" = /etc/corosync/corosync.conf ]; then
-		/usr/sbin/corosync -v
+	if [ "$CONF" = %%PREFIX%%/etc/corosync/corosync.conf ]; then
+		%%PREFIX%%/sbin/corosync -v
 	fi
 }
 essential_files() {

Line 0 Link Here

(-)net-mgmt/crmsh/files/patch-hb__report_utillib.py (+11 lines)
	1	--- hb_report/utillib.py.orig 2021-02-19 01:48:25 UTC
	2	+++ hb_report/utillib.py
	3	@@ -378,7 +378,7 @@
	4	constants.PCMK_LIB = os.path.dirname(constants.CIB_DIR)
	5	log_debug("setting PCMK_LIB to %s" % constants.PCMK_LIB)
	6	constants.CORES_DIRS = os.path.join(constants.PCMK_LIB, "cores")
	7	- constants.CONF = "/etc/corosync/corosync.conf"
	8	+ constants.CONF = "%%PREFIX%%/etc/corosync/corosync.conf"
	9	if os.path.isfile(constants.CONF):
	10	constants.CORES_DIRS += " /var/lib/corosync"
	11	constants.B_CONF = os.path.basename(constants.CONF)




--- hb_report/utillib.sh.orig	2017-07-21 09:17:13 UTC
+++ hb_report/utillib.sh
@@ -8,7 +8,7 @@
 get_cluster_type() {
 	if ps -ef | egrep -qs '[a]isexec|[c]orosync' ||
 			[ -f /etc/ais/openais.conf -a ! -f "$HA_CF" ] ||
-			[ -f /etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
+			[ -f %%PREFIX%%/etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
 	then
 		debug "this is OpenAIS cluster stack"
 		echo "openais"
@@ -525,7 +525,7 @@ crmconfig() {
 		CIB_file=$1/$CIB_F crm configure show >$1/$CIB_TXT_F 2>&1
 }
 get_crm_nodes() {
-	/usr/sbin/crm node server
+	%%PREFIX%%/bin/crm node server
 }
 get_live_nodes() {
 	if [ `id -u` = 0 ] && which fping >/dev/null 2>&1; then

Lines 1-6 Link Here

(-)net-mgmt/crmsh/files/patch-scripts_health_collect.py (-2 / +2 lines)
1	--- scripts/health/collect.py.orig 2018-04-19 04:04:24 UTC	1	--- scripts/health/collect.py.orig 2021-02-19 01:48:25 UTC
2	+++ scripts/health/collect.py	2	+++ scripts/health/collect.py
3	@@ -67,7 +67,7 @@ def disk_info():	3	@@ -75,7 +75,7 @@
4	FILES = [	4	FILES = [
5	'/etc/csync2/key_hagroup',	5	'/etc/csync2/key_hagroup',
6	'/etc/csync2/csync2.cfg',	6	'/etc/csync2/csync2.cfg',

Lines 1-8 Link Here

(-)net-mgmt/crmsh/files/patch-setup.py (-3 / +3 lines)
1	--- setup.py.orig 2017-05-19 19:22:47 UTC	1	--- setup.py.orig 2021-02-19 01:48:25 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -12,5 +12,5 @@ setup(name='crmsh',	3	@@ -12,5 +12,5 @@
4	packages=['crmsh'],	4	packages=['crmsh'],
5	install_requires=['parallax', 'lxml', 'PyYAML', 'python-dateutil'],	5	install_requires=['parallax', 'lxml', 'PyYAML', 'py-dateutil'],
6	scripts=['bin/crm'],	6	scripts=['bin/crm'],
7	- data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])],	7	- data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])],
8	+ data_files=[('%%DATADIR%%', ['doc/crm.8.adoc'])],	8	+ data_files=[('%%DATADIR%%', ['doc/crm.8.adoc'])],

Lines 1-6 Link Here

(-)net-mgmt/crmsh/files/patch-utils_crm__init.py (-3 / +3 lines)
1	--- utils/crm_init.py.orig 2018-04-19 04:05:44 UTC	1	--- utils/crm_init.py.orig 2021-02-19 01:48:25 UTC
2	+++ utils/crm_init.py	2	+++ utils/crm_init.py
3	@@ -13,7 +13,7 @@ SERVICES = ['sshd', 'ntp', 'corosync', '	3	@@ -13,7 +13,7 @@
4	SSH_KEY = os.path.expanduser('~/.ssh/id_rsa')	4	SSH_KEY = os.path.expanduser('~/.ssh/id_rsa')
5	CSYNC2_KEY = '/etc/csync2/key_hagroup'	5	CSYNC2_KEY = '/etc/csync2/key_hagroup'
6	CSYNC2_CFG = '/etc/csync2/csync2.cfg'	6	CSYNC2_CFG = '/etc/csync2/csync2.cfg'
Lines 9-15 Link Here
9	SYSCONFIG_SBD = '/etc/sysconfig/sbd'	9	SYSCONFIG_SBD = '/etc/sysconfig/sbd'
10	SYSCONFIG_FW = '/etc/sysconfig/SuSEfirewall2'	10	SYSCONFIG_FW = '/etc/sysconfig/SuSEfirewall2'
11	SYSCONFIG_FW_CLUSTER = '/etc/sysconfig/SuSEfirewall2.d/services/cluster'	11	SYSCONFIG_FW_CLUSTER = '/etc/sysconfig/SuSEfirewall2.d/services/cluster'
12	@@ -107,7 +107,7 @@ def files_info():	12	@@ -92,7 +92,7 @@
13		13
14	def logrotate_info():	14	def logrotate_info():
15	rc, _, _ = crm_script.call(	15	rc, _, _ = crm_script.call(




@sample etc/crm/crm.conf.sample
%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/requires.txt
%%PYTHON_SITELIBDIR%%/crmsh-4.2.0-py3.7.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/crmsh/__init__.py
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/__init__.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/bootstrap.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cache.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibconfig.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibstatus.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cibverify.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/clidisplay.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cliformat.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/cmd_status.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/command.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/completers.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/config.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/constants.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/corosync.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/crm_gv.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/crm_pssh.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/handles.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/help.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/history.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/idmgmt.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/lock.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/log_patterns.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/logparser.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/logtime.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/main.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/minieval.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/msg.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/options.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ordereddict.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/orderedset.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/pacemaker.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parallax.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/parse.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ra.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/rsctest.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/schema.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/scripts.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/template.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/term.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/tmpfiles.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_analyze.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_assist.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cib.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cibstatus.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_cluster.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_configure.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_context.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_corosync.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_history.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_maintenance.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_node.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_options.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_ra.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_report.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_resource.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_root.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_script.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_site.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_template.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/ui_utils.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/userdir.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/utils.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/__pycache__/xmlutil.cpython-37.pyc
%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.py
%%PYTHON_SITELIBDIR%%/crmsh/bootstrap.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cache.py
%%PYTHON_SITELIBDIR%%/crmsh/cache.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cibconfig.py
%%PYTHON_SITELIBDIR%%/crmsh/cibconfig.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cibstatus.py
%%PYTHON_SITELIBDIR%%/crmsh/cibstatus.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cibverify.py
%%PYTHON_SITELIBDIR%%/crmsh/cibverify.pyc
%%PYTHON_SITELIBDIR%%/crmsh/clidisplay.py
%%PYTHON_SITELIBDIR%%/crmsh/clidisplay.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cliformat.py
%%PYTHON_SITELIBDIR%%/crmsh/cliformat.pyc
%%PYTHON_SITELIBDIR%%/crmsh/cmd_status.py
%%PYTHON_SITELIBDIR%%/crmsh/cmd_status.pyc
%%PYTHON_SITELIBDIR%%/crmsh/command.py
%%PYTHON_SITELIBDIR%%/crmsh/command.pyc
%%PYTHON_SITELIBDIR%%/crmsh/completers.py
%%PYTHON_SITELIBDIR%%/crmsh/completers.pyc
%%PYTHON_SITELIBDIR%%/crmsh/config.py
%%PYTHON_SITELIBDIR%%/crmsh/config.pyc
%%PYTHON_SITELIBDIR%%/crmsh/constants.py
%%PYTHON_SITELIBDIR%%/crmsh/constants.pyc
%%PYTHON_SITELIBDIR%%/crmsh/corosync.py
%%PYTHON_SITELIBDIR%%/crmsh/corosync.pyc
%%PYTHON_SITELIBDIR%%/crmsh/crm_gv.py
%%PYTHON_SITELIBDIR%%/crmsh/crm_gv.pyc
%%PYTHON_SITELIBDIR%%/crmsh/crm_pssh.py
%%PYTHON_SITELIBDIR%%/crmsh/crm_pssh.pyc
%%PYTHON_SITELIBDIR%%/crmsh/handles.py
%%PYTHON_SITELIBDIR%%/crmsh/handles.pyc
%%PYTHON_SITELIBDIR%%/crmsh/help.py
%%PYTHON_SITELIBDIR%%/crmsh/help.pyc
%%PYTHON_SITELIBDIR%%/crmsh/history.py
%%PYTHON_SITELIBDIR%%/crmsh/history.pyc
%%PYTHON_SITELIBDIR%%/crmsh/idmgmt.py
%%PYTHON_SITELIBDIR%%/crmsh/idmgmt.pyc
%%PYTHON_SITELIBDIR%%/crmsh/install_files.txt
%%PYTHON_SITELIBDIR%%/crmsh/lock.py
%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.py
%%PYTHON_SITELIBDIR%%/crmsh/log_patterns.pyc
%%PYTHON_SITELIBDIR%%/crmsh/logparser.py
%%PYTHON_SITELIBDIR%%/crmsh/logparser.pyc
%%PYTHON_SITELIBDIR%%/crmsh/logtime.py
%%PYTHON_SITELIBDIR%%/crmsh/logtime.pyc
%%PYTHON_SITELIBDIR%%/crmsh/main.py
%%PYTHON_SITELIBDIR%%/crmsh/minieval.py
%%PYTHON_SITELIBDIR%%/crmsh/msg.py
%%PYTHON_SITELIBDIR%%/crmsh/msg.pyc
%%PYTHON_SITELIBDIR%%/crmsh/options.py
%%PYTHON_SITELIBDIR%%/crmsh/options.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ordereddict.py
%%PYTHON_SITELIBDIR%%/crmsh/ordereddict.pyc
%%PYTHON_SITELIBDIR%%/crmsh/orderedset.py
%%PYTHON_SITELIBDIR%%/crmsh/orderedset.pyc
%%PYTHON_SITELIBDIR%%/crmsh/pacemaker.py
%%PYTHON_SITELIBDIR%%/crmsh/parallax.py
%%PYTHON_SITELIBDIR%%/crmsh/parallax_helper.py
%%PYTHON_SITELIBDIR%%/crmsh/parallax_helper.pyc
%%PYTHON_SITELIBDIR%%/crmsh/parse.py
%%PYTHON_SITELIBDIR%%/crmsh/parse.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ra.py
%%PYTHON_SITELIBDIR%%/crmsh/ra.pyc
%%PYTHON_SITELIBDIR%%/crmsh/rsctest.py
%%PYTHON_SITELIBDIR%%/crmsh/rsctest.pyc
%%PYTHON_SITELIBDIR%%/crmsh/schema.py
%%PYTHON_SITELIBDIR%%/crmsh/schema.pyc
%%PYTHON_SITELIBDIR%%/crmsh/scripts.py
%%PYTHON_SITELIBDIR%%/crmsh/scripts.pyc
%%PYTHON_SITELIBDIR%%/crmsh/template.py
%%PYTHON_SITELIBDIR%%/crmsh/template.pyc
%%PYTHON_SITELIBDIR%%/crmsh/term.py
%%PYTHON_SITELIBDIR%%/crmsh/term.pyc
%%PYTHON_SITELIBDIR%%/crmsh/tmpfiles.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_analyze.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_assist.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_assist.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_cib.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_cib.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_cibstatus.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_cibstatus.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_cluster.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_cluster.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_configure.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_configure.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_context.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_context.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_corosync.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_corosync.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_history.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_history.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_maintenance.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_maintenance.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_node.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_node.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_options.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_options.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_ra.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_ra.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_report.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_report.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_resource.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_resource.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_root.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_root.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_script.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_script.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_site.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_site.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_template.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_template.pyc
%%PYTHON_SITELIBDIR%%/crmsh/ui_utils.py
%%PYTHON_SITELIBDIR%%/crmsh/ui_utils.pyc
%%PYTHON_SITELIBDIR%%/crmsh/userdir.py
%%PYTHON_SITELIBDIR%%/crmsh/userdir.pyc
%%PYTHON_SITELIBDIR%%/crmsh/utils.py
%%PYTHON_SITELIBDIR%%/crmsh/utils.pyc
%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.py
%%PYTHON_SITELIBDIR%%/crmsh/xmlutil.pyc
%%MANPAGES%%man/man8/crm.8.gz
%%MANPAGES%%man/man8/crmsh_hb_report.8.gz
bin/crm
%%DATADIR%%/crm.8.adoc
%%DATADIR%%/hb_report/constants.py
%%DATADIR%%/hb_report/hb_report
%%DATADIR%%/hb_report/utillib.py
%%DATADIR%%/preflight_check/__init__.py
%%DATADIR%%/preflight_check/check.py
%%DATADIR%%/preflight_check/config.py
%%DATADIR%%/preflight_check/explain.py
%%DATADIR%%/preflight_check/main.py
%%DATADIR%%/preflight_check/task.py
%%DATADIR%%/preflight_check/utils.py
%%DATADIR%%/scripts/apache/main.yml
%%DATADIR%%/scripts/check-uptime/fetch.py
%%DATADIR%%/scripts/check-uptime/main.yml

%%DATADIR%%/scripts/health/main.yml
%%DATADIR%%/scripts/health/report.py
%%DATADIR%%/scripts/libvirt/main.yml
%%DATADIR%%/scripts/lvm/main.yml
%%DATADIR%%/scripts/lvm-drbd/main.yml
%%DATADIR%%/scripts/lvm/main.yml
%%DATADIR%%/scripts/mailto/main.yml
%%DATADIR%%/scripts/nfsserver/main.yml
%%DATADIR%%/scripts/nfsserver-lvm-drbd/main.yml
%%DATADIR%%/scripts/nfsserver/main.yml
%%DATADIR%%/scripts/nginx/main.yml
%%DATADIR%%/scripts/ocfs2/main.yml
%%DATADIR%%/scripts/oracle/main.yml
%%DATADIR%%/scripts/raid-lvm/main.yml

%%DATADIR%%/scripts/sap-simple-stack/main.yml
%%DATADIR%%/scripts/sapdb/main.yml
%%DATADIR%%/scripts/sapinstance/main.yml
%%DATADIR%%/scripts/sbd/main.yml
%%DATADIR%%/scripts/sbd-device/main.yml
%%DATADIR%%/scripts/sbd/main.yml
%%DATADIR%%/scripts/virtual-ip/main.yml
%%DATADIR%%/scripts/vmware/main.yml
%%DATADIR%%/templates/apache

%%DATADIR%%/tests/features/bootstrap_init_join_remove.feature
%%DATADIR%%/tests/features/bootstrap_options.feature
%%DATADIR%%/tests/features/bootstrap_sbd.feature
%%DATADIR%%/tests/features/configure_bugs.feature
%%DATADIR%%/tests/features/constraints_bugs.feature
%%DATADIR%%/tests/features/environment.py
%%DATADIR%%/tests/features/geo_setup.feature
%%DATADIR%%/tests/features/hb_report_bugs.feature
%%DATADIR%%/tests/features/qdevice_options.feature
%%DATADIR%%/tests/features/qdevice_setup_remove.feature
%%DATADIR%%/tests/features/qdevice_usercase.feature
%%DATADIR%%/tests/features/qdevice_validate.feature
%%DATADIR%%/tests/features/resource_failcount.feature
%%DATADIR%%/tests/features/resource_set.feature
%%DATADIR%%/tests/features/steps/__init__.py
%%DATADIR%%/tests/features/steps/const.py
%%DATADIR%%/tests/features/steps/step_implenment.py

%%DATADIR%%/tests/testcases/basicset
%%DATADIR%%/tests/testcases/bugs
%%DATADIR%%/tests/testcases/bugs.exp
%%DATADIR%%/tests/testcases/bundle
%%DATADIR%%/tests/testcases/bundle.exp
%%DATADIR%%/tests/testcases/commit
%%DATADIR%%/tests/testcases/commit.exp
%%DATADIR%%/tests/testcases/common.excl

%%DATADIR%%/tests/testcases/confbasic-xml
%%DATADIR%%/tests/testcases/confbasic-xml.exp
%%DATADIR%%/tests/testcases/confbasic.exp
%%DATADIR%%/tests/testcases/configbasic-xml.filter
%%DATADIR%%/tests/testcases/delete
%%DATADIR%%/tests/testcases/delete.exp
%%DATADIR%%/tests/testcases/edit

%%DATADIR%%/tests/testcases/rset
%%DATADIR%%/tests/testcases/rset-xml
%%DATADIR%%/tests/testcases/rset-xml.exp
%%DATADIR%%/tests/testcases/rset-xml.filter
%%DATADIR%%/tests/testcases/rset.exp
%%DATADIR%%/tests/testcases/scripts
%%DATADIR%%/tests/testcases/scripts.exp

%%DATADIR%%/tests/testcases/shadow.exp
%%DATADIR%%/tests/testcases/xmlonly.sh
%%DATADIR%%/tests/travis-tests.sh
%%DATADIR%%/tests/unit-tests-in-container.sh
%%DATADIR%%/tests/unittests/__init__.py
%%DATADIR%%/tests/unittests/bug-862577_corosync.conf
%%DATADIR%%/tests/unittests/corosync.conf.1
%%DATADIR%%/tests/unittests/corosync.conf.2
%%DATADIR%%/tests/unittests/corosync.conf.3
%%DATADIR%%/tests/unittests/pacemaker.log
%%DATADIR%%/tests/unittests/pacemaker_unicode.log
%%DATADIR%%/tests/unittests/schemas/acls-1.1.rng
%%DATADIR%%/tests/unittests/schemas/acls-1.2.rng
%%DATADIR%%/tests/unittests/schemas/constraints-1.0.rng

%%DATADIR%%/tests/unittests/test_corosync.py
%%DATADIR%%/tests/unittests/test_gv.py
%%DATADIR%%/tests/unittests/test_handles.py
%%DATADIR%%/tests/unittests/test_lock.py
%%DATADIR%%/tests/unittests/test_objset.py
%%DATADIR%%/tests/unittests/test_parallax.py
%%DATADIR%%/tests/unittests/test_parse.py
%%DATADIR%%/tests/unittests/test_preflight_check.py
%%DATADIR%%/tests/unittests/test_preflight_main.py
%%DATADIR%%/tests/unittests/test_preflight_task.py
%%DATADIR%%/tests/unittests/test_preflight_utils.py
%%DATADIR%%/tests/unittests/test_report.py
%%DATADIR%%/tests/unittests/test_scripts.py
%%DATADIR%%/tests/unittests/test_time.py
%%DATADIR%%/tests/unittests/test_ui_cluster.py
%%DATADIR%%/tests/unittests/test_utils.py
%%DATADIR%%/tests/update-expected-output.sh
%%DATADIR%%/utils/crm_clean.py
%%DATADIR%%/utils/crm_init.py
%%DATADIR%%/utils/crm_pkg.py

Return to bug 254652

Lines 1-8 Link Here

(-)net-mgmt/crmsh/Makefile (-11 / +7 lines)
1	# Created by: David Shane Holden <dpejesh@yahoo.com>	1	# Created by: David Shane Holden <dpejesh@yahoo.com>
2	# $FreeBSD: head/net-mgmt/crmsh/Makefile 548620 2020-09-14 15:15:41Z egypcio $	2	# $FreeBSD$
3		3
4	PORTNAME= crmsh	4	PORTNAME= crmsh
5	PORTVERSION= 3.0.5	5	PORTVERSION= 4.3.0
6	CATEGORIES= net-mgmt python	6	CATEGORIES= net-mgmt python
7		7
8	MAINTAINER= egypcio@FreeBSD.org	8	MAINTAINER= egypcio@FreeBSD.org
Lines 11-19 Link Here
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	DEPRECATED= Uses deprecated version of python
15	EXPIRATION_DATE= 2020-09-15
16
17	# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON	14	# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
18	# because the crmsh build uses autotools which then calls setup.py.	15	# because the crmsh build uses autotools which then calls setup.py.
19	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}	16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
Lines 23-29 Link Here
23	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}	21	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
25		22
26	USES= autoreconf gmake python:2.7 shebangfix	23	USES= autoreconf gmake python:3.6+ shebangfix
27	USE_GITHUB= yes	24	USE_GITHUB= yes
28	GH_ACCOUNT= ClusterLabs	25	GH_ACCOUNT= ClusterLabs
29	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
Lines 32-40 Link Here
32	NO_ARCH= yes	29	NO_ARCH= yes
33		30
34	SHEBANG_FILES= bin/crm \	31	SHEBANG_FILES= bin/crm \
		32	hb_report/hb_report.in \
35	scripts//.py \	33	scripts//.py \
36	test/cib-tests.sh \	34	test/cib-tests.sh \
37	test/docker_scripts.sh \
38	test/evaltest.sh \	35	test/evaltest.sh \
39	test/list-undocumented-commands.py \	36	test/list-undocumented-commands.py \
40	utils/crm_clean.py \	37	utils/crm_clean.py \
Lines 51-62 Link Here
51		48
52	post-patch:	49	post-patch:
53	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py	50	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py
		51	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/config.py
54	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py	52	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py
		53	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/crmsh/ui_analyze.py
55	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py	54	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py
56	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/hb_report.in	55	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.py
57	@${REINPLACE_CMD} 's,%%PYTHON_CMD%%,${PYTHON_CMD},g' ${WRKSRC}/hb_report/hb_report.in
58	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/openais_conf_support.sh
59	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/hb_report/utillib.sh
60	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py	56	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py
61	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py	57	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py
62		58

Lines 1-6 Link Here

(-)net-mgmt/crmsh/files/patch-crmsh_utils.py (-4 / +4 lines)
1	--- crmsh/utils.py.orig 2018-04-19 03:54:07 UTC	1	--- crmsh/utils.py.orig 2021-02-19 01:48:25 UTC
2	+++ crmsh/utils.py	2	+++ crmsh/utils.py
3	@@ -989,7 +989,7 @@ def cluster_stack():	3	@@ -1100,7 +1100,7 @@
4	return "heartbeat"	4	return "heartbeat"
5	elif is_process("[a]isexec"):	5	elif is_process("[a]isexec"):
6	return "openais"	6	return "openais"
Lines 9-15 Link Here
9	return "corosync"	9	return "corosync"
10	return ""	10	return ""
11		11
12	@@ -1551,7 +1551,7 @@ def list_corosync_node_names():	12	@@ -1663,7 +1663,7 @@
13	in corosync.conf	13	in corosync.conf
14	'''	14	'''
15	try:	15	try:
Lines 18-24 Link Here
18	lines = open(cfg).read().split('\n')	18	lines = open(cfg).read().split('\n')
19	name_re = re.compile(r'\sname:\s+(.)')	19	name_re = re.compile(r'\sname:\s+(.)')
20	names = []	20	names = []
21	@@ -1570,7 +1570,7 @@ def list_corosync_nodes():	21	@@ -1682,7 +1682,7 @@
22	in corosync.conf	22	in corosync.conf
23	'''	23	'''
24	try:	24	try:

Lines 1-52 Link Here

(-)net-mgmt/crmsh/files/patch-hb__report_hb__report.in (-52 lines)
1	--- hb_report/hb_report.in.orig 2017-07-21 09:17:13 UTC
2	+++ hb_report/hb_report.in
3	@@ -203,11 +203,11 @@ time2str() {
4	}
5	# try to figure out where pacemaker ... etc
6	get_pe_state_dir() {
7	- PE_STATE_DIR=`python -c "import crmsh.config; print crmsh.config.path.pe_state_dir"`
8	+ PE_STATE_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.pe_state_dir)"`
9	test -d "$PE_STATE_DIR"
10	}
11	get_cib_dir() {
12	- CIB_DIR=`python -c "import crmsh.config; print crmsh.config.path.crm_config"`
13	+ CIB_DIR=`%%PYTHON_CMD%% -c "import crmsh.config; print(crmsh.config.path.crm_config)"`
14	test -d "$CIB_DIR"
15	}
16	get_pe_state_dir2() {
17	@@ -357,7 +357,7 @@ is_our_log() {
18	local cat
19	cat=`find_decompressor $logf`
20	local first_time="`$cat $logf \| head -10 \| find_first_ts`"
21	- local last_time="`$cat $logf \| tail -10 \| tac \| find_first_ts`"
22	+ local last_time="`$cat $logf \| tail -10 \| tail -r \| find_first_ts`"
23	if [ x = "x$first_time" -o x = "x$last_time" ]; then
24	return 0 # skip (empty log?)
25	fi
26	@@ -467,7 +467,7 @@ loginfo() {
27	local logf=$1
28	local fake=$2
29	local nextpos
30	- nextpos=`python -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
31	+ nextpos=`%%PYTHON_CMD%% -c "f=open('$logf');f.seek(0,2);print f.tell()+1"`
32	if [ "$fake" ]; then
33	echo "synthetic:$logf $nextpos"
34	else
35	@@ -1206,7 +1206,7 @@ which which >/dev/null 2>&1 \|\|
36	fatal "please install the which(1) program"
37
38	WE=`uname -n` # who am i?
39	-tmpdir=`mktemp -t -d .hb_report.workdir.XXXXXX` \|\|
40	+tmpdir=`mktemp -d` \|\|
41	fatal "disk full"
42	add_tmpfiles $tmpdir
43	WORKDIR=$tmpdir
44	@@ -1322,7 +1322,7 @@ glibc
45	"
46	case "$CLUSTER_TYPE" in
47	openais)
48	- CONF=/etc/corosync/corosync.conf # corosync?
49	+ CONF=%%PREFIX%%/etc/corosync/corosync.conf # corosync?
50	if test -f $CONF; then
51	CORES_DIRS="$CORES_DIRS /var/lib/corosync"
52	else

Lines 1-13 Link Here

(-)net-mgmt/crmsh/files/patch-hb__report_openais__conf__support.sh (-13 lines)
1	--- hb_report/openais_conf_support.sh.orig 2018-04-19 04:02:39 UTC
2	+++ hb_report/openais_conf_support.sh
3	@@ -70,8 +70,8 @@ getlogvars() {
4	}
5	cluster_info() {
6	: echo "openais version: how?"
7	- if [ "$CONF" = /etc/corosync/corosync.conf ]; then
8	- /usr/sbin/corosync -v
9	+ if [ "$CONF" = %%PREFIX%%/etc/corosync/corosync.conf ]; then
10	+ %%PREFIX%%/sbin/corosync -v
11	fi
12	}
13	essential_files() {

Lines 1-20 Link Here

(-)net-mgmt/crmsh/files/patch-hb__report_utillib.sh (-20 lines)
1	--- hb_report/utillib.sh.orig 2017-07-21 09:17:13 UTC
2	+++ hb_report/utillib.sh
3	@@ -8,7 +8,7 @@
4	get_cluster_type() {
5	if ps -ef \| egrep -qs '[a]isexec\|[c]orosync' \|\|
6	[ -f /etc/ais/openais.conf -a ! -f "$HA_CF" ] \|\|
7	- [ -f /etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
8	+ [ -f %%PREFIX%%/etc/corosync/corosync.conf -a ! -f "$HA_CF" ]
9	then
10	debug "this is OpenAIS cluster stack"
11	echo "openais"
12	@@ -525,7 +525,7 @@ crmconfig() {
13	CIB_file=$1/$CIB_F crm configure show >$1/$CIB_TXT_F 2>&1
14	}
15	get_crm_nodes() {
16	- /usr/sbin/crm node server
17	+ %%PREFIX%%/bin/crm node server
18	}
19	get_live_nodes() {
20	if [ `id -u` = 0 ] && which fping >/dev/null 2>&1; then