diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile index 833d77bebd89..26aee1ed15e4 100644 --- a/textproc/kibana8/Makefile +++ b/textproc/kibana8/Makefile @@ -1,118 +1,118 @@ PORTNAME= kibana -DISTVERSION= 8.5.3 +DISTVERSION= 8.6.0 DISTVERSIONSUFFIX= -darwin-x86_64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ PKGNAMESUFFIX= 8 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= elastic@FreeBSD.org COMMENT= Browser based analytics and search interface to ElasticSearch WWW= https://www.elastic.co/products/kibana LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/bin/npm:www/npm-node16 LIB_DEPENDS= libre2.so:devel/re2 \ libuv.so:devel/libuv RUN_DEPENDS= ${LOCALBASE}/bin/node:www/node16 USES= compiler:c++14-lang cpe nodejs:16,build,run python:build CPE_VENDOR= elastic USE_GITHUB= nodefault GH_TUPLE= nodejs:nan:v${_NODE_NAN_VER}:node_nan \ uhop:node-re2:${_NODE_RE2_VER}:node_re2 USE_RC_SUBR= ${PORTNAME} CONFLICTS= kibana7 WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} PORTSCOUT= limit:^8 SUB_FILES= pkg-deinstall pkg-message SUB_LIST+= BINDIR=${PREFIX}/bin \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ PORTNAME=${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} BINS= kibana-encryption-keys kibana-keystore kibana-plugin \ kibana-setup kibana-verification-code ####################################################################### # Set node-nan version here _NODE_NAN_VER= 2.17.0 # Set node-re version here -_NODE_RE2_VER= 1.17.8 +_NODE_RE2_VER= 1.18.0 ####################################################################### _NODECMD= ${LOCALBASE}/bin/node --version _DEVDIR:= ${WRKDIR}/.devdir _RE2DIR= ${WRKDIR}/node-re2-${_NODE_RE2_VER} # Extra patch files must be updated whenever node-re2 changes _RE2PATCHES= ${PATCHDIR}/extra-node-re2-binding-gyp.patch post-patch: ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES} ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp \ pre-configure: ( \ _NODEVER=$$(${_NODECMD} | ${SED} -n 's|^v\(.*\)|\1|p') && \ ${MKDIR} ${_DEVDIR}/$${_NODEVER}/include && \ ${RLN} ${LOCALBASE}/include/node ${_DEVDIR}/$${_NODEVER}/include/node && \ ${ECHO} "9" > ${_DEVDIR}/$${_NODEVER}/installVersion \ ) do-configure: ${MKDIR} ${_DEVDIR}/nan (cd ${WRKDIR}/nan-${_NODE_NAN_VER} && ${COPYTREE_SHARE} . \ ${_DEVDIR}/nan \ "! ( -name \.* -or -path *\/test\/* -or -name test )") (cd ${_RE2DIR} && \ ${SETENV} HOME=${WRKDIR} \ ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \ --python=${PYTHON_CMD} \ --devdir=${_DEVDIR}) do-build: (cd ${_RE2DIR} && \ ${SETENV} HOME=${WRKDIR} \ ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \ --devdir=${_DEVDIR}) 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 ${MKDIR} ${STAGEDIR}${WWWDIR}/node/bin ${LN} -s ${LOCALBASE}/bin/node ${STAGEDIR}${WWWDIR}/node/bin/node ${RM} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node ${INSTALL_LIB} ${_RE2DIR}/build/Release/re2.node \ ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node .for f in ${BINS} ${INSTALL} -l rs ${STAGEDIR}${WWWDIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} ${ECHO} "bin/${f}" >> ${TMPPLIST} .endfor 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} ${ECHO} "@dir ${WWWDIR}/logs" >> ${TMPPLIST} .include diff --git a/textproc/kibana8/distinfo b/textproc/kibana8/distinfo index 0c43143e6786..c7e906fffcdf 100644 --- a/textproc/kibana8/distinfo +++ b/textproc/kibana8/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1670966063 -SHA256 (kibana-8.5.3-darwin-x86_64.tar.gz) = 5df94f135e6b25fbce02618914544b18d1193e6e71a6daa8281afded896f8bb3 -SIZE (kibana-8.5.3-darwin-x86_64.tar.gz) = 150367363 +TIMESTAMP = 1673471563 +SHA256 (kibana-8.6.0-darwin-x86_64.tar.gz) = 82d0dc9f9bba0df0554e377b46a895ae1aec61a626b845173e1c5ace885754c4 +SIZE (kibana-8.6.0-darwin-x86_64.tar.gz) = 152583948 SHA256 (nodejs-nan-v2.17.0_GH0.tar.gz) = bcf5dfe59c26377b2096d903ecf6c2dbdae92528b1373a0565c40fe07537610d SIZE (nodejs-nan-v2.17.0_GH0.tar.gz) = 179443 -SHA256 (uhop-node-re2-1.17.8_GH0.tar.gz) = 4cf8c52cd92ae26eff9b26a9a213ea25eb97fbe381da2a5755c6ea8015ee347f -SIZE (uhop-node-re2-1.17.8_GH0.tar.gz) = 41523 +SHA256 (uhop-node-re2-1.18.0_GH0.tar.gz) = 1a756518dc35ee07318e414338afaa8186c03d5929a609c51259d978359ee6b8 +SIZE (uhop-node-re2-1.18.0_GH0.tar.gz) = 51921 diff --git a/textproc/kibana8/files/patch-config_kibana.yml b/textproc/kibana8/files/patch-config_kibana.yml index 9fd5b414496c..c5420a65b3ad 100644 --- a/textproc/kibana8/files/patch-config_kibana.yml +++ b/textproc/kibana8/files/patch-config_kibana.yml @@ -1,11 +1,11 @@ ---- config/kibana.yml.orig 2021-10-26 12:51:47 UTC +--- config/kibana.yml.orig 2023-01-04 12:19:12 UTC +++ config/kibana.yml -@@ -91,7 +91,7 @@ - #elasticsearch.logQueries: false +@@ -125,7 +125,7 @@ + #path.data: data # Specifies the path where Kibana creates the process ID file. -#pid.file: /run/kibana/kibana.pid +pid.file: /var/run/kibana.pid - # Enables you to specify a file where Kibana stores log output. - #logging.dest: stdout + # Set the interval in milliseconds to sample system and process performance + # metrics. Minimum is 100ms. Defaults to 5000ms. diff --git a/textproc/kibana8/files/patch-src_setup__node__env_node__version__validator.js b/textproc/kibana8/files/patch-src_setup__node__env_node__version__validator.js index 1bf9870031e9..16b7d7ade89a 100644 --- a/textproc/kibana8/files/patch-src_setup__node__env_node__version__validator.js +++ b/textproc/kibana8/files/patch-src_setup__node__env_node__version__validator.js @@ -1,18 +1,20 @@ ---- src/setup_node_env/node_version_validator.js.orig 2021-10-07 21:19:53 UTC +--- src/setup_node_env/node_version_validator.js.orig 2023-01-04 12:19:12 UTC +++ src/setup_node_env/node_version_validator.js -@@ -14,11 +14,11 @@ var pkg = require('../../package.json'); // Note: This +@@ -15,13 +15,13 @@ var pkg = require('../../package.json'); 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. +-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; ++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. +- var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; ++ 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 +}