Attachment #220118 for bug #251494




# Created by: Tom Judge <tj@FreeBSD.org>
# $FreeBSD$

PORTNAME=	kibana
PORTVERSION=	7.10.0
DISTVERSIONSUFFIX=	-darwin-x86_64
PORTREVISION=	1
CATEGORIES=	textproc www
MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
		http://artifacts.elastic.co/downloads/kibana/
PKGNAMESUFFIX?=	7

MAINTAINER=	elastic@FreeBSD.org
COMMENT=	Browser based analytics and search interface to ElasticSearch

LICENSE=	APACHE20

RUN_DEPENDS=	node10>=10.21.0:www/node10

CONFLICTS=	kibana[6]*

NO_BUILD=	yes
WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
USE_RC_SUBR=	${PORTNAME}

SUB_FILES=	pkg-deinstall
SUB_LIST+=	PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX}

post-patch:
	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete

do-install:
	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
	(cd ${WRKSRC} && \
		${RM} -r config node optimize && \
		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \
		${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config

post-install:
	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/kibana7/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603571985	1	TIMESTAMP = 1605452222
2	SHA256 (kibana-7.9.3-darwin-x86_64.tar.gz) = 44c94470012580e0f29a4291d2c2210acaf4090d618db777e3ab079012948961	2	SHA256 (kibana-7.10.0-darwin-x86_64.tar.gz) = 9241d69f4543ed3837e2d53c37db8d45aa1b6df8d08f7cf6509c061f4b8f24fc
3	SIZE (kibana-7.9.3-darwin-x86_64.tar.gz) = 304299677	3	SIZE (kibana-7.10.0-darwin-x86_64.tar.gz) = 260667041




#!/bin/sh
#
# $FreeBSD$
#

# PROVIDE: kibana
# REQUIRE: DAEMON
# KEYWORD: shutdown

. /etc/rc.subr

name=kibana
rcvar=kibana_enable

load_rc_config $name

: ${kibana_enable:="NO"}
: ${kibana_config:="%%ETCDIR%%/kibana.yml"}
: ${kibana_user:="www"}
: ${kibana_group:="www"}
: ${kibana_log:="/var/log/kibana.log"}

export BABEL_DISABLE_CACHE=1
export NODE_ENV=production
# ml and reporting modules not supported on FreeBSD
export XPACK_ML_ENABLED=false
export XPACK_REPORTING_ENABLED=false

required_files="${kibana_config}"
pidfile="/var/run/${name}/${name}.pid"
start_precmd="kibana_precmd"
procname="%%LOCALBASE%%/bin/node"
command="/usr/sbin/daemon"
command_args="-f -p ${pidfile} ${procname} --no-warnings %%WWWDIR%%/src/cli/dist serve --config ${kibana_config} --log-file ${kibana_log}"

kibana_precmd()
{
	if [ ! -d $(dirname ${pidfile}) ]; then
		install -d -o ${kibana_user} -g ${kibana_group} $(dirname ${pidfile})
	fi

	if [ ! -f ${kibana_log} ]; then
		install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}
	fi

	if [ ! -d %%WWWDIR%%/optimize ]; then
		install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize
	else
		# We may have installed a plugin as root which will cause files in here
		# to be owned by root:wheel. Fix with a chown.
		chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize
	fi
}

run_rc_command "$1"




--- src/setup_node_env/node_version_validator.js.orig	2020-11-15 15:12:50 UTC
+++ src/setup_node_env/node_version_validator.js
@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This
 var currentVersion = process && process.version || null;
 var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
 var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
 
 if (!isVersionValid) {
-  var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
+  var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
 
   console.error(errorMessage);
   process.exit(1);
-}
\ No newline at end of file
+}

Removed Link Here

