diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile index b0c5963fbe65..1f61a724594c 100644 --- a/textproc/opensearch-dashboards/Makefile +++ b/textproc/opensearch-dashboards/Makefile @@ -1,74 +1,71 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 1.1.0 -PORTREVISION= 1 +DISTVERSION= 1.2.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 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= npm-node14>0:www/npm-node14 USES= nodejs:14,build,run python:build USE_RC_SUBR= ${PORTNAME} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - _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 ${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 ${RM} -r ${WRKSRC}/plugins/reportsDashboards/.chromium do-configure: (cd ${WRKSRC}/node_modules/re2 && \ ${SETENV} HOME=${WRKDIR} \ ${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} \ ${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 5356cc0cbc48..4da5abd8b199 100644 --- a/textproc/opensearch-dashboards/distinfo +++ b/textproc/opensearch-dashboards/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633497768 -SHA256 (opensearch-dashboards-1.1.0-linux-x64.tar.gz) = 51e3093daa23097694892d35a0b0eb42b3d7b7b683553fa34cca92913b4b4190 -SIZE (opensearch-dashboards-1.1.0-linux-x64.tar.gz) = 202916767 +TIMESTAMP = 1637961679 +SHA256 (opensearch-dashboards-1.2.0-linux-x64.tar.gz) = 14623798e61be6913e2a218d6ba3e308e5036359d7bda58482ad2f1340aa3c85 +SIZE (opensearch-dashboards-1.2.0-linux-x64.tar.gz) = 209294108 diff --git a/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js b/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js index bef199433323..520cc7c3a192 100644 --- a/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js +++ b/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js @@ -1,11 +1,11 @@ ---- plugins/reportsDashboards/server/routes/utils/constants.js.orig 2021-09-16 00:07:34 UTC +--- plugins/reportsDashboards/server/routes/utils/constants.js.orig 2021-11-22 18:22:17 UTC +++ plugins/reportsDashboards/server/routes/utils/constants.js -@@ -130,7 +130,7 @@ const SECURITY_CONSTANTS = { - PROXY_AUTH_IP_HEADER: 'x-forwarded-for' - }; +@@ -107,7 +107,7 @@ const SECURITY_CONSTANTS = { exports.SECURITY_CONSTANTS = SECURITY_CONSTANTS; + const EXTRA_HEADERS = ['cookie', 'x-proxy-user', 'x-proxy-roles', 'x-forwarded-for']; + exports.EXTRA_HEADERS = EXTRA_HEADERS; -const CHROMIUM_PATH = `${__dirname}/../../../.chromium/headless_shell`; -+const CHROMIUM_PATH = '%%LOCALBASE%%/bin/chrome'; ++const CHROMIUM_PATH = `%%LOCALBASE%%/bin/chrome`; /** * Metric constants */