From nobody Fri Aug 18 05:21:14 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 4RRqwV55x1z4qhJ1; Fri, 18 Aug 2023 05:21:14 +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 4RRqwV4NTdz4M4Z; Fri, 18 Aug 2023 05:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692336074; 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=b6wp2uoFqSHA7w/XmwGFRmSmsFVRsKf4S5TqY+6UeQ0=; b=RUQl1anAhV+J1fX3+HJebkxNCt47AebVQLYDSpmKOrB1cZflPh9UYksO9dWzKe9aJdetSW wpl87F6eRtmH2iPkVOie6NcF+1xllLa4kUwXtYtCfaPVzsUjPI4SwBl/7LrR/GwrrqVfo6 X+bYcS60TdA6EI4TjF8AJWTLTAo2OoRAsR6ZWPn3sOtW3/N1cQvSPu/pf0qH53+cEeP+5W hrNifxNc74JaYnhJjcRzPLMp5bo+zwXlZQC4gA1lJDJ+NLYUXpqa7UtAUgmmYdX4jSreHZ ImITzJMbmo19Y+pXm/x66hiPKqi5JNGSej8r3l5FqP/IGg3eo8lP09VFV4vhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692336074; 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=b6wp2uoFqSHA7w/XmwGFRmSmsFVRsKf4S5TqY+6UeQ0=; b=HeJ1QLy5JxBlql7gEiSORyAkjNtbhiM2y6epdNuyWdsTrzG1CIn7i7ohTwVdJSifaOEwkn Wyh9FTvAzCGXBnMp0LV2nxF7Srn6Pi61MXbsKWXvzT6HVEN5bH6wZfbbfsCpkNGZEDPMoN ZTSFlUZSVUUVU9WgaSAOg4ImDjGLb3/ol9eqXGUPG/fEHRbY8Dy689n6eM7qN1/xd8WfFU GqMFm2tytHJqwf3iTiQg7IQ6LdmoWiDzqeC3yRkTDqq0oFuI9f8QW4Ig9HH/N5g4yPS+WM Psx2kgvhVSyGNyaCpnnGawi8Q7IiBz1qAyAGs2JUd+joOo5lGwOXssGfY+Eunw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692336074; a=rsa-sha256; cv=none; b=SHyoxy9gvYWaDk9gIIPpm1aWfcS96VbUjc2wofU2KVHFZzwu1dYKHic1bFS/gWZVaBRJ+U JED8aiFDXVoxlwfXPii2blEFNEV/DcAEiWuk+fPR/DjrL+hVCwobKH36KQc2FxI4iECIvX YyBREkzSPFdEnpwErIyjBxv8TtUtRnWEdtPjI3bZfC3ykNhOklRMCO1A/VsPbjKCQVHjwH JOmXvC0oK3ByCAF8qZZsd8iQ1U4DA6oj15+iM8FM8uTn5QuR97eC/dt2zqM7NgpYOre8pp hm1aukb+gYhVtNWIR/PRrXCj2V5hG/9KcPFyefx/DivJWrgjZgTOcNPN5EHBxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRqwV3B5Rz13qD; Fri, 18 Aug 2023 05:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I5LEWR028183; Fri, 18 Aug 2023 05:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I5LESU028180; Fri, 18 Aug 2023 05:21:14 GMT (envelope-from git) Date: Fri, 18 Aug 2023 05:21:14 GMT Message-Id: <202308180521.37I5LESU028180@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: e0e94006832d - main - textproc/opensearch*: Update to 2.9.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: e0e94006832d0407e55ae0b18e27042ace3fb0fb Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0e94006832d0407e55ae0b18e27042ace3fb0fb commit e0e94006832d0407e55ae0b18e27042ace3fb0fb Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-08-18 05:14:53 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-08-18 05:16:53 +0000 textproc/opensearch*: Update to 2.9.0 ChangeLog at: https://github.com/opensearch-project/OpenSearch/releases/tag/2.9.0 https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/release-notes/opensearch-dashboards.release-notes-2.9.0.md With hat: opensearch --- textproc/opensearch-dashboards/Makefile | 31 ++++------------------ textproc/opensearch-dashboards/distinfo | 6 ++--- .../files/patch-node__modules_re2_binding.gyp | 21 --------------- textproc/opensearch/Makefile | 2 +- textproc/opensearch/distinfo | 6 ++--- 5 files changed, 12 insertions(+), 54 deletions(-) diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile index 48b60be97c57..191b223b4deb 100644 --- a/textproc/opensearch-dashboards/Makefile +++ b/textproc/opensearch-dashboards/Makefile @@ -1,7 +1,6 @@ PORTNAME= opensearch-dashboards -DISTVERSION= 2.8.0 +DISTVERSION= 2.9.0 DISTVERSIONSUFFIX= -linux-x64 -PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ @@ -12,11 +11,12 @@ WWW= https://opensearch.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= npm-node16>0:www/npm-node16 +BUILD_DEPENDS= npm-node18>0:www/npm-node18 -USES= nodejs:16,build,run python:build +USES= nodejs:18,build,run python:build USE_RC_SUBR= ${PORTNAME} +NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= CHROME @@ -24,45 +24,24 @@ 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 +NODE_VER= 18.16.1 _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/node_modules/.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/node_modules/.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} diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo index c66a9fd2433b..f3c801d2739e 100644 --- a/textproc/opensearch-dashboards/distinfo +++ b/textproc/opensearch-dashboards/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687196391 -SHA256 (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 11a77a4ad7c574d97fbfbce619e3f285e0553ffc4a009de6a08eb3e99bc4370f -SIZE (opensearch-dashboards-2.8.0-linux-x64.tar.gz) = 306279161 +TIMESTAMP = 1692173494 +SHA256 (opensearch-dashboards-2.9.0-linux-x64.tar.gz) = f8328b9c1156d254faa561c03cbc51159f5e335812c7b27a98bbe0556b9f030c +SIZE (opensearch-dashboards-2.9.0-linux-x64.tar.gz) = 314585875 diff --git a/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp b/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp deleted file mode 100644 index 0ab0b1f203c9..000000000000 --- a/textproc/opensearch-dashboards/files/patch-node__modules_re2_binding.gyp +++ /dev/null @@ -1,21 +0,0 @@ ---- node_modules/re2/binding.gyp.orig 2021-07-02 23:30:56 UTC -+++ node_modules/re2/binding.gyp -@@ -45,7 +45,7 @@ - "-Wno-sign-compare", - "-Wno-unused-parameter", - "-Wno-missing-field-initializers", -- "-Wno-cast-function-type", -+ "-Wno-bad-function-cast", - "-O3", - "-g" - ], -@@ -54,7 +54,8 @@ - "NOMINMAX" - ], - "include_dirs": [ -- "