From nobody Sun May 28 11:54:46 2023 X-Original-To: dev-commits-ports-all@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 4QTcXR0L0gz4XH9n; Sun, 28 May 2023 11:54:47 +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 4QTcXQ6myjz3xHw; Sun, 28 May 2023 11:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685274887; 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=XgQoo11pRzuS3Z+BCN/5fGLweYa8A7PqLsoYmnDKUMA=; b=MIPedQNGhUVUwrYDU/4oe1akUy+ec6q7fXGT1P0bqb/QkGPab+cvc6z+vrwKpC+EFNfoaX hgNFOmUr3hVVRX6qbawuSBKCsnuei+GdbBKjiZSG0w/3JA/+/OHzugIJCnXJL6VdvOpaaP CNaVaPrmdP5AOcqsmJ3BfAZg+RRN4MbfShAVpKypuzn7ECTkLkDijYrIM0mYQw6ZlP3i6k VamqTT+UmrgDQjz1CXaAVUFiTWhj+JZiVAEP14nwZ4QXejeG1Af5ujrnUYOU1IYzNwCgOz x/jZavaef+CVFbubUgtdpEjzo0l6ExEYDWeHGvE0W6T7FriZ7WR8q6Jj9nM3+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685274886; 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=XgQoo11pRzuS3Z+BCN/5fGLweYa8A7PqLsoYmnDKUMA=; b=Rnkje48I+Nv7cI5Ci+5IoXd0HSyColGL82XKb272JmYWRbxTbFy0W1zfsNgs4vGfC9hEfx rfSn+OAN7XvPzkeVs8A3Bmn4YejcraZjPbBJkH/MBQlTiYHBW4IUhd8tzaM9QRP+xBTy/e QdoEGCAVipQWsc0H7bpAdirScFA2T4DqWHi+BYVrnQ3v2aqNu8mez2okNR2Ql4HvIAP83X 0is2prbEljWEHwwY4/QLKhctlg6KLup9T3EGPLmn8T5HJe/WINDSP1Yd5XMIj9mOvaqgZp 7HNM5dt4LSZj+MKJnOqSD2wGRvDqauHujpD98NtEiVpBBnZxaIo/R16TViWn2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685274887; a=rsa-sha256; cv=none; b=kss5bh1PetnovkbdwfLFNdpxZIQFY/6yY9indOvu3Ut3TT4Zm9XUitFvaLoXq85m12tlWw wgQhF1d4eT9r4Hh12vuYwwTAD1RM18MhkYcUo5G4uZ6f3FzEz1ki40MaveQle6e5FnlMKd UtkBn2iObk5oQ9cXtFOw9YobHGlRv5E2Ko4sd7pbFL8ZV04ctJgXTih9jJ/gKKUjxGSIYA 5fG59g3pD5B3jFyKuwb3S8+M13f9cL+0Km+/rELFqF8i0XoFcz/EKWpEGaUBnevRwwQUUR /C+joN0JSOHpYqJUZXBToUG6jluBsXhO8stYD0YzE6WGI+Per+8HSXSS/bkOdQ== 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 4QTcXQ5qn4zTfc; Sun, 28 May 2023 11:54:46 +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 34SBskIG051390; Sun, 28 May 2023 11:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SBskov051389; Sun, 28 May 2023 11:54:46 GMT (envelope-from git) Date: Sun, 28 May 2023 11:54:46 GMT Message-Id: <202305281154.34SBskov051389@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: c11f3d7c8f83 - main - textproc/opensearch-dashboards13: Remove expired port: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c11f3d7c8f83c6b747bab0c661fee960a59fa531 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=c11f3d7c8f83c6b747bab0c661fee960a59fa531 commit c11f3d7c8f83c6b747bab0c661fee960a59fa531 Author: Rene Ladan AuthorDate: 2023-05-28 11:07:01 +0000 Commit: Rene Ladan CommitDate: 2023-05-28 11:07:01 +0000 textproc/opensearch-dashboards13: Remove expired port: 2023-05-26 textproc/opensearch-dashboards13: Requires upstream EOL node14 --- MOVED | 1 + textproc/Makefile | 1 - textproc/opensearch-dashboards13/Makefile | 86 ---------------------- textproc/opensearch-dashboards13/distinfo | 3 - .../files/opensearch-dashboards.in | 79 -------------------- .../files/patch-bin_opensearch-dashboards-keystore | 13 ---- .../files/patch-bin_opensearch-dashboards-plugin | 13 ---- .../files/patch-node__modules_re2_binding.gyp | 21 ------ .../opensearch-dashboards13/files/pkg-deinstall.in | 20 ----- textproc/opensearch-dashboards13/pkg-descr | 3 - 10 files changed, 1 insertion(+), 239 deletions(-) diff --git a/MOVED b/MOVED index 0d4c215c960a..52bac14ec287 100644 --- a/MOVED +++ b/MOVED @@ -7575,3 +7575,4 @@ textproc/rtf2html||2023-05-28|Has expired: Abandonware, please use something mod databases/mariadb103-server|databases/mariadb106-server|2023-05-28|Has expired: Use databases/mariadb106-server databases/mariadb103-client|databases/mariadb106-client|2023-05-28|Has expired: Use databases/mariadb106-server net-mgmt/chronograf||2023-05-28|Has expired: Requires upstream EOL node14 +textproc/opensearch-dashboards13|textproc/opensearch-dashboards|2023-05-28|Has expired: Requires upstream EOL node14 diff --git a/textproc/Makefile b/textproc/Makefile index 4413e0bb57d4..a0031e9473fc 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -517,7 +517,6 @@ SUBDIR += openjade SUBDIR += opensearch SUBDIR += opensearch-dashboards - SUBDIR += opensearch-dashboards13 SUBDIR += opensearch13 SUBDIR += opensp SUBDIR += openvanilla-framework diff --git a/textproc/opensearch-dashboards13/Makefile b/textproc/opensearch-dashboards13/Makefile deleted file mode 100644 index 75255bbaa5d6..000000000000 --- a/textproc/opensearch-dashboards13/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -PORTNAME= opensearch-dashboards -DISTVERSION= 1.3.10 -DISTVERSIONSUFFIX= -linux-x64 -CATEGORIES= textproc www -MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ -PKGNAMESUFFIX= 13 - -MAINTAINER= opensearch@FreeBSD.org -COMMENT?= Visualization dashboards for OpenSearch -WWW= https://opensearch.org - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -BROKEN= does not start with node14: wants node10 and fail with: TypeError: Cannot set property 'writecb' of undefined -DEPRECATED= Requires upstream EOL node14 -EXPIRATION_DATE= 2023-05-26 - -BUILD_DEPENDS= npm-node14>0:www/npm-node14 - -CONFLICTS= opensearch-dashboards - -USES= nodejs:14,build,run python:build -USE_RC_SUBR= ${PORTNAME} - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -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: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \ - ${WRKSRC}/bin/opensearch-dashboards-keystore \ - ${WRKSRC}/bin/opensearch-dashboards-plugin \ - ${WRKSRC}/node_modules/re2/binding.gyp - @${REINPLACE_CMD} -e 's|10.24.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/bin/node-gyp-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/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-dashboards13/distinfo b/textproc/opensearch-dashboards13/distinfo deleted file mode 100644 index cf040883f724..000000000000 --- a/textproc/opensearch-dashboards13/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1684555461 -SHA256 (opensearch-dashboards-1.3.10-linux-x64.tar.gz) = da23780ef640216a579f7ca6e8bbbb765d4edc7f2d9d523c466909f100d4d46e -SIZE (opensearch-dashboards-1.3.10-linux-x64.tar.gz) = 164796154 diff --git a/textproc/opensearch-dashboards13/files/opensearch-dashboards.in b/textproc/opensearch-dashboards13/files/opensearch-dashboards.in deleted file mode 100644 index 7043fa9301a9..000000000000 --- a/textproc/opensearch-dashboards13/files/opensearch-dashboards.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# PROVIDE: opensearch_dashboards -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -. /etc/rc.subr - -name=opensearch_dashboards -rcvar=opensearch_dashboards_enable - -load_rc_config $name - -: ${opensearch_dashboards_enable:="NO"} -: ${opensearch_dashboards_config:="%%ETCDIR%%/opensearch_dashboards.yml"} -: ${opensearch_dashboards_user:="www"} -: ${opensearch_dashboards_group:="www"} -: ${opensearch_dashboards_log:="/var/log/opensearch_dashboards.log"} -: ${opensearch_dashboards_syslog_output_enable:="NO"} - -start_precmd="opensearch_dashboards_start_precmd" -reload_cmd="opensearch_dashboards_reload_cmd" -extra_commands="reload" - -if checkyesno opensearch_dashboards_syslog_output_enable; then - if [ -n "${opensearch_dashboards_syslog_output_tag}" ]; then - opensearch_dashboards_syslog_output_flags="-T ${opensearch_dashboards_syslog_output_tag}" - else - opensearch_dashboards_syslog_output_flags="-T ${name}" - fi - if [ -n "${opensearch_dashboards_syslog_output_priority}" ]; then - opensearch_dashboards_syslog_output_flags="${opensearch_dashboards_syslog_output_flags} -s ${opensearch_dashboards_syslog_output_priority}" - fi - if [ -n "${opensearch_dashboards_syslog_output_facility}" ]; then - opensearch_dashboards_syslog_output_flags="${opensearch_dashboards_syslog_output_flags} -l ${opensearch_dashboards_syslog_output_facility}" - fi -fi - -NODE="%%LOCALBASE%%/bin/node" - -required_files="${opensearch_dashboards_config}" -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} %%WWWDIR%%/src/cli/dist serve \ - --config ${opensearch_dashboards_config} --log-file ${opensearch_dashboards_log} \ - ${opensearch_dashboards_args}" - -opensearch_dashboards_start_precmd() -{ - if [ ! -e "${pidfile}" ]; then - install -m 0600 -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} /dev/null ${pidfile} - fi - if [ ! -f ${opensearch_dashboards_log} ]; then - install -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} -m 640 /dev/null ${opensearch_dashboards_log} - fi - if [ ! -d %%WWWDIR%%/optimize ]; then - install -d -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} %%WWWDIR%%/optimize - else - # We may have installed a plugin as root which will cause files in here - # to be owned by root:wheel. Fix with a chown. - chown -R ${opensearch_dashboards_user}:${opensearch_dashboards_group} %%WWWDIR%%/optimize - fi -} - -opensearch_dashboards_reload_cmd() -{ - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - else - pkill -HUP -P ${rc_pid} - fi -} - -run_rc_command "$1" diff --git a/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-keystore b/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-keystore deleted file mode 100644 index bf943cba637b..000000000000 --- a/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-keystore +++ /dev/null @@ -1,13 +0,0 @@ ---- bin/opensearch-dashboards-keystore.orig 2022-06-30 21:38:00 UTC -+++ bin/opensearch-dashboards-keystore -@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do - done - - DIR="$(dirname "${SCRIPT}")/.." --CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"} --NODE="${DIR}/node/bin/node" -+CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards" -+NODE="%%LOCALBASE%%/bin/node" - test -x "$NODE" - if [ ! -x "$NODE" ]; then - echo "unable to find usable node.js executable." diff --git a/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-plugin b/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-plugin deleted file mode 100644 index 1a3cff5bef3f..000000000000 --- a/textproc/opensearch-dashboards13/files/patch-bin_opensearch-dashboards-plugin +++ /dev/null @@ -1,13 +0,0 @@ ---- bin/opensearch-dashboards-plugin.orig 2022-06-30 21:38:00 UTC -+++ bin/opensearch-dashboards-plugin -@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do - done - - DIR="$(dirname "${SCRIPT}")/.." --CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"} --NODE="${DIR}/node/bin/node" -+CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards" -+NODE="%%LOCALBASE%%/bin/node" - test -x "$NODE" - if [ ! -x "$NODE" ]; then - echo "unable to find usable node.js executable." diff --git a/textproc/opensearch-dashboards13/files/patch-node__modules_re2_binding.gyp b/textproc/opensearch-dashboards13/files/patch-node__modules_re2_binding.gyp deleted file mode 100644 index 0ab0b1f203c9..000000000000 --- a/textproc/opensearch-dashboards13/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": [ -- "