Date: Thu, 2 Nov 2023 15:38:29 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8f7a0713a8ba - main - textproc/kibana7: Remove expired port Message-ID: <202311021538.3A2FcTU2026582@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f7a0713a8bad4c87d62e06c0280ddf079cebab2 commit 8f7a0713a8bad4c87d62e06c0280ddf079cebab2 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-11-02 14:52:31 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-11-02 15:25:44 +0000 textproc/kibana7: Remove expired port 2023-10-30 textproc/kibana7: Depends on EOL NodeJS 16 --- MOVED | 1 + textproc/Makefile | 1 - textproc/kibana7/Makefile | 114 --------------------- textproc/kibana7/distinfo | 7 -- .../kibana7/files/extra-node-re2-binding-gyp.patch | 52 ---------- textproc/kibana7/files/kibana.in | 81 --------------- textproc/kibana7/files/patch-abseil | 50 --------- textproc/kibana7/files/patch-config_kibana.yml | 11 -- ...rc_setup__node__env_node__version__validator.js | 18 ---- textproc/kibana7/files/pkg-deinstall.in | 20 ---- textproc/kibana7/pkg-descr | 6 -- 11 files changed, 1 insertion(+), 360 deletions(-) diff --git a/MOVED b/MOVED index ec9cee69cd2c..213e17e478bb 100644 --- a/MOVED +++ b/MOVED @@ -7958,3 +7958,4 @@ audio/p5-MIDI|audio/p5-MIDI-Perl|2023-11-01|Move audio/p5-MIDI to audio/p5-MIDI- devel/xtoolchain-llvm-devel||2023-11-02|Subsumed into devel/llvm-devel net/ceph14||2023-11-02|Has expired: End of life upstream since 2021-06-30 www/sfnt2woff||2023-11-02|Has expired: Superseded by WOFF 2.0, please consider using devel/woff2 +textproc/kibana7||2023-11-02|Has expired: Depends on EOL NodeJS 16 diff --git a/textproc/Makefile b/textproc/Makefile index 4d68c421e80f..b218d09fdce0 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -355,7 +355,6 @@ SUBDIR += kf5-kcodecs SUBDIR += kf5-sonnet SUBDIR += kf5-syntax-highlighting - SUBDIR += kibana7 SUBDIR += kibana8 SUBDIR += kiss-templates SUBDIR += kmfl-european-latin diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile deleted file mode 100644 index 31bc9fd3a9cf..000000000000 --- a/textproc/kibana7/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -PORTNAME= kibana -PORTVERSION= 7.17.11 -DISTVERSIONSUFFIX= -darwin-x86_64 -PORTREVISION= 1 -CATEGORIES= textproc www -MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ - http://artifacts.elastic.co/downloads/kibana/ -PKGNAMESUFFIX?= 7 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= elastic@FreeBSD.org -COMMENT= Browser based analytics and search interface to ElasticSearch -WWW= https://www.elastic.co/products/kibana - -LICENSE= APACHE20 - -DEPRECATED= Depends on EOL NodeJS 16 -EXPIRATION_DATE= 2023-10-30 - -BUILD_DEPENDS= npm-node16>=9.7.2:www/npm-node16 -LIB_DEPENDS= libre2.so:devel/re2 \ - libuv.so:devel/libuv -RUN_DEPENDS= ${LOCALBASE}/bin/node:www/node16 - -USES= compiler:c++17-lang cpe nodejs:16,build,run python:build -CPE_VENDOR= elastic - -USE_GITHUB= nodefault -GH_TUPLE= nodejs:nan:v${_NODE_NAN_VER}:node_nan \ - uhop:node-re2:${_NODE_RE2_VER}:node_re2 - -USE_CXXSTD= c++17 -USE_RC_SUBR= ${PORTNAME} - -WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} - -PORTSCOUT= limit:^7 - -SUB_FILES= pkg-deinstall -SUB_LIST+= PKGNAMESUFFIX=${PKGNAMESUFFIX} \ - PORTNAME=${PORTNAME} - -####################################################################### -# Set node-nan version here -_NODE_NAN_VER= 2.17.0 -# Set node-re version here -_NODE_RE2_VER= 1.19.1 -####################################################################### - -_NODECMD= ${LOCALBASE}/bin/node --version -_DEVDIR:= ${WRKDIR}/.devdir - -_RE2DIR= ${WRKDIR}/node-re2-${_NODE_RE2_VER} - -# Extra patch files must be updated whenever node-re2 changes -_RE2PATCHES= ${PATCHDIR}/extra-node-re2-binding-gyp.patch - -post-extract: - ${RM} -rf ${WRKSRC}/node - -post-patch: - ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete - cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES} - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp - -pre-configure: - ( \ - _NODEVER=$$(${_NODECMD} | ${SED} -n 's|^v\(.*\)|\1|p') && \ - ${MKDIR} ${_DEVDIR}/$${_NODEVER}/include && \ - ${RLN} ${LOCALBASE}/include/node ${_DEVDIR}/$${_NODEVER}/include/node && \ - ${ECHO} "9" > ${_DEVDIR}/$${_NODEVER}/installVersion \ - ) - -do-configure: - ${MKDIR} ${_DEVDIR}/nan - (cd ${WRKDIR}/nan-${_NODE_NAN_VER} && ${COPYTREE_SHARE} . \ - ${_DEVDIR}/nan \ - "! ( -name \.* -or -path *\/test\/* -or -name test )") - (cd ${_RE2DIR} && \ - ${SETENV} HOME=${WRKDIR} \ - ${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp configure \ - --python=${PYTHON_CMD} \ - --nodedir=${LOCALBASE} \ - --devdir=${_DEVDIR}) - -do-build: - (cd ${_RE2DIR} && \ - ${SETENV} HOME=${WRKDIR} \ - ${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp build \ - --devdir=${_DEVDIR}) - -do-install: - ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample - (cd ${WRKSRC} && \ - ${RM} -r config node optimize && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \ - ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}) - ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config - ${MKDIR} ${STAGEDIR}${WWWDIR}/node/bin - ${LN} -s ${LOCALBASE}/bin/node ${STAGEDIR}${WWWDIR}/node/bin/node - ${RM} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node - ${INSTALL_LIB} ${_RE2DIR}/build/Release/re2.node \ - ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node - -post-install: - ${ECHO} "@sample ${ETCDIR}/kibana.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" >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/textproc/kibana7/distinfo b/textproc/kibana7/distinfo deleted file mode 100644 index 17a0c99ff845..000000000000 --- a/textproc/kibana7/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1688930582 -SHA256 (kibana-7.17.11-darwin-x86_64.tar.gz) = 6e00b5afad5dbde45c6a39e95141eab269e48420e7e9c156c80bcb6dba5bb194 -SIZE (kibana-7.17.11-darwin-x86_64.tar.gz) = 308454891 -SHA256 (nodejs-nan-v2.17.0_GH0.tar.gz) = bcf5dfe59c26377b2096d903ecf6c2dbdae92528b1373a0565c40fe07537610d -SIZE (nodejs-nan-v2.17.0_GH0.tar.gz) = 179443 -SHA256 (uhop-node-re2-1.19.1_GH0.tar.gz) = 414a77a9690b074f88803b8d680684895ce470957b2b0af2008199df20c4a244 -SIZE (uhop-node-re2-1.19.1_GH0.tar.gz) = 47211 diff --git a/textproc/kibana7/files/extra-node-re2-binding-gyp.patch b/textproc/kibana7/files/extra-node-re2-binding-gyp.patch deleted file mode 100644 index 47b14ac010d4..000000000000 --- a/textproc/kibana7/files/extra-node-re2-binding-gyp.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- binding.gyp.orig 2023-06-15 22:48:53.000000000 +0200 -+++ binding.gyp 2023-07-09 21:24:09.709429000 +0200 -@@ -14,30 +14,6 @@ - "lib/to_string.cc", - "lib/accessors.cc", - "lib/util.cc", -- "vendor/re2/bitmap256.cc", -- "vendor/re2/bitstate.cc", -- "vendor/re2/compile.cc", -- "vendor/re2/dfa.cc", -- "vendor/re2/filtered_re2.cc", -- "vendor/re2/mimics_pcre.cc", -- "vendor/re2/nfa.cc", -- "vendor/re2/onepass.cc", -- "vendor/re2/parse.cc", -- "vendor/re2/perl_groups.cc", -- "vendor/re2/prefilter.cc", -- "vendor/re2/prefilter_tree.cc", -- "vendor/re2/prog.cc", -- "vendor/re2/re2.cc", -- "vendor/re2/regexp.cc", -- "vendor/re2/set.cc", -- "vendor/re2/simplify.cc", -- "vendor/re2/stringpiece.cc", -- "vendor/re2/tostring.cc", -- "vendor/re2/unicode_casefold.cc", -- "vendor/re2/unicode_groups.cc", -- "vendor/util/pcre.cc", -- "vendor/util/rune.cc", -- "vendor/util/strutil.cc" - ], - "cflags": [ - "-std=c++2a", -@@ -46,7 +22,7 @@ - "-Wno-sign-compare", - "-Wno-unused-parameter", - "-Wno-missing-field-initializers", -- "-Wno-cast-function-type", -+ "-Wno-bad-function-cast", - "-O3", - "-g" - ], -@@ -55,7 +31,8 @@ - "NOMINMAX" - ], - "include_dirs": [ -- "<!(node -e \"require('nan')\")", -+ "%%PREFIX%%/include", -+ "%%DEVDIR%%/nan", - "vendor" - ], - "xcode_settings": { diff --git a/textproc/kibana7/files/kibana.in b/textproc/kibana7/files/kibana.in deleted file mode 100644 index 101be36fbb34..000000000000 --- a/textproc/kibana7/files/kibana.in +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -# PROVIDE: kibana -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -. /etc/rc.subr - -name=kibana -rcvar=kibana_enable - -load_rc_config $name - -: ${kibana_enable:="NO"} -: ${kibana_config:="%%ETCDIR%%/kibana.yml"} -: ${kibana_user:="www"} -: ${kibana_group:="www"} -: ${kibana_log:="/var/log/kibana.log"} -: ${kibana_syslog_output_enable:="NO"} - -start_precmd="kibana_start_precmd" -reload_cmd="kibana_reload_cmd" -extra_commands="reload" - -if checkyesno kibana_syslog_output_enable; then - if [ -n "${kibana_syslog_output_tag}" ]; then - kibana_syslog_output_flags="-T ${kibana_syslog_output_tag}" - else - kibana_syslog_output_flags="-T ${name}" - fi - if [ -n "${kibana_syslog_output_priority}" ]; then - kibana_syslog_output_flags="${kibana_syslog_output_flags} -s ${kibana_syslog_output_priority}" - fi - if [ -n "${kibana_syslog_output_facility}" ]; then - kibana_syslog_output_flags="${kibana_syslog_output_flags} -l ${kibana_syslog_output_facility}" - fi -fi - -NODE="%%LOCALBASE%%/bin/node" - -required_files="${kibana_config}" -pidfile="/var/run/${name}.pid" -procname="${NODE}" - -command="/usr/sbin/daemon" -command_args="-f ${kibana_syslog_output_flags} -p ${pidfile} -t ${name} \ - /usr/bin/env BABEL_DISABLE_CACHE=1 NODE_ENV=production ${kibana_env} \ - ${NODE} --no-warnings --max-http-header-size=65536 \ - %%WWWDIR%%/src/cli/dist serve \ - --config ${kibana_config} --log-file ${kibana_log} \ - --xpack.reporting.enabled=false ${kibana_args}" - -kibana_start_precmd() -{ - if [ ! -e "${pidfile}" ]; then - install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${pidfile} - fi - if [ ! -f ${kibana_log} ]; then - install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log} - fi - if [ ! -d %%WWWDIR%%/optimize ]; then - install -d -o ${kibana_user} -g ${kibana_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 ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize - fi -} - -kibana_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/kibana7/files/patch-abseil b/textproc/kibana7/files/patch-abseil deleted file mode 100644 index e85f151b88cd..000000000000 --- a/textproc/kibana7/files/patch-abseil +++ /dev/null @@ -1,50 +0,0 @@ ---- ../node-re2-1.19.1/binding.gyp.orig 2023-06-16 04:48:53.000000000 +0800 -+++ ../node-re2-1.19.1/binding.gyp 2023-09-10 23:36:50.297531000 +0800 -@@ -50,6 +50,9 @@ - "-O3", - "-g" - ], -+ "cflags_cc": [ -+ "-std=c++17", -+ ], - "defines": [ - "NDEBUG", - "NOMINMAX" ---- ../node-re2-1.19.1/lib/replace.cc.orig 2023-06-16 04:48:53.000000000 +0800 -+++ ../node-re2-1.19.1/lib/replace.cc 2023-09-10 21:35:52.639876000 +0800 -@@ -107,7 +107,7 @@ - i += 2; - continue; - case '&': -- result += groups[0].as_string(); -+ result += std::string(groups[0]); - i += 2; - continue; - case '`': -@@ -139,7 +139,7 @@ - index2 = index * 10 + (ch - '0'); - if (index2 && index2 < groups.size()) - { -- result += groups[index2].as_string(); -+ result += std::string(groups[index2]); - continue; - } - result += '$'; -@@ -152,7 +152,7 @@ - i += 2; - if (index && index < groups.size()) - { -- result += groups[index].as_string(); -+ result += std::string(groups[index]); - continue; - } - result += '$'; -@@ -170,7 +170,7 @@ - if (group != namedGroups.end()) - { - index = group->second; -- result += groups[index].as_string(); -+ result += std::string(groups[index]); - } - i = nameEnd + 1 - data; - } diff --git a/textproc/kibana7/files/patch-config_kibana.yml b/textproc/kibana7/files/patch-config_kibana.yml deleted file mode 100644 index 9fd5b414496c..000000000000 --- a/textproc/kibana7/files/patch-config_kibana.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- config/kibana.yml.orig 2021-10-26 12:51:47 UTC -+++ config/kibana.yml -@@ -91,7 +91,7 @@ - #elasticsearch.logQueries: false - - # Specifies the path where Kibana creates the process ID file. --#pid.file: /run/kibana/kibana.pid -+pid.file: /var/run/kibana.pid - - # Enables you to specify a file where Kibana stores log output. - #logging.dest: stdout diff --git a/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js b/textproc/kibana7/files/patch-src_setup__node__env_node__version__validator.js deleted file mode 100644 index 1bf9870031e9..000000000000 --- a/textproc/kibana7/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-10-07 21:19:53 UTC -+++ src/setup_node_env/node_version_validator.js -@@ -14,11 +14,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 Kibana starts. -+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. - - if (!isVersionValid) { -- var errorMessage = 'Kibana 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 = 'Kibana 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 -+} diff --git a/textproc/kibana7/files/pkg-deinstall.in b/textproc/kibana7/files/pkg-deinstall.in deleted file mode 100644 index 0699ab559805..000000000000 --- a/textproc/kibana7/files/pkg-deinstall.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -case "$2" in -POST-DEINSTALL) - if [ -d %%WWWDIR%%/optimize ]; then - /usr/bin/find %%WWWDIR%%/optimize/ -delete - fi - - cat <<EOMSG - -If %%PORTNAME%%%%PKGNAMESUFFIX%% is being deleted permanently, and you do not wish to keep any -data that was in the cluster, then you may wish to delete the -%%WWWDIR%% directory. This can be done by with the command: - - # rm -rf %%WWWDIR%% - -Please ignore this if %%PORTNAME%%%%PKGNAMESUFFIX%% is being upgraded -EOMSG - ;; -esac diff --git a/textproc/kibana7/pkg-descr b/textproc/kibana7/pkg-descr deleted file mode 100644 index de75d144d7ac..000000000000 --- a/textproc/kibana7/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Kibana is an open source (Apache Licensed), browser based analytics and search -dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana -strives to be easy to get started with, while also being flexible and powerful, -just like Elasticsearch. - -Kibana 7.x is compatible with Elasticsearch 7.x
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311021538.3A2FcTU2026582>