From nobody Sun Jul 09 12:55:22 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 4QzRty51nPz4m5R7; Sun, 9 Jul 2023 12:55:22 +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 4QzRty4TZ8z43sb; Sun, 9 Jul 2023 12:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688907322; 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=Qj7DOjDvvf/bulvaaLoeuG7EWGEmk16iDB6+0HcSYRY=; b=XNZKOFuDAeQvxj+6oE9u8BQdC1pvMmWWxVWSY7xUue/R/O39NJcyyX8dkzcRONDaNO1yGs WDav29kW/5ws15HTEdeo2L98kKSXvoSng75sYFIfHW3WHOzB7AbWo5XuY2HUphTPqmLk14 2Y6S/ryknjGqiPlGkYthAHVg36JmE9jEnARJXdFxg1yvv4BmK86WEmmuBWsiZ4Wh3MWd6L LH39qm7eTJW5luKewgNDnFJgZM6F6+Xrgc/ZwkYOwAaHEScGnj9mZlSJ2lsa7UegX9qdXJ 90EKn3Yggyqc6kw0L1aJ8zAaktO1Z6U3NsnyPUki8d8NaXPFOyQX78G2RAesiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688907322; 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=Qj7DOjDvvf/bulvaaLoeuG7EWGEmk16iDB6+0HcSYRY=; b=L2qwRWdmLTThVRybYAL7FiIFV0Km+BnYa4JK1k44egdXALbk+9A3GkAvNe4/vBfUiHmZYu JMIV0ZVAfni++0+aODlmzNgYwI8XAp+Y68Dck0Ew1QrLeDeKwjW8NSl6WUQ43ImT4OIFJw 0fYr4wjxNvuvz79CbfZJsHHYXK3XzRJmPtHw1HGyBmeOu5hYyN00WrIFK+SZZ924gAGf5k TXdEm1ivV8PzUL5sTatiLE+0b3Sn6vNEy68QWdmTDoo8ETuRq0AtJEZClfUeS6tZ84X78l IujX5ylk8ZseeAty/FbfXNBtXIdCYxsGzY1IXDeUJgyfXk1/bY1nwmC4o8JiUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688907322; a=rsa-sha256; cv=none; b=iLmWJy+uBJVSsqjYBT0sceWjjFiagJ2O1Al6XnjlM8KHjxFp8Kr55Kx4Pc4jJIhhn/7eZi y+NDKIgvqOp0aIrusd3/ZNhFQkIdqSRfjwvY5HpebNprbOSXuWaSlibJdLl9N6k9eU3hZR v7/WDp4AE+TdacZ0XW7renFtflq0xae/LTLREO1vn52PbnBVPch514qgqrywUHL5oAPqKf cPY5s+jQ1Re4qL5ZwGBaLm87AbchhiCbl42VG452Nw44n6LHq4qDlPG9WlPqbRGwKYXEph YPh9qqo9+6kQ2Bs8N+dVkyvZdhDbs7Hg5JAmZ9Z1hYAeMuRgo3uh2BIwNzMYhA== 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 4QzRty3ZY5z13V9; Sun, 9 Jul 2023 12:55:22 +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 369CtM74004112; Sun, 9 Jul 2023 12:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369CtMsX004111; Sun, 9 Jul 2023 12:55:22 GMT (envelope-from git) Date: Sun, 9 Jul 2023 12:55:22 GMT Message-Id: <202307091255.369CtMsX004111@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: 4e184db51f52 - main - textproc/kibana8: Update to 8.8.2 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: 4e184db51f5213b96a3fa2e853111b3d76e75928 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e184db51f5213b96a3fa2e853111b3d76e75928 commit 4e184db51f5213b96a3fa2e853111b3d76e75928 Author: Juraj Lutter AuthorDate: 2023-07-03 14:18:10 +0000 Commit: Juraj Lutter CommitDate: 2023-07-09 12:55:00 +0000 textproc/kibana8: Update to 8.8.2 - Update to 8.8.2 - Regen patches Release notes: https://www.elastic.co/guide/en/kibana/8.8/release-notes-8.8.2.html --- textproc/kibana8/Makefile | 19 ++++++++++++------- textproc/kibana8/distinfo | 10 +++++----- .../kibana8/files/extra-node-re2-binding-gyp.patch | 13 +++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile index 73800cca30e1..0d225736ad85 100644 --- a/textproc/kibana8/Makefile +++ b/textproc/kibana8/Makefile @@ -1,7 +1,6 @@ PORTNAME= kibana -DISTVERSION= 8.7.0 +DISTVERSION= 8.8.2 DISTVERSIONSUFFIX= -darwin-x86_64 -PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ @@ -48,7 +47,7 @@ BINS= kibana-encryption-keys kibana-keystore kibana-plugin \ # Set node-nan version here _NODE_NAN_VER= 2.17.0 # Set node-re version here -_NODE_RE2_VER= 1.18.0 +_NODE_RE2_VER= 1.19.1 ####################################################################### _NODECMD= ${LOCALBASE}/bin/node --version @@ -59,11 +58,16 @@ _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 +# Directory to prune +_DIR2DEL= node_modules packages src/plugins x-pack/packages + post-patch: - ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete +.for _dirdel in ${_DIR2DEL} + ${FIND} -s ${WRKSRC}/${_dirdel} -type d -empty -delete +.endfor cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES} ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp \ + -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp pre-configure: ( \ @@ -80,14 +84,15 @@ do-configure: "! ( -name \.* -or -path *\/test\/* -or -name test )") (cd ${_RE2DIR} && \ ${SETENV} HOME=${WRKDIR} \ - ${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \ + ${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/bin/node-gyp-bin/node-gyp build \ + ${LOCALBASE}/lib/node_modules/npm/node_modules/.bin/node-gyp build \ --devdir=${_DEVDIR}) do-install: diff --git a/textproc/kibana8/distinfo b/textproc/kibana8/distinfo index 7c525a3b5da9..7f05be1a15cb 100644 --- a/textproc/kibana8/distinfo +++ b/textproc/kibana8/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1682975789 -SHA256 (kibana-8.7.0-darwin-x86_64.tar.gz) = 199868855307ddb3cab0c5a27f0102754310b98146111e83954c82c7907be82a -SIZE (kibana-8.7.0-darwin-x86_64.tar.gz) = 163476595 +TIMESTAMP = 1688336020 +SHA256 (kibana-8.8.2-darwin-x86_64.tar.gz) = 97ba437a828b9a8e427efd4c28c86d06e1dbcdd33fabf609c316eb279a205033 +SIZE (kibana-8.8.2-darwin-x86_64.tar.gz) = 191503680 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.18.0_GH0.tar.gz) = 1a756518dc35ee07318e414338afaa8186c03d5929a609c51259d978359ee6b8 -SIZE (uhop-node-re2-1.18.0_GH0.tar.gz) = 51921 +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/kibana8/files/extra-node-re2-binding-gyp.patch b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch index ebab5accfed0..b4dd40eea2b2 100644 --- a/textproc/kibana8/files/extra-node-re2-binding-gyp.patch +++ b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch @@ -1,9 +1,10 @@ ---- binding.gyp.orig 2021-05-10 04:34:55.000000000 +0200 -+++ binding.gyp 2021-07-05 19:22:23.670716000 +0200 -@@ -14,29 +14,6 @@ +--- binding.gyp.orig 2023-06-15 22:48:53.000000000 +0200 ++++ binding.gyp 2023-07-03 08:23:44.841710000 +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", @@ -29,8 +30,8 @@ - "vendor/util/strutil.cc" ], "cflags": [ - "-std=c++14", -@@ -45,7 +22,7 @@ + "-std=c++2a", +@@ -46,7 +22,7 @@ "-Wno-sign-compare", "-Wno-unused-parameter", "-Wno-missing-field-initializers", @@ -39,7 +40,7 @@ "-O3", "-g" ], -@@ -54,7 +31,8 @@ +@@ -55,7 +31,8 @@ "NOMINMAX" ], "include_dirs": [