Attachment #219941 for bug #251353

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




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

PORTNAME=	kibana
PORTVERSION=	7.10.0
DISTVERSIONSUFFIX=	-darwin-x86_64
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




--- 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 251353

Lines 1-47 Link Here

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

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	+}