From nobody Tue Dec 13 17:00:43 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 4NWlB36n4Nz4kGmj; Tue, 13 Dec 2022 17:00:43 +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 4NWlB35yQMz44YP; Tue, 13 Dec 2022 17:00:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670950843; 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=T0BtrCqJF+IZTRXNVald6yPDiP0y4znRjROW6e6tjxc=; b=wqwSYefQVrDqnFl6ziX0KBaWQiMO4HtPJVvsc/F+da62zYIRA8MR4JBN8Kze1/k8BIZVqO V/q2HmIO/gxhds8rz9Cna1guj01hE9H1363QYoDP2rCTA4gGei3VrWBUX5obbKyLE1Jyrl BOa9UCYrdSVhCIMUcj5koNsllug1gfbsfITWpbZWgOykMYUOef0Pc8OnaAjwVIg1U6naOK mNQ6LY6DrTT4bo3qM5SYuOVgein2YUFb7x6czPCoPDXMPC63k0vpPAwTYK1qGwGt6NRima uKlqAdFd4pG6ADWFZ1T2ridH7yW4fW0aBqPFNr/h6JrNltVZaaevMUhDF3CnhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670950843; 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=T0BtrCqJF+IZTRXNVald6yPDiP0y4znRjROW6e6tjxc=; b=codZF0ES6qa4p3zS/rK+pv6CqSZ6THUrHHMUBdy3mvCh/KbCtXANPra2lBhWwpltWmcxpz bz/F2OjjEvNgNSFwo0V+/zQIxfCcChc3SiZ1uSxnf7OxpM5JUdFAUfZtUZhYd4Bfz2Yu1Y YJlZgGv3WYN44nLPEViGu097XWzzQdVR/KyjCHdNshgMi0F6qZSZukXopvxbT65Lv839uW dYcHR+X1TXHhFDORKssR82voNCFna+ts8L8T+3EftZ9d9kvWC4k8LTN/sae6idAKjNwDg5 wS0OAY+fqQxVkgGtrIIXxlEkzeiMJmzNiTmM0STQJZ3q/XE6dRpocsN7fFrvFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670950843; a=rsa-sha256; cv=none; b=wms30OmhbkPBTALQ06tQ8gMUiTSHJmdNTI9RJtk+M2H3iyIHx29DG4s7QsdUOHJlWG92eT YZFupp/JUxIqcLOCSUWTNNfULBu1qykz1PTecIXgmqY9Uo10ag0/uo7pqbNpmEvVTFSbb0 a0fb7/g7bIiLo2/NsP5hq7dKL/BEXQpk/UOkTg2DMYIpjjIE69sLnURd5FMpMN3oHYcD2x QVKK62Pvp+FWHgrNMbUVWuDgeIsC2Z6KRTnAhyKF5hoqk19csNoaMzp5EsP9/aNirW2z/P eHmrj/rKs+dxVgmA9lzfuTCFXpHf1+7xXaQz3rPqiUiJIcLWxcF2TpGG20pMHw== 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 4NWlB34s72zM0C; Tue, 13 Dec 2022 17:00:43 +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 2BDH0h3r044351; Tue, 13 Dec 2022 17:00:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDH0hNR044350; Tue, 13 Dec 2022 17:00:43 GMT (envelope-from git) Date: Tue, 13 Dec 2022 17:00:43 GMT Message-Id: <202212131700.2BDH0hNR044350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 301332e1b52a - main - textproc/kibana7: Update to 7.17.8 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 301332e1b52af930dac2aaa4d5a09e7b4b7ee9db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=301332e1b52af930dac2aaa4d5a09e7b4b7ee9db commit 301332e1b52af930dac2aaa4d5a09e7b4b7ee9db Author: Juraj Lutter AuthorDate: 2022-12-12 21:50:28 +0000 Commit: Juraj Lutter CommitDate: 2022-12-13 16:59:57 +0000 textproc/kibana7: Update to 7.17.8 Release notes: https://www.elastic.co/guide/en/kibana/7.17/release-notes-7.17.8.html --- textproc/kibana7/Makefile | 7 +++++-- textproc/kibana7/distinfo | 10 +++++----- textproc/kibana7/files/kibana.in | 9 +++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/textproc/kibana7/Makefile b/textproc/kibana7/Makefile index b9ffdbe7e759..bd470e4e8818 100644 --- a/textproc/kibana7/Makefile +++ b/textproc/kibana7/Makefile @@ -1,5 +1,5 @@ PORTNAME= kibana -PORTVERSION= 7.17.7 +PORTVERSION= 7.17.8 DISTVERSIONSUFFIX= -darwin-x86_64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ @@ -36,7 +36,7 @@ SUB_LIST+= PKGNAMESUFFIX=${PKGNAMESUFFIX} \ # Set node-nan version here _NODE_NAN_VER= 2.17.0 # Set node-re version here -_NODE_RE2_VER= 1.17.7 +_NODE_RE2_VER= 1.18.0 ####################################################################### _NODECMD= ${LOCALBASE}/bin/node --version @@ -47,6 +47,9 @@ _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} diff --git a/textproc/kibana7/distinfo b/textproc/kibana7/distinfo index 52f9dc88d084..560d6447128f 100644 --- a/textproc/kibana7/distinfo +++ b/textproc/kibana7/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1668117034 -SHA256 (kibana-7.17.7-darwin-x86_64.tar.gz) = eafe0123014fcbab6b3a18281d71bce1fa180c8006a87905c29d429b6cf40558 -SIZE (kibana-7.17.7-darwin-x86_64.tar.gz) = 260242059 +TIMESTAMP = 1670881207 +SHA256 (kibana-7.17.8-darwin-x86_64.tar.gz) = 7c799dccf02448f6578197839d5b08e848a76110f90c0023f3da66ebb52239d3 +SIZE (kibana-7.17.8-darwin-x86_64.tar.gz) = 311223820 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.17.7_GH0.tar.gz) = f25be0935e763a1263264929a3e1ce1abfb55559b669ce5b633ec9604ce243d7 -SIZE (uhop-node-re2-1.17.7_GH0.tar.gz) = 50166 +SHA256 (uhop-node-re2-1.18.0_GH0.tar.gz) = 1a756518dc35ee07318e414338afaa8186c03d5929a609c51259d978359ee6b8 +SIZE (uhop-node-re2-1.18.0_GH0.tar.gz) = 51921 diff --git a/textproc/kibana7/files/kibana.in b/textproc/kibana7/files/kibana.in index 4b64a40c487a..101be36fbb34 100644 --- a/textproc/kibana7/files/kibana.in +++ b/textproc/kibana7/files/kibana.in @@ -40,11 +40,11 @@ fi NODE="%%LOCALBASE%%/bin/node" required_files="${kibana_config}" -pidfile="/var/run/${name}-daemon.pid" -_kpidfile="/var/run/${name}.pid" +pidfile="/var/run/${name}.pid" +procname="${NODE}" command="/usr/sbin/daemon" -command_args="-f ${kibana_syslog_output_flags} -P ${pidfile} -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 \ @@ -56,9 +56,6 @@ kibana_start_precmd() 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