diff --git a/textproc/kibana91/Makefile b/textproc/kibana91/Makefile index 2ca998315e59..e3faed354a42 100644 --- a/textproc/kibana91/Makefile +++ b/textproc/kibana91/Makefile @@ -1,159 +1,159 @@ PORTNAME= kibana -DISTVERSION= 8.19.12 +DISTVERSION= 9.1.10 DISTVERSIONSUFFIX= -linux-x86_64 -PORTREVISION= 2 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ LOCAL/vvd/elastic -PKGNAMESUFFIX= 8 +PKGNAMESUFFIX= 91 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= elastic@FreeBSD.org -COMMENT= Browser-based analytics and search interface to Elasticsearch (${DISTVERSION:R:R}.x version) +COMMENT= Browser-based analytics and search interface to Elasticsearch (${DISTVERSION:R}.x version) WWW= https://www.elastic.co/products/kibana LICENSE= APACHE20 BUILD_DEPENDS= npm-node${NODEJS_VERSION}>=11.10.0:www/npm-node${NODEJS_VERSION} LIB_DEPENDS= libre2.so:devel/re2 \ libuv.so:devel/libuv USES= compiler:c++17-lang cpe nodejs:24,build,run python:build CPE_VENDOR= elastic USE_CXXSTD= c++17 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= ${PORTNAME}9* +CONFLICTS= ${PORTNAME}8 ${PORTNAME}92 ${PORTNAME}93 WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} -PORTSCOUT= limit:^8 +PORTSCOUT= limit:^9\.1\. SUB_FILES= pkg-deinstall pkg-message SUB_LIST= BINDIR=${PREFIX}/bin \ PKGNAMESUFFIX=${PKGNAMESUFFIX} \ PORTNAME=${PORTNAME} \ KIBANAUSER=${KIBANAUSER} \ KIBANAGROUP=${KIBANAGROUP} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} KIBANAUSER?= www KIBANAGROUP?= ${KIBANAUSER} .if ${KIBANAUSER} == www USERS= ${KIBANAUSER} .endif .if ${KIBANAGROUP} == www GROUPS= ${KIBANAGROUP} .endif BINS= kibana-encryption-keys kibana-health-gateway kibana-keystore \ kibana-plugin kibana-setup kibana-verification-code ####################################################################### # Set node-nan version here _NODE_NAN_VER= 2.25.0 # Set node-re version here _NODE_RE2_VER= 1.23.3 ####################################################################### _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 # Directories to prune _DIR2DEL= node_modules post-patch: .for _dirdel in ${_DIR2DEL} ${FIND} -s ${WRKSRC}/${_dirdel} -type d -empty -delete .endfor ${REINPLACE_CMD} -e "s|%%WWWDIR%%|${WWWDIR}|g" \ ${WRKSRC}/config/kibana.yml 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} "10" > ${_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/node_modules/.bin/node-gyp configure \ --python=${PYTHON_CMD} \ --nodedir=${LOCALBASE} \ --devdir=${_DEVDIR}) do-build: (cd ${_RE2DIR} && \ ${SETENV} HOME=${WRKDIR} \ ${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp build \ --devdir=${_DEVDIR}) do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample ${INSTALL_DATA} ${WRKSRC}/config/node.options ${STAGEDIR}${ETCDIR}/node.options.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/glibc-217/bin ${LN} -s ${LOCALBASE}/bin/node ${STAGEDIR}${WWWDIR}/node/glibc-217/bin/node ${RM} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node ${MKDIR} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release ${INSTALL_LIB} ${_RE2DIR}/build/Release/re2.node \ ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node .for f in ${BINS} ${RLN} ${STAGEDIR}${WWWDIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} ${ECHO} "bin/${f}" >> ${TMPPLIST} .endfor post-install: ${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/node.options.sample" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(${KIBANAUSER},${KIBANAGROUP}) ${WWWDIR}/data" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/logs" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/private/analytics" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/private/kbn-reporting" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/private/shared-ux/page" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/content-management" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/kbn-management/settings" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/react" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/serverless" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/shared-ux/card" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/shared-ux/file" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/shared-ux/link" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/shared-ux/page" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/packages/shared/shared-ux/prompt" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/plugins/private" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/platform/plugins/shared" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/x-pack/platform/packages/private" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/x-pack/platform/packages/shared" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/x-pack/platform/plugins/private" >> ${TMPPLIST} + ${ECHO} "@dir ${WWWDIR}/x-pack/solutions/chat" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/x-pack/solutions/observability/packages" >> ${TMPPLIST} - ${ECHO} "@dir ${WWWDIR}/x-pack/solutions/search/plugins" >> ${TMPPLIST} + ${ECHO} "@dir ${WWWDIR}/x-pack/solutions/search" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/x-pack/solutions/security/packages" >> ${TMPPLIST} .include diff --git a/textproc/kibana91/distinfo b/textproc/kibana91/distinfo index a2d61e8c8529..2eacac5fa546 100644 --- a/textproc/kibana91/distinfo +++ b/textproc/kibana91/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1773083564 -SHA256 (kibana-8.19.12-linux-x86_64.tar.gz) = 1e68ef90d8e763473c77cbf4fcce8605c7e7b6b619d1eb6047d2047e3ed9d422 -SIZE (kibana-8.19.12-linux-x86_64.tar.gz) = 383085746 +TIMESTAMP = 1773434343 +SHA256 (kibana-9.1.10-linux-x86_64.tar.gz) = 1d226dbfcbd01360360d93dd671f8b57fd6def47a425dc72c2e8095aa4df754f +SIZE (kibana-9.1.10-linux-x86_64.tar.gz) = 362033041 SHA256 (nodejs-nan-v2.25.0_GH0.tar.gz) = 26c710caffec40676e48af09680d7b6131103a9a7e56f7522cc2edfe70cda33d SIZE (nodejs-nan-v2.25.0_GH0.tar.gz) = 111978 SHA256 (uhop-node-re2-1.23.3_GH0.tar.gz) = 0037a38f6f58247af93a1f7327cd4d9e0a13a55dc54722d8ab697b8c134865e2 SIZE (uhop-node-re2-1.23.3_GH0.tar.gz) = 53397 diff --git a/textproc/kibana91/files/patch-config_kibana.yml b/textproc/kibana91/files/patch-config_kibana.yml index cb9644cbe50d..89e58747ea16 100644 --- a/textproc/kibana91/files/patch-config_kibana.yml +++ b/textproc/kibana91/files/patch-config_kibana.yml @@ -1,15 +1,15 @@ ---- config/kibana.yml.orig 2026-02-24 03:27:05 UTC +--- config/kibana.yml.orig 2026-01-08 12:19:39 UTC +++ config/kibana.yml @@ -139,10 +139,10 @@ # =================== System: Other =================== # The path where Kibana stores persistent data not saved in Elasticsearch. Defaults to data -#path.data: data +path.data: %%WWWDIR%%/data # Specifies the path where Kibana creates the process ID file. -#pid.file: /run/kibana/kibana.pid +pid.file: /var/run/kibana/kibana.pid # Set the interval in milliseconds to sample system and process performance # metrics. Minimum is 100ms. Defaults to 5000ms. diff --git a/textproc/kibana91/files/patch-config_node.options b/textproc/kibana91/files/patch-config_node.options index 33a1ce36a0f2..8cd817985de6 100644 --- a/textproc/kibana91/files/patch-config_node.options +++ b/textproc/kibana91/files/patch-config_node.options @@ -1,17 +1,11 @@ ---- config/node.options.orig 2026-02-24 03:27:05 UTC +--- config/node.options.orig 2026-01-08 12:19:39 UTC +++ config/node.options -@@ -6,13 +6,10 @@ +@@ -6,7 +6,7 @@ #--max-old-space-size=4096 ## do not terminate process on unhandled promise rejection - --unhandled-rejections=warn +--unhandled-rejections=warn ## restore < Node 16 default DNS lookup behavior --dns-result-order=ipv4first -- --## enable OpenSSL 3 legacy provider ----openssl-legacy-provider - - ## disable ES modules until stable - --no-experimental-require-module diff --git a/textproc/kibana91/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js b/textproc/kibana91/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js index 11ff8ab0e843..5b55a73d7d20 100644 --- a/textproc/kibana91/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js +++ b/textproc/kibana91/files/patch-node__modules__kbn_setup-node-env_node__version__validator.js @@ -1,16 +1,16 @@ ---- node_modules/@kbn/setup-node-env/node_version_validator.js.orig 2026-02-24 03:27:07 UTC +--- node_modules/@kbn/setup-node-env/node_version_validator.js.orig 2026-01-08 12:19:41 UTC +++ node_modules/@kbn/setup-node-env/node_version_validator.js @@ -21,11 +21,11 @@ var requiredVersion = rawRequiredVersion ? 'v' + rawRe 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; +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 + '.'; + 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); diff --git a/textproc/kibana91/pkg-descr b/textproc/kibana91/pkg-descr index ce4c53bd1781..7e4994744079 100644 --- a/textproc/kibana91/pkg-descr +++ b/textproc/kibana91/pkg-descr @@ -1,6 +1,6 @@ Kibana is an open source (Apache Licensed) browser-based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch. -Kibana 8.x is compatible with Elasticsearch 8.x +Kibana 9.1.x is compatible with Elasticsearch 9.1.x