From nobody Sun Apr 16 03:52:20 2023 X-Original-To: dev-commits-ports-main@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 4Pzbq90Mm3z45jL8; Sun, 16 Apr 2023 03:52:21 +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 4Pzbq86NZ3z47YW; Sun, 16 Apr 2023 03:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681617140; 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=6GdH0SW8ZPUiIPA58/wVBwtqcN8rI8FxIYRhSYA1SDs=; b=D7r4rnhWSaPX/aKAe6KMhSJ+38e9Yv92WNG884iltYwWW/8re/8G77+zyOfATdxmLuw5L1 UKBj92hNohO/r+bQ4s2g6nljiiDo/8WROrbbumqrWpdR/NOXrx36K4KXOkZyyxsT7cD/80 u1TFoWn1oOnQoJTklpooLNY2iyF3DXStPZ+v3mcUJx4z2MzFK1EnwwJJoOVVYkBTFX9TG1 Qy5Ybiypnyv6vj42x86cNZTsRzTF7zw+K6k6CrcsSHmJg7iRbSED6Hrfy57iaH7bBkxq48 lV+G0UGeN0SQyrthkCG5Nf4Hn42L4Z2Zz4T3P5uHCsgpKCcnSMsWJDaDcN2pSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681617140; 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=6GdH0SW8ZPUiIPA58/wVBwtqcN8rI8FxIYRhSYA1SDs=; b=v/XkvohxibZNhU6KVlhAUXg6RkfapZ1+Mdo7NqZ96IyeySQzAkp4ZgiHX1nWfO45y+vASq 0PfpuZ/m01M7mk0GFTIZDDEA01hq2SbGt+fqzqJslxErlqutmrFaAFhsO3wVlwk5sI9gDA azQ+va2TLyKRgH5bh5JRmscN7tPGly75WHnYPJI3qi5xaqObhguKKfk4K7bef0jpklbS8G PqR9vse9Yh5PvpNZwRYfbEi6h1qdEBfqO9iWmE3HZxt+CoSDUGowwxxaajPbLnHUzgFtrY r5x07MeQ6xhb5NsqFf8uAoAEBl/8V4lLocj9R4u4DMmcukrSPlT0GDxWw1FWJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681617140; a=rsa-sha256; cv=none; b=RmFXUmtIn96WYEtFySyMzFrVD7BAm3Ox/mmsZ1Gtm9nRmj4bo2TFvZQpvWnXFGp12mLvx/ tlV9+D/kErpmyVRoHoGrR7Aqev74ZGI/8K4e3jC9cUrp4b4I/1PLjfT5+sPkKhlO+N3mPM k/RVM12qPnVLGPYjqeDEu3V55dg4bWZHn2ZrM3kYfPnCCTEFvifmgAguXZJODh9RkFaWJA Y2y6e41+OyMohIxhpGta56p0ngyCGggCXmS/v9883vK9r6rOzQdTezQ4KZ1o/iSD0XbQWk EuMivHYqPWRAzgiXnAbnrvcGl3dbtNRPmIJMeHECqBzjAkpSnskROwnOwU5Xsg== 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 4Pzbq85QyFzXt6; Sun, 16 Apr 2023 03:52:20 +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 33G3qKPt029904; Sun, 16 Apr 2023 03:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G3qKvD029903; Sun, 16 Apr 2023 03:52:20 GMT (envelope-from git) Date: Sun, 16 Apr 2023 03:52:20 GMT Message-Id: <202304160352.33G3qKvD029903@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 8a5b3637f84a - main - textproc/opensearch-*: update to 2.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a5b3637f84a48e732a6d6b1a4278c4540ade55f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a5b3637f84a48e732a6d6b1a4278c4540ade55f commit 8a5b3637f84a48e732a6d6b1a4278c4540ade55f Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-04-16 03:51:05 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-04-16 03:51:05 +0000 textproc/opensearch-*: update to 2.6.0 With hat: opensearch --- textproc/opensearch-dashboards/Makefile | 11 ++++++----- textproc/opensearch-dashboards/distinfo | 6 +++--- ...portsDashboards_server_routes_utils_constants.js | 11 ----------- ...src_setup__node__env_node__version__validator.js | 21 --------------------- textproc/opensearch/Makefile | 2 +- textproc/opensearch/distinfo | 6 +++--- 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