From nobody Fri Jul 08 19:12:06 2022 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 78DE017FEBED; Fri, 8 Jul 2022 19:12:06 +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 4LfjZZ34fsz3Nqm; Fri, 8 Jul 2022 19:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657307526; 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=Kg2i2hQvm7PmtAyAecGDqPb/FcK+K4lVsevJR2lS37c=; b=JG0K5XIswiZtMQwofS4XArX1zXv3pTPMGi7ceqpAUoQ1KR80+4cIqvyqnkgermcH/i71Ik IW3i5MmZM0uYXXE4akHkcMELw6eQuLsh56HWsyTDZKZimJuCJMkpRWOy4BQz2hDLfU+0Nm raB+tiGwFTqV/NMeI60pv4OrG70Ma6+WIl6j30VmJv4zt56F+oKb2BkYz/V/eCX2+VyquS 4XUIyWKW6xkpRJTuJX9wTJe73j2HjydknTU2cGaGsIZjTNrp8i004xCJA1y/+gTuGtRBAu hIj8hDBXcZkInT0KTNVUyQv+nq+X0dzd69m6MuHR8QFtiHQLEy4Dlrh7TTIRQQ== 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 4LfjZZ29smzHnt; Fri, 8 Jul 2022 19:12:06 +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 268JC67Y088276; Fri, 8 Jul 2022 19:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268JC6N1088275; Fri, 8 Jul 2022 19:12:06 GMT (envelope-from git) Date: Fri, 8 Jul 2022 19:12:06 GMT Message-Id: <202207081912.268JC6N1088275@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 4f5da77d603f - main - textproc/opensearch-dashboards: Update to 2.1.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: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f5da77d603f083e66c8cc66a4e6a94491d51928 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657307526; 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=Kg2i2hQvm7PmtAyAecGDqPb/FcK+K4lVsevJR2lS37c=; b=R8vMwdUcbMm+qh7iXH6IweuvtmLsoGlfXNzVxZvyzdGFzxHdslU6JUr594/BF768X/63Lx KIjCKaR02xryoGWm4O+2ee8zZpKDtvgjGr6wy6R/hNceeYGpbVEgsUCitfl9Y0mdgxtcFH oLV8HBSyxWVExqMiZuXsaML0hXpLU3M7BX1zqVHTmcQWYSBqcvUgxpryLcu8g70/SZBKkY 8U7Gl4k5MN4olpuQeJoMW+AM6PVdRZb4UPud/0CRJcDvo+/PEDUgpsi6p1gkMV3YYuO600 lNr7LuoVjtgtBxDYtqx4Yx0EodoBOwxEAJUM4n0l5An6QN0QR8ixIW2W+WrjLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657307526; a=rsa-sha256; cv=none; b=oRCwYmLOJoksxWDwym+FUpyzpvPkGYHB6+hvwnujv0Af1X8ipUbnw/VTV0O/EJRncefP6L h2pgztGme6VwEh4BgIvwDFn87EimltUwk11Wy3neu1+tT5C5qXIg4O2n+7N0GTvdvWCEjg SB/KqY3jtK4+OH89SyLjPuOviOn2BEUxAMMaCdynoGUHgFL1fzZOPRsJuo2Ex0ncgIVn9b Hu2Y3eLmwUI8XbZHEvjMUF9H1zAOy6RyAJl8dMNRd2U2CpSpWw0RYHvoo50/jiL9aSeVek A8f2/AmJY16tkYXNeDqZJpL0y55J12Q4jfmLA8hrGFM3XfSawzm8bwQPTZHzDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f5da77d603f083e66c8cc66a4e6a94491d51928 commit 4f5da77d603f083e66c8cc66a4e6a94491d51928 Author: Romain Tartière AuthorDate: 2022-07-08 17:11:03 +0000 Commit: Romain Tartière CommitDate: 2022-07-08 19:11:55 +0000 textproc/opensearch-dashboards: Update to 2.1.0 Announcement: https://opensearch.org/blog/releases/2022/07/opensearch-2-1-is-available-now/ Release notes: https://github.com/opensearch-project/opensearch-build/blob/main/release-notes/opensearch-release-notes-2.1.0.md With hat: opensearch --- textproc/opensearch-dashboards/Makefile | 2 +- textproc/opensearch-dashboards/distinfo | 6 +++--- .../files/opensearch-dashboards.in | 3 +-- .../files/patch-bin_opensearch-dashboards-keystore | 4 ++-- .../files/patch-bin_opensearch-dashboards-plugin | 4 ++-- ..._reportsDashboards_server_routes_utils_constants.js | 10 +++++----- ...ch-src_setup__node__env_node__version__validator.js | 18 ------------------ 7 files changed, 14 insertions(+), 33 deletions(-) diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile index 3728c93683e2..8e0365f4e303 100644 --- a/textproc/opensearch-dashboards/Makefile +++ b/textproc/opensearch-dashboards/Makefile @@ -1,5 +1,5 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 2.0.0 +DISTVERSION= 2.1.0 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo index 7752662b83bd..a682f11dcc5e 100644 --- a/textproc/opensearch-dashboards/distinfo +++ b/textproc/opensearch-dashboards/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653931629 -SHA256 (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = e2434659b02d9ee4502523198ac51f42f7b09845b0950986f4c2ff9e347fe474 -SIZE (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = 227494898 +TIMESTAMP = 1657299734 +SHA256 (opensearch-dashboards-2.1.0-linux-x64.tar.gz) = 47b062e880372368b096abecd2f255d96ce8861dd87ada1ca5eaf052e72b17b7 +SIZE (opensearch-dashboards-2.1.0-linux-x64.tar.gz) = 227733934 diff --git a/textproc/opensearch-dashboards/files/opensearch-dashboards.in b/textproc/opensearch-dashboards/files/opensearch-dashboards.in index 38d667de990c..7043fa9301a9 100644 --- a/textproc/opensearch-dashboards/files/opensearch-dashboards.in +++ b/textproc/opensearch-dashboards/files/opensearch-dashboards.in @@ -45,8 +45,7 @@ pidfile="/var/run/${name}.pid" command="/usr/sbin/daemon" command_args="-f ${opensearch_dashboards_syslog_output_flags} -P ${pidfile} -t ${name} \ /usr/bin/env NODE_ENV=production ${opensearch_dashboards_env} \ - ${NODE} --no-warnings --max-http-header-size=65536 \ - %%WWWDIR%%/src/cli/dist serve \ + ${NODE} %%WWWDIR%%/src/cli/dist serve \ --config ${opensearch_dashboards_config} --log-file ${opensearch_dashboards_log} \ ${opensearch_dashboards_args}" diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore index d8c1b1d5387a..bf943cba637b 100644 --- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore +++ b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore @@ -1,6 +1,6 @@ ---- bin/opensearch-dashboards-keystore.orig 2021-07-02 23:30:56 UTC +--- bin/opensearch-dashboards-keystore.orig 2022-06-30 21:38:00 UTC +++ bin/opensearch-dashboards-keystore -@@ -14,8 +14,8 @@ while [ -h "$SCRIPT" ] ; do +@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do done DIR="$(dirname "${SCRIPT}")/.." diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin index 358fc3f02326..1a3cff5bef3f 100644 --- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin +++ b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin @@ -1,6 +1,6 @@ ---- bin/opensearch-dashboards-plugin.orig 2021-07-02 23:30:56 UTC +--- bin/opensearch-dashboards-plugin.orig 2022-06-30 21:38:00 UTC +++ bin/opensearch-dashboards-plugin -@@ -14,8 +14,8 @@ while [ -h "$SCRIPT" ] ; do +@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do done DIR="$(dirname "${SCRIPT}")/.." 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 520cc7c3a192..20519110401b 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,9 +1,9 @@ ---- plugins/reportsDashboards/server/routes/utils/constants.js.orig 2021-11-22 18:22:17 UTC +--- plugins/reportsDashboards/server/routes/utils/constants.js.orig 2022-06-30 21:47:37 UTC +++ plugins/reportsDashboards/server/routes/utils/constants.js -@@ -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; +@@ -138,7 +138,7 @@ const replaceBlockedKeywords = htmlString => { + }; + + exports.replaceBlockedKeywords = replaceBlockedKeywords; -const CHROMIUM_PATH = `${__dirname}/../../../.chromium/headless_shell`; +const CHROMIUM_PATH = `%%LOCALBASE%%/bin/chrome`; /** 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 d7fb2e5ead8b..000000000000 --- a/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js +++ /dev/null @@ -1,18 +0,0 @@ ---- src/setup_node_env/node_version_validator.js.orig 2021-09-07 03:05:30 UTC -+++ src/setup_node_env/node_version_validator.js -@@ -38,11 +38,11 @@ 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 isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts. -+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts. - - if (!isVersionValid) { -- var errorMessage = 'OpenSearch Dashboards does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. -+ var errorMessage = 'OpenSearch Dashboards does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. - - console.error(errorMessage); - process.exit(1); --} -\ No newline at end of file -+}