textproc/opensearch-*: update to 2.6.0

With hat:	opensearch

6 files changed, 13 insertions, 44 deletions

diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index 194efe5e37d0..e2cf9be77e52 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	2.4.1
+DISTVERSION=	2.6.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
@@ -25,6 +25,8 @@ 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:
@@ -32,15 +34,14 @@ post-patch:
 		${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|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}/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:
diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
index 08f968476cc8..cadd2680319d 100644
--- a/textproc/opensearch-dashboards/distinfo
+++ b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680109209
-SHA256 (opensearch-dashboards-2.4.1-linux-x64.tar.gz) = 373d078f4cf32c80af76106215276199cdb584259cd94f3fb1a4829257a8b1d5
-SIZE (opensearch-dashboards-2.4.1-linux-x64.tar.gz) = 354289090
+TIMESTAMP = 1681491572
+SHA256 (opensearch-dashboards-2.6.0-linux-x64.tar.gz) = d54f41131661fe1a092a43c2d3ca04b3753a29666feb1bc7066f07118b2bd8bb
+SIZE (opensearch-dashboards-2.6.0-linux-x64.tar.gz) = 217298981
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
deleted file mode 100644
index 20519110401b..000000000000
--- a/textproc/opensearch-dashboards/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/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js b/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js
deleted file mode 100644
index b78a0bf27cc9..000000000000
--- a/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/setup_node_env/node_version_validator.js.orig	2022-06-30 21:38:00 UTC
-+++ src/setup_node_env/node_version_validator.js
-@@ -36,13 +36,13 @@ var pkg = require('../../package.json'); // Note: This
- var currentVersion = process && process.version || null;
- var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
- var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
--var currentVersionMajorMinorPatch = currentVersion.match(/^v(\d+)\.(\d+)\.(\d+)/);
--var requiredVersionMajorMinorPatch = requiredVersion.match(/^v(\d+)\.(\d+)\.(\d+)/);
--var isVersionValid = currentVersionMajorMinorPatch[1] === requiredVersionMajorMinorPatch[1] && currentVersionMajorMinorPatch[2] === requiredVersionMajorMinorPatch[2] && parseInt(currentVersionMajorMinorPatch[3], 10) >= parseInt(requiredVersionMajorMinorPatch[3], 10); // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts.
-+var currentVersionMajorMinorPatch = currentVersion.match(/^v(\d+)\.(\d+)\.(\d+)/).map(x => parseInt(x, 10));
-+var requiredVersionMajorMinorPatch = requiredVersion.match(/^v(\d+)\.(\d+)\.(\d+)/).map(x => parseInt(x, 10));
-+var isVersionValid = currentVersionMajorMinorPatch[1] === requiredVersionMajorMinorPatch[1] && currentVersionMajorMinorPatch[2] > requiredVersionMajorMinorPatch[2] || currentVersionMajorMinorPatch[1] === requiredVersionMajorMinorPatch[1] && currentVersionMajorMinorPatch[2] === requiredVersionMajorMinorPatch[2] && currentVersionMajorMinorPatch[3] >= requiredVersionMajorMinorPatch[3]; // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts.
- 
- if (!isVersionValid) {
-   var errorMessage = `OpenSearch Dashboards was built with ${requiredVersion} and does not support the current Node.js version ${currentVersion}. ` + `Please use Node.js ${requiredVersion} or a higher patch version.`; // 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/opensearch/Makefile b/textproc/opensearch/Makefile
index ebab253d09d4..0e564641299d 100644
--- a/textproc/opensearch/Makefile
+++ b/textproc/opensearch/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	opensearch
-DISTVERSION=	2.4.1
+DISTVERSION=	2.6.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
diff --git a/textproc/opensearch/distinfo b/textproc/opensearch/distinfo
index ae3aba88fe84..453d5118a1b5 100644
--- a/textproc/opensearch/distinfo
+++ b/textproc/opensearch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680109125
-SHA256 (opensearch-2.4.1-linux-x64.tar.gz) = f2b71818ad84cdab1b736211efbdd79d33835a92d46f66a237fa1182d012410d
-SIZE (opensearch-2.4.1-linux-x64.tar.gz) = 556735165
+TIMESTAMP = 1681491001
+SHA256 (opensearch-2.6.0-linux-x64.tar.gz) = a89ae0585f09091e239a7176dfd81a891af863b4e29f44f2623cf17754385a4a
+SIZE (opensearch-2.6.0-linux-x64.tar.gz) = 746536433