(-)a/textproc/kibana7/files/patch-src_setup__node__env_prebuilt__dev__only__entry.js (-9 lines)
1	--- src/setup_node_env/prebuilt_dev_only_entry.js.orig 2020-08-22 12:22:07 UTC
2	+++ src/setup_node_env/prebuilt_dev_only_entry.js
3	@@ -28,4 +28,4 @@ require('symbol-observable');
4
5	require('./root');
6
7	-require('./node_version_validator');
8	\ No newline at end of file
9	+//require('./node_version_validator');

Return to bug 251494

Lines 1-47 Link Here

(-)b/textproc/kibana7/Makefile (-1 / +2 lines)
1	# Created by: Tom Judge <tj@FreeBSD.org>	1	# Created by: Tom Judge <tj@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= kibana	4	PORTNAME= kibana
5	PORTVERSION= 7.9.3	5	PORTVERSION= 7.10.0
6	DISTVERSIONSUFFIX= -darwin-x86_64	6	DISTVERSIONSUFFIX= -darwin-x86_64
		7	PORTREVISION= 1
7	CATEGORIES= textproc www	8	CATEGORIES= textproc www
8	MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \	9	MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \
9	http://artifacts.elastic.co/downloads/kibana/	10	http://artifacts.elastic.co/downloads/kibana/
10	PKGNAMESUFFIX?= 7	11	PKGNAMESUFFIX?= 7
11		12
12	MAINTAINER= elastic@FreeBSD.org	13	MAINTAINER= elastic@FreeBSD.org
13	COMMENT= Browser based analytics and search interface to ElasticSearch	14	COMMENT= Browser based analytics and search interface to ElasticSearch
14		15
15	LICENSE= APACHE20	16	LICENSE= APACHE20
16		17
17	RUN_DEPENDS= node10>=10.21.0:www/node10	18	RUN_DEPENDS= node10>=10.21.0:www/node10
18		19
19	CONFLICTS= kibana[6]*	20	CONFLICTS= kibana[6]*
20		21
21	NO_BUILD= yes	22	NO_BUILD= yes
22	WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}	23	WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
23	USE_RC_SUBR= ${PORTNAME}	24	USE_RC_SUBR= ${PORTNAME}
24		25
25	SUB_FILES= pkg-deinstall	26	SUB_FILES= pkg-deinstall
26	SUB_LIST+= PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX}	27	SUB_LIST+= PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX}
27		28
28	post-patch:	29	post-patch:
29	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete	30	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
30		31
31	do-install:	32	do-install:
32	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}	33	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
33	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample	34	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
34	(cd ${WRKSRC} && \	35	(cd ${WRKSRC} && \
35	${RM} -r config node optimize && \	36	${RM} -r config node optimize && \
36	${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \	37	${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \
37	${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})	38	${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
38	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config	39	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config
39		40
40	post-install:	41	post-install:
41	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}	42	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
42	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d \| ${SORT} \| \	43	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d \| ${SORT} \| \
43	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}	44	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
44	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}	45	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
45	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}	46	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
46		47
47	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Lines 1-55 Link Here

