diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile index 706beb573562..14e2255ba645 100644 --- a/textproc/opensearch-dashboards/Makefile +++ b/textproc/opensearch-dashboards/Makefile @@ -1,79 +1,77 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 2.7.0 +DISTVERSION= 2.8.0 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ MAINTAINER= opensearch@FreeBSD.org COMMENT= Visualization dashboards for OpenSearch WWW= https://opensearch.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= npm-node16>0:www/npm-node16 -CONFLICTS= opensearch-dashboard13 - USES= nodejs:16,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= 16.20.0 _DEVDIR= ${WRKDIR}/.devdir post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \ ${WRKSRC}/node_modules/re2/binding.gyp @${REINPLACE_CMD} -e 's|14.20.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}/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-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo index 964db868155b..c66a9fd2433b 100644 --- a/textproc/opensearch-dashboards/distinfo +++ b/textproc/opensearch-dashboards/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684548918 -SHA256 (opensearch-dashboards-2.7.0-linux-x64.tar.gz) = a93665de8035ef616c1d4fcfaffc0cfc63a590b3852cd9f54a0009823b03328a -SIZE (opensearch-dashboards-2.7.0-linux-x64.tar.gz) = 275618492 +TIMESTAMP = 1687196391 +SHA256 (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 11a77a4ad7c574d97fbfbce619e3f285e0553ffc4a009de6a08eb3e99bc4370f +SIZE (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 306279161 diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 617eef612c66..2157643f0ce9 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -1,138 +1,138 @@ PORTNAME= opensearch -DISTVERSION= 2.7.0 +DISTVERSION= 2.8.0 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ 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= opensearch13 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-notifications-core/notifications-core.yml \ opensearch-notifications/notifications.yml \ 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_cluster_manager.conf \ opensearch-performance-analyzer/rca_cluster_manager.conf \ opensearch-performance-analyzer/supervisord.conf \ opensearch-reports-scheduler/reports-scheduler.yml \ opensearch-security/action_groups.yml \ opensearch-security/allowlist.yml \ opensearch-security/audit.yml \ opensearch-security/config.yml \ opensearch-security/internal_users.yml \ opensearch-security/nodes_dn.yml \ opensearch-security/roles.yml \ opensearch-security/roles_mapping.yml \ opensearch-security/tenants.yml \ opensearch-security/whitelist.yml # Upstream provide some *.example files. These are also copied as sample filse # but we do not register them as @sample to avoid installing filse that needs # to be tuned a site specific way. PLUGINS_SAMPLE_CONFIG_FILES= \ opensearch-security/opensearch.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/extensions ${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 \ ${STAGEDIR}${ETCDIR}/opensearch-security .for f in ${PLUGINS_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample ${ECHO} "@sample ${ETCDIR}/${f}.sample" >> ${TMPPLIST} .endfor .for f in ${PLUGINS_SAMPLE_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f}.example ${STAGEDIR}${ETCDIR}/${f}.sample ${ECHO} "${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/extensions" >> ${TMPPLIST} .if ${PORT_OPTIONS:MPLUGINS} ${ECHO} "@dir lib/opensearch/plugins" >> ${TMPPLIST} .endif ${ECHO} "@dir libexec/opensearch" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0755) ${ETCDIR}" >> ${TMPPLIST} .include diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo index f8fff6b9363a..7aa5956794ea 100644 --- a/textproc/opensearch/distinfo +++ b/textproc/opensearch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684548868 -SHA256 (opensearch-2.7.0-linux-x64.tar.gz) = aa086a15cc1f183b4a572256dc76fd01df143e1d9d7e1cf1c320993a9ee61a63 -SIZE (opensearch-2.7.0-linux-x64.tar.gz) = 750369026 +TIMESTAMP = 1687196190 +SHA256 (opensearch-2.8.0-linux-x64.tar.gz) = eb8bd68acf9841f8cec3c79a622d67820abf43612baaa704b884973c644eca97 +SIZE (opensearch-2.8.0-linux-x64.tar.gz) = 744285401