diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile index f70c2b424426..d44af4e627df 100644 --- a/textproc/kibana7/Makefile +++ b/textproc/kibana7/Makefile @@ -1,106 +1,105 @@ # Created by: Tom Judge PORTNAME= kibana -PORTVERSION= 7.15.1 +PORTVERSION= 7.15.2 DISTVERSIONSUFFIX= -darwin-x86_64 -PORTREVISION= 2 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 LICENSE= APACHE20 BUILD_DEPENDS= npm-node14>0:www/npm-node14 LIB_DEPENDS= libre2.so:devel/re2 \ libuv.so:devel/libuv USES= compiler:c++14-lang cpe nodejs:14,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_RC_SUBR= ${PORTNAME} CONFLICTS= kibana6 WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-deinstall SUB_LIST+= PKGNAMESUFFIX=${PKGNAMESUFFIX} \ PORTNAME=${PORTNAME} ####################################################################### # Set node-nan version here _NODE_NAN_VER= 2.15.0 # Set node-re version here _NODE_RE2_VER= 1.16.0 ####################################################################### _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-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/bin/node-gyp-bin/node-gyp configure \ --python=${PYTHON_CMD} \ --devdir=${_DEVDIR}) do-build: (cd ${_RE2DIR} && \ ${SETENV} HOME=${WRKDIR} \ ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-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 diff --git a/textproc/kibana7/distinfo b/textproc/kibana7/distinfo index f0a4095b6f6f..1f87f8a04616 100644 --- a/textproc/kibana7/distinfo +++ b/textproc/kibana7/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1635113207 -SHA256 (kibana-7.15.1-darwin-x86_64.tar.gz) = 7028495cafc4c3454d933b3bd938bfc3b7ee9042323df6013d7233306feac3ef -SIZE (kibana-7.15.1-darwin-x86_64.tar.gz) = 282331082 +TIMESTAMP = 1636672295 +SHA256 (kibana-7.15.2-darwin-x86_64.tar.gz) = bcfb9ef7c6f9670ca86eeaba1f009a01773415e00a029bfc862837ea581c6a4f +SIZE (kibana-7.15.2-darwin-x86_64.tar.gz) = 282624365 SHA256 (nodejs-nan-v2.15.0_GH0.tar.gz) = 13bb12054ae30464f2e4d0f54ef9ee107f8c53069c27bce275d52fa83384ba1a SIZE (nodejs-nan-v2.15.0_GH0.tar.gz) = 179277 SHA256 (uhop-node-re2-1.16.0_GH0.tar.gz) = 1f59293128e527942e3b5a372bcbf1f73abb3eb767b8a3958718bb67daa8e16b SIZE (uhop-node-re2-1.16.0_GH0.tar.gz) = 38904 diff --git a/textproc/kibana7/files/kibana.in b/textproc/kibana7/files/kibana.in index 7b8fb1bbee65..4b64a40c487a 100644 --- a/textproc/kibana7/files/kibana.in +++ b/textproc/kibana7/files/kibana.in @@ -1,85 +1,84 @@ #!/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}" -_dpidfile="/var/run/${name}-daemon.pid" -pidfile="/var/run/${name}.pid" +pidfile="/var/run/${name}-daemon.pid" +_kpidfile="/var/run/${name}.pid" -procname="${NODE}" command="/usr/sbin/daemon" -command_args="-f ${kibana_syslog_output_flags} -P ${_dpidfile} -t ${name} \ +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 "${_dpidfile}" ]; then - install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${_dpidfile} - fi if [ ! -e "${pidfile}" ]; then install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${pidfile} fi + if [ ! -e "${_kpidfile}" ]; then + install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${_kpidfile} + 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"