diff --git a/textproc/opensearch-dashboards13/Makefile b/textproc/opensearch-dashboards13/Makefile index ba1474e2557b..c71f65032d29 100644 --- a/textproc/opensearch-dashboards13/Makefile +++ b/textproc/opensearch-dashboards13/Makefile @@ -1,82 +1,83 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 1.3.6 +DISTVERSION= 1.3.9 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ PKGNAMESUFFIX= 13 MAINTAINER= opensearch@FreeBSD.org COMMENT?= Visualization dashboards for OpenSearch WWW= https://opensearch.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= npm-node14>0:www/npm-node14 CONFLICTS= opensearch-dashboards USES= nodejs:14,build,run python:build USE_RC_SUBR= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= CHROME CHROME_DESC= Add dependency on www/chromium (required for PDF reports) CHROME_RUN_DEPENDS=chrome:www/chromium +NODE_VER= 14.21.1 + _DEVDIR= ${WRKDIR}/.devdir post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \ ${WRKSRC}/bin/opensearch-dashboards \ ${WRKSRC}/bin/opensearch-dashboards-keystore \ ${WRKSRC}/bin/opensearch-dashboards-plugin \ - ${WRKSRC}/node_modules/re2/binding.gyp \ - ${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js + ${WRKSRC}/node_modules/re2/binding.gyp + @${REINPLACE_CMD} -e 's|10.24.1|${NODE_VER}|g' ${WRKSRC}/package.json ${RM} \ ${WRKSRC}/bin/*.orig \ ${WRKSRC}/bin/*.bak \ ${WRKSRC}/node_modules/re2/binding.gyp.orig \ ${WRKSRC}/node_modules/re2/binding.gyp.bak \ - ${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js.orig \ - ${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js.bak + ${WRKSRC}/package.json.bak ${RM} -r ${WRKSRC}/plugins/reportsDashboards/.chromium do-configure: (cd ${WRKSRC}/node_modules/re2 && \ ${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \ ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \ --python=${PYTHON_CMD} \ --nodedir ${LOCALBASE} \ --devdir=${_DEVDIR}) do-build: (cd ${WRKSRC}/node_modules/re2 && \ ${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \ ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \ --devdir=${_DEVDIR}) ${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \ ${WRKSRC}/node_modules/re2/build/Release/obj.target do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/opensearch_dashboards.yml ${STAGEDIR}${ETCDIR}/opensearch_dashboards.yml.sample (cd ${WRKSRC} && \ ${COPYTREE_SHARE} "data node_modules package.json plugins src" ${STAGEDIR}${WWWDIR} && \ ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}) ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node post-install: ${ECHO} "@sample ${ETCDIR}/opensearch_dashboards.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/reportsDashboards/node_modules/set-interval-async/test/resources/legacy" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/dynamic" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/dynamic" >> ${TMPPLIST} .include diff --git a/textproc/opensearch-dashboards13/distinfo b/textproc/opensearch-dashboards13/distinfo index c059c4acdffb..bdbafbc80015 100644 --- a/textproc/opensearch-dashboards13/distinfo +++ b/textproc/opensearch-dashboards13/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670368957 -SHA256 (opensearch-dashboards-1.3.6-linux-x64.tar.gz) = 4b0cd477fdcbbd54d835d2f60412ea1946eca0c9c1029397139e5852d98d684d -SIZE (opensearch-dashboards-1.3.6-linux-x64.tar.gz) = 250723484 +TIMESTAMP = 1681596241 +SHA256 (opensearch-dashboards-1.3.9-linux-x64.tar.gz) = 31069fc9f4eb19e4c2335c41e31c92d93c71885a900362f93f388d7be0afc6d5 +SIZE (opensearch-dashboards-1.3.9-linux-x64.tar.gz) = 164764900 diff --git a/textproc/opensearch-dashboards13/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js b/textproc/opensearch-dashboards13/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js deleted file mode 100644 index 20519110401b..000000000000 --- a/textproc/opensearch-dashboards13/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/reportsDashboards/server/routes/utils/constants.js.orig 2022-06-30 21:47:37 UTC -+++ plugins/reportsDashboards/server/routes/utils/constants.js -@@ -138,7 +138,7 @@ const replaceBlockedKeywords = htmlString => { - }; - - exports.replaceBlockedKeywords = replaceBlockedKeywords; --const CHROMIUM_PATH = `${__dirname}/../../../.chromium/headless_shell`; -+const CHROMIUM_PATH = `%%LOCALBASE%%/bin/chrome`; - /** - * Metric constants - */ diff --git a/textproc/opensearch13/Makefile b/textproc/opensearch13/Makefile index 85edb72ba84f..288982aab1ca 100644 --- a/textproc/opensearch13/Makefile +++ b/textproc/opensearch13/Makefile @@ -1,112 +1,112 @@ PORTNAME= opensearch -DISTVERSION= 1.3.6 +DISTVERSION= 1.3.9 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ PKGNAMESUFFIX= 13 MAINTAINER= opensearch@FreeBSD.org COMMENT?= Full-text search engine for Java WWW= https://opensearch.org LICENSE= APACHE20 BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna CONFLICTS= opensearch USES= cpe shebangfix USE_JAVA= yes JAVA_VERSION= 11+ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/opensearch bin/opensearch-cli \ bin/opensearch-env bin/opensearch-env-from-file \ bin/opensearch-keystore bin/opensearch-node \ bin/opensearch-plugin bin/opensearch-shard \ plugins/opensearch-security/tools/audit_config_migrater.sh \ plugins/opensearch-security/tools/hash.sh \ plugins/opensearch-security/tools/install_demo_configuration.sh \ plugins/opensearch-security/tools/securityadmin.sh NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= PLUGINS OPTIONS_DEFAULT=PLUGINS .include CONFIG_FILES= opensearch.yml jvm.options log4j2.properties PLUGINS_CONFIG_FILES?= \ opensearch-observability/observability.yml \ opensearch-performance-analyzer/agent-stats-metadata \ opensearch-performance-analyzer/log4j2.xml \ opensearch-performance-analyzer/opensearch_security.policy \ opensearch-performance-analyzer/performance-analyzer.properties \ opensearch-performance-analyzer/plugin-stats-metadata \ opensearch-performance-analyzer/rca.conf \ opensearch-performance-analyzer/rca_idle_master.conf \ opensearch-performance-analyzer/rca_master.conf \ opensearch-performance-analyzer/supervisord.conf \ opensearch-reports-scheduler/reports-scheduler.yml \ BINS= opensearch opensearch-cli opensearch-env \ opensearch-env-from-file opensearch-keystore \ opensearch-node opensearch-plugin \ opensearch-shard SEARCHUSER?= opensearch SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} SUB_FILES= pkg-message SUB_LIST= ETCDIR=${ETCDIR} \ JAVA_HOME=${JAVA_HOME} post-patch: ${RM} ${WRKSRC}/lib/jna-*.jar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/opensearch .for f in ${CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/bin .for f in ${BINS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/opensearch/bin .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/lib (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "lib modules" ${STAGEDIR}${PREFIX}/lib/opensearch/) ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/opensearch ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/opensearch/config ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/opensearch/lib/jna.jar do-install-PLUGINS-on: ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-notifications-core \ ${STAGEDIR}${ETCDIR}/opensearch-notifications \ ${STAGEDIR}${ETCDIR}/opensearch-observability \ ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer \ ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler .for f in ${PLUGINS_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample ${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "plugins" ${STAGEDIR}${PREFIX}/lib/opensearch/) (cd ${WRKSRC}/plugins/opensearch-security/tools && ${COPYTREE_BIN} "*.sh" ${STAGEDIR}${PREFIX}/lib/opensearch/plugins/opensearch-security/tools) post-install: .for f in ${CONFIG_FILES} ${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/lib/opensearch -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir lib/opensearch/plugins" >> ${TMPPLIST} ${ECHO} "@dir libexec/opensearch" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0755) ${ETCDIR}" >> ${TMPPLIST} .include diff --git a/textproc/opensearch13/distinfo b/textproc/opensearch13/distinfo index ce98a5e2c7ea..0569e3c2bee0 100644 --- a/textproc/opensearch13/distinfo +++ b/textproc/opensearch13/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670283394 -SHA256 (opensearch-1.3.6-linux-x64.tar.gz) = 0784cc05ec03dc9cac17dca923272ae08ebc9a43fbbbb61397024f1c90cdb024 -SIZE (opensearch-1.3.6-linux-x64.tar.gz) = 421906066 +TIMESTAMP = 1681596190 +SHA256 (opensearch-1.3.9-linux-x64.tar.gz) = cc8f086578e38d5998da015f9b89061c3c2e08962643b7e6eb28f3f25716a9be +SIZE (opensearch-1.3.9-linux-x64.tar.gz) = 423200993