From nobody Sat Nov 26 21:04:04 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NKPNh3L61z4j4jZ; Sat, 26 Nov 2022 21:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NKPNh2tQ0z4Mbn; Sat, 26 Nov 2022 21:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669496644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x3jWSAWvMrGngxL3bO8bzCWBCTcQZkFF1OIZECa7WOM=; b=pc2yBWAWDKYkYb6OeUAADGSF49fbR4Bt0+G3G51qkGlGTMg4ejuH82watGRMFH/xC51NMe i/G/iXY6qmwdt1kUusAU3G6Sxqnq7xdMdi+5+THiy9gVd9SOxOYndIAcQntVXns/1TZdWJ nzAcDICg3WbqhKFV1oruPV/2RePq41WMIrhVrmvI3ZekPEy2PDTm26tJy64xvlteegX9bA +tYXvNUmiWvzoYahQjG3be6klVhUs2iWmilCu346OqRwWdsVzrVigBfzLrJ2wyqrTwKiol Y8zI9hdHqQ0WREWmDA8l9zBPK+zgdbz/+LQO2T7/ean5vofx2JhQGKr9vXDTww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669496644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x3jWSAWvMrGngxL3bO8bzCWBCTcQZkFF1OIZECa7WOM=; b=PSGJNfk5QTYfhEHyRSpDz1I0ei938y+VXyl5WFpWcEmo8c+CMVFY+eIkaaN7g7lEmHYSv5 6aGrZd64a8heQSi/D6HPwCfmVLOvRQvEPQ3YXQrSFfSLXi4/JIVfknM7e8FinluUdcgZP7 FezWKZhYYTaK9OxECsPXrkXmOVWzRMRqaCnTHnkfOIgau3yr+h9IHMomj1pGdj2EtUVlxs cnrK27Xrpu4XXcKNubA5M/92+tRqTjXo3pDuWvnfXJ+4Hmgujj/Rfr5lAyfA4sIldV9PVj 9BE5u6SNjgyI4/sMEvpBhdW1F1HMW/1AMdmjLhZ+L4ifxTy3I4b4KAC+gzeQyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669496644; a=rsa-sha256; cv=none; b=vdwMku0EUF5IroayeNAeG5Whb+SKLH6DIfiyJ2cvHU2c9npfwl2BVUCy/E/TESr3FSiRe3 WQDXfnW/G+yEeLk+Tc093UkbHEwftx0m7KFBfXMpM5fKQX/K2r1GW1Wk2Cbe97LcozHyda yK0xxcGGUHGVKVl+xWU/4EkKEKWnbVXi7v9+CTD2nHERSWxT52YvNcwuLCht3UjMHJjRxS UrSZY6WYKAcXEPDOk3vkkWfSzliK1P0snvdiddR/RWA+Asm5Ryd5RDcNRs/LK7g4SsqihG Gg8jcLHfvo+IOoDKWXSNIY+rt1m1+TbmD88wUtIeVJKRb5WphHhgaXBocFJkbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NKPNh1wJMzYKq; Sat, 26 Nov 2022 21:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AQL44A4005874; Sat, 26 Nov 2022 21:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AQL44dP005873; Sat, 26 Nov 2022 21:04:04 GMT (envelope-from git) Date: Sat, 26 Nov 2022 21:04:04 GMT Message-Id: <202211262104.2AQL44dP005873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 27c280e07686 - main - textproc/kibana8: Add new port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c280e07686be9ca08a1d2f8899c52777560684 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=27c280e07686be9ca08a1d2f8899c52777560684 commit 27c280e07686be9ca08a1d2f8899c52777560684 Author: Juraj Lutter AuthorDate: 2022-11-26 15:46:12 +0000 Commit: Juraj Lutter CommitDate: 2022-11-26 21:03:17 +0000 textproc/kibana8: Add new port Kibana is a visualisation tool for elasticsearch. --- UPDATING | 22 ++++ textproc/Makefile | 1 + textproc/kibana8/Makefile | 118 +++++++++++++++++++++ textproc/kibana8/distinfo | 7 ++ .../kibana8/files/extra-node-re2-binding-gyp.patch | 51 +++++++++ textproc/kibana8/files/kibana.in | 84 +++++++++++++++ textproc/kibana8/files/patch-config_kibana.yml | 11 ++ ...rc_setup__node__env_node__version__validator.js | 18 ++++ textproc/kibana8/files/pkg-deinstall.in | 20 ++++ textproc/kibana8/files/pkg-message.in | 9 ++ textproc/kibana8/pkg-descr | 6 ++ 11 files changed, 347 insertions(+) diff --git a/UPDATING b/UPDATING index e759bf0445f5..ceeb09a4fb81 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,28 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20221126: + AFFECTS: textproc/kibana8 + AUTHOR: otis@FreeBSD.org + + kibana8 now installs kibana-specific utilities into LOCALBASE/bin as symbolic + links. + + Please check whether it will overwrite your local files with names same as + these utilities and if so, please rename them or move out of the way in a + different manner. + +20221126: + AFFECTS: textproc/elasticsearch8 + AUTHOR: otis@FreeBSD.org + + elasticsearch8 now installs elasticsearch-specific utilities into + LOCALBASE/bin as symbolic links (i.e. elasticsearch-cli and similar). + + Please check whether it will overwrite your local files with names same + as these utilities and if so, please rename them or move out of the way + in a different manner. + 20221126: AFFECTS: users of lang/php80 AUTHOR: bofh@FreeBSD.org diff --git a/textproc/Makefile b/textproc/Makefile index 5c63ba34faa4..4b01a1cd4dd4 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -341,6 +341,7 @@ SUBDIR += kf5-sonnet SUBDIR += kf5-syntax-highlighting SUBDIR += kibana7 + SUBDIR += kibana8 SUBDIR += kiss-templates SUBDIR += kmfl-european-latin SUBDIR += kmfl-khmer diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile new file mode 100644 index 000000000000..eee28b4a18c7 --- /dev/null +++ b/textproc/kibana8/Makefile @@ -0,0 +1,118 @@ +PORTNAME= kibana +DISTVERSION= 8.5.2 +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 +####################################################################### + +_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 new file mode 100644 index 000000000000..f16b50637a35 --- /dev/null +++ b/textproc/kibana8/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1669456190 +SHA256 (kibana-8.5.2-darwin-x86_64.tar.gz) = d568576f7daac371aab10409381450cae27a919fc7aa613bac62b11f0a338030 +SIZE (kibana-8.5.2-darwin-x86_64.tar.gz) = 150384461 +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 diff --git a/textproc/kibana8/files/extra-node-re2-binding-gyp.patch b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch new file mode 100644 index 000000000000..ebab5accfed0 --- /dev/null +++ b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch @@ -0,0 +1,51 @@ +--- binding.gyp.orig 2021-05-10 04:34:55.000000000 +0200 ++++ binding.gyp 2021-07-05 19:22:23.670716000 +0200 +@@ -14,29 +14,6 @@ + "lib/to_string.cc", + "lib/accessors.cc", + "lib/util.cc", +- "vendor/re2/bitstate.cc", +- "vendor/re2/compile.cc", +- "vendor/re2/dfa.cc", +- "vendor/re2/filtered_re2.cc", +- "vendor/re2/mimics_pcre.cc", +- "vendor/re2/nfa.cc", +- "vendor/re2/onepass.cc", +- "vendor/re2/parse.cc", +- "vendor/re2/perl_groups.cc", +- "vendor/re2/prefilter.cc", +- "vendor/re2/prefilter_tree.cc", +- "vendor/re2/prog.cc", +- "vendor/re2/re2.cc", +- "vendor/re2/regexp.cc", +- "vendor/re2/set.cc", +- "vendor/re2/simplify.cc", +- "vendor/re2/stringpiece.cc", +- "vendor/re2/tostring.cc", +- "vendor/re2/unicode_casefold.cc", +- "vendor/re2/unicode_groups.cc", +- "vendor/util/pcre.cc", +- "vendor/util/rune.cc", +- "vendor/util/strutil.cc" + ], + "cflags": [ + "-std=c++14", +@@ -45,7 +22,7 @@ + "-Wno-sign-compare", + "-Wno-unused-parameter", + "-Wno-missing-field-initializers", +- "-Wno-cast-function-type", ++ "-Wno-bad-function-cast", + "-O3", + "-g" + ], +@@ -54,7 +31,8 @@ + "NOMINMAX" + ], + "include_dirs": [ +- "= 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/kibana8/files/pkg-deinstall.in b/textproc/kibana8/files/pkg-deinstall.in new file mode 100644 index 000000000000..0699ab559805 --- /dev/null +++ b/textproc/kibana8/files/pkg-deinstall.in @@ -0,0 +1,20 @@ +#!/bin/sh + +case "$2" in +POST-DEINSTALL) + if [ -d %%WWWDIR%%/optimize ]; then + /usr/bin/find %%WWWDIR%%/optimize/ -delete + fi + + cat <