Attachment 220118 Details for Bug 251494 – textproc/kibana7: Updated rc.d script to reflect the actual path needed

[patch] textproc/kibana7: Updated rc.d script to reflect the actual path needed

textproc_kibana7-7.10.0_1.diff (text/plain), 6.45 KB, created by Juraj Lutter on 2020-11-30 21:33:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juraj Lutter

Created: 2020-11-30 21:33:54 UTC

Size: 6.45 KB

patch

obsolete

>diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile
>index a1fafb148456..024e93723a84 100644
>--- a/textproc/kibana7/Makefile
>+++ b/textproc/kibana7/Makefile
>@@ -1,47 +1,48 @@
> # Created by: Tom Judge <tj@FreeBSD.org>
> # $FreeBSD$
> 
> PORTNAME=	kibana
>-PORTVERSION=	7.9.3
>+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>
>diff --git a/textproc/kibana7/distinfo b/textproc/kibana7/distinfo
>index 5f75a6acbe32..2f1cce641159 100644
>--- a/textproc/kibana7/distinfo
>+++ b/textproc/kibana7/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1603571985
>-SHA256 (kibana-7.9.3-darwin-x86_64.tar.gz) = 44c94470012580e0f29a4291d2c2210acaf4090d618db777e3ab079012948961
>-SIZE (kibana-7.9.3-darwin-x86_64.tar.gz) = 304299677
>+TIMESTAMP = 1605452222
>+SHA256 (kibana-7.10.0-darwin-x86_64.tar.gz) = 9241d69f4543ed3837e2d53c37db8d45aa1b6df8d08f7cf6509c061f4b8f24fc
>+SIZE (kibana-7.10.0-darwin-x86_64.tar.gz) = 260667041
>diff --git a/textproc/kibana7/files/kibana.in b/textproc/kibana7/files/kibana.in
>index 1fbc91725ac3..3842c5fe5f9e 100644
>--- a/textproc/kibana7/files/kibana.in
>+++ b/textproc/kibana7/files/kibana.in
>@@ -1,55 +1,55 @@
> #!/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 serve --config ${kibana_config} --log-file ${kibana_log}"
>+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"
>diff --git a/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js
>index 045a0f2c2580..b92478b5acc4 100644
>--- a/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js
>+++ b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js
>@@ -1,18 +1,18 @@
>---- src/setup_node_env/node_version_validator.js.orig	2020-04-25 11:11:41.868361000 -0700
>-+++ src/setup_node_env/node_version_validator.js	2020-04-25 11:13:08.195399000 -0700
>-@@ -25,11 +25,11 @@
>+--- 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
> +}
>diff --git a/textproc/kibana7/files/patch-src_setup__node__env_prebuilt__dev__only__entry.js b/textproc/kibana7/files/patch-src_setup__node__env_prebuilt__dev__only__entry.js
>deleted file mode 100644
>index f001a9ab3aa7..000000000000
>--- a/textproc/kibana7/files/patch-src_setup__node__env_prebuilt__dev__only__entry.js
>+++ /dev/null
>@@ -1,9 +0,0 @@
>---- src/setup_node_env/prebuilt_dev_only_entry.js.orig	2020-08-22 12:22:07 UTC
>-+++ src/setup_node_env/prebuilt_dev_only_entry.js
>-@@ -28,4 +28,4 @@ require('symbol-observable');
>- 
>- require('./root');
>- 
>--require('./node_version_validator');
>-\ No newline at end of file
>-+//require('./node_version_validator');

Flags:

otis: maintainer-approval+

Actions: View | Diff

Attachments on bug 251494: 220117 | 220118 | 220137