(-)b/textproc/kibana7/files/kibana.in (-1 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $FreeBSD$	3	# $FreeBSD$
4	#	4	#
5		5
6	# PROVIDE: kibana	6	# PROVIDE: kibana
7	# REQUIRE: DAEMON	7	# REQUIRE: DAEMON
8	# KEYWORD: shutdown	8	# KEYWORD: shutdown
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11
12	name=kibana	12	name=kibana
13	rcvar=kibana_enable	13	rcvar=kibana_enable
14		14
15	load_rc_config $name	15	load_rc_config $name
16		16
17	: ${kibana_enable:="NO"}	17	: ${kibana_enable:="NO"}
18	: ${kibana_config:="%%ETCDIR%%/kibana.yml"}	18	: ${kibana_config:="%%ETCDIR%%/kibana.yml"}
19	: ${kibana_user:="www"}	19	: ${kibana_user:="www"}
20	: ${kibana_group:="www"}	20	: ${kibana_group:="www"}
21	: ${kibana_log:="/var/log/kibana.log"}	21	: ${kibana_log:="/var/log/kibana.log"}
22		22
23	export BABEL_DISABLE_CACHE=1	23	export BABEL_DISABLE_CACHE=1
24	export NODE_ENV=production	24	export NODE_ENV=production
25	# ml and reporting modules not supported on FreeBSD	25	# ml and reporting modules not supported on FreeBSD
26	export XPACK_ML_ENABLED=false	26	export XPACK_ML_ENABLED=false
27	export XPACK_REPORTING_ENABLED=false	27	export XPACK_REPORTING_ENABLED=false
28		28
29	required_files="${kibana_config}"	29	required_files="${kibana_config}"
30	pidfile="/var/run/${name}/${name}.pid"	30	pidfile="/var/run/${name}/${name}.pid"
31	start_precmd="kibana_precmd"	31	start_precmd="kibana_precmd"
32	procname="%%LOCALBASE%%/bin/node"	32	procname="%%LOCALBASE%%/bin/node"
33	command="/usr/sbin/daemon"	33	command="/usr/sbin/daemon"
34	command_args="-f -p ${pidfile} ${procname} --no-warnings %%WWWDIR%%/src/cli serve --config ${kibana_config} --log-file ${kibana_log}"	34	command_args="-f -p ${pidfile} ${procname} --no-warnings %%WWWDIR%%/src/cli/dist serve --config ${kibana_config} --log-file ${kibana_log}"
35		35
36	kibana_precmd()	36	kibana_precmd()
37	{	37	{
38	if [ ! -d $(dirname ${pidfile}) ]; then	38	if [ ! -d $(dirname ${pidfile}) ]; then
39	install -d -o ${kibana_user} -g ${kibana_group} $(dirname ${pidfile})	39	install -d -o ${kibana_user} -g ${kibana_group} $(dirname ${pidfile})
40	fi	40	fi
41		41
42	if [ ! -f ${kibana_log} ]; then	42	if [ ! -f ${kibana_log} ]; then
43	install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}	43	install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}
44	fi	44	fi
45		45
46	if [ ! -d %%WWWDIR%%/optimize ]; then	46	if [ ! -d %%WWWDIR%%/optimize ]; then
47	install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize	47	install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize
48	else	48	else
49	# We may have installed a plugin as root which will cause files in here	49	# We may have installed a plugin as root which will cause files in here
50	# to be owned by root:wheel. Fix with a chown.	50	# to be owned by root:wheel. Fix with a chown.
51	chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize	51	chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize
52	fi	52	fi
53	}	53	}
54		54
55	run_rc_command "$1"	55	run_rc_command "$1"

Lines 1-18 Link Here

(-)b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js (-3 / +3 lines)
1	--- src/setup_node_env/node_version_validator.js.orig 2020-04-25 11:11:41.868361000 -0700	1	--- src/setup_node_env/node_version_validator.js.orig 2020-11-15 15:12:50 UTC
2	+++ src/setup_node_env/node_version_validator.js 2020-04-25 11:13:08.195399000 -0700	2	+++ src/setup_node_env/node_version_validator.js
3	@@ -25,11 +25,11 @@	3	@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This
4	var currentVersion = process && process.version \|\| null;	4	var currentVersion = process && process.version \|\| null;
5	var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node \|\| null;	5	var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node \|\| null;
6	var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;	6	var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
7	-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.	7	-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
8	+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.	8	+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
9		9
10	if (!isVersionValid) {	10	if (!isVersionValid) {
11	- var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.	11	- var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
12	+ var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.	12	+ var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
13		13
14	console.error(errorMessage);	14	console.error(errorMessage);
15	process.exit(1);	15	process.exit(1);
16	-}	16	-}
17	\ No newline at end of file	17	\ No newline at end of file
18	+}	18	+}