From nobody Mon Dec 25 17:09:38 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 4SzPXL4f5zz551qs; Mon, 25 Dec 2023 17:09:38 +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 4SzPXL4PPHz4TYT; Mon, 25 Dec 2023 17:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703524178; 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=rVnGQYIAmO6s58xmO9IJp36Gf0WHSDhZLfhSp4RkPyE=; b=nXmuokajgUTF4xSko9BvzDy6RC4Yr11ILOGVVgDICCfGda1PJsEB7olTh3ob7zcf63woSY +uohM2Kd/dHzMoe1+s3ZIBKH2E/d1GFi8NTaK/Ij5XSn4DC8nYWe/17UQKNFBYJfRHD/7p kZ/rmW3tRm7kfyk5ILZvQFGqY4SkdEJfshSN8ZoIHXjgz96WXEnRTakbWyvl1jfwIgfBlQ x0iz1Yh5qV5vOf64iKiPjCabxJeUKMiIUloUnIQ72S2tS305waCBBMDhTC3+bRcRfaVmoa Vn38h/2Mx8CrdGQ46b05w+LdlDyeQmteobv6YzfeAoHPvjo8R2QbcFMUsmz08Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703524178; a=rsa-sha256; cv=none; b=dj6Ont3rLKlPTrmDbYrlUAQ9z3sUlWze2AqGZTmDK7zFmLGS28q2QDpUAYNMUVAOzvlPbh tEw1Qssvnzx+1BeCRuOxjFOvL01V/wU/Ub4vSPzViEut7Fd41hqPzIJ8W0XCnBmIryoMxH WJVGKWruhsu6+EFshcX54a9+IEzcZYDikRhonkLUTGUQ2uq7b8zyAftTUsFS4vyrx1hlry SJ2Udwr4euIkPOivclMOFQFX7mwcI6jIm60Yh/H+zK5HagDrhzT4JVAm5IPHjvvsOG7Hel nEJczh/aVS0x9HZKkgi1oeuBUjOfK3g4NwgEEKXsqhxLjNd94IAtf85wViEZ1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703524178; 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=rVnGQYIAmO6s58xmO9IJp36Gf0WHSDhZLfhSp4RkPyE=; b=HngRjCyPfMPJRwDXnfgSU6efRaf64lQqTEU/avJZQ8yxGZat8csJEtDJ6p9YnT8wcQXo9u iPmB+RT1jy11UQjRYPrF5VvXGc/wCS3C4wqfyH31CEzPUtAvKQ4ExRnVydJI02JOyzBTSk i0f2/hQw6l1d76krsIyPk/OVLd5229qoMog66Jg8p4ZRfzMudcLhiu5R9mHCNGSInBu2kk ib81f85fuKa6e75ZJ8cxeSJndaTPTZce9LigCszf2TNgrZ4f21FO/jGu7GyoS1BvSUiz5N hD7Jz+qaFmlfx9r3gioEPxoOnTsGERgQBgLJR+zBDzCiLo7N9ZpO3LKvUPv0hQ== 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 4SzPXL3MQ4z4pL; Mon, 25 Dec 2023 17:09:38 +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 3BPH9c9c097897; Mon, 25 Dec 2023 17:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BPH9c4q097894; Mon, 25 Dec 2023 17:09:38 GMT (envelope-from git) Date: Mon, 25 Dec 2023 17:09:38 GMT Message-Id: <202312251709.3BPH9c4q097894@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: 5b3918e0a88c - main - textproc/kibana8: Update to 8.11.3 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: 5b3918e0a88c47be8f7a13921cefe408836c50c0 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b3918e0a88c47be8f7a13921cefe408836c50c0 commit 5b3918e0a88c47be8f7a13921cefe408836c50c0 Author: Juraj Lutter AuthorDate: 2023-12-25 17:06:49 +0000 Commit: Juraj Lutter CommitDate: 2023-12-25 17:09:23 +0000 textproc/kibana8: Update to 8.11.3 Release notes: https://www.elastic.co/guide/en/kibana/8.11/release-notes-8.11.3.html --- textproc/kibana8/Makefile | 22 ++-- textproc/kibana8/distinfo | 14 +-- .../kibana8/files/extra-node-re2-binding-gyp.patch | 118 +++++++++++++++------ textproc/kibana8/files/kibana.in | 8 +- textproc/kibana8/files/patch-abseil | 50 --------- textproc/kibana8/files/patch-config_kibana.yml | 12 ++- textproc/kibana8/files/patch-config_node.options | 14 +++ 7 files changed, 133 insertions(+), 105 deletions(-) diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile index 45493593d840..5efa3b3848ea 100644 --- a/textproc/kibana8/Makefile +++ b/textproc/kibana8/Makefile @@ -1,7 +1,6 @@ PORTNAME= kibana -DISTVERSION= 8.8.2 -DISTVERSIONSUFFIX= -darwin-x86_64 -PORTREVISION= 1 +DISTVERSION= 8.11.3 +DISTVERSIONSUFFIX= -linux-x86_64 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ @@ -14,15 +13,12 @@ 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 +BUILD_DEPENDS= npm-node18>=9.7.2:www/npm-node18 LIB_DEPENDS= libre2.so:devel/re2 \ libuv.so:devel/libuv -RUN_DEPENDS= ${LOCALBASE}/bin/node:www/node16 +RUN_DEPENDS= ${LOCALBASE}/bin/node:www/node18 -USES= compiler:c++17-lang cpe nodejs:16,build,run python:build +USES= compiler:c++17-lang cpe nodejs:18,build,run python:build CPE_VENDOR= elastic USE_GITHUB= nodefault @@ -50,9 +46,9 @@ BINS= kibana-encryption-keys kibana-keystore kibana-plugin \ ####################################################################### # Set node-nan version here -_NODE_NAN_VER= 2.17.0 +_NODE_NAN_VER= 2.18.0 # Set node-re version here -_NODE_RE2_VER= 1.19.1 +_NODE_RE2_VER= 1.20.0 ####################################################################### _NODECMD= ${LOCALBASE}/bin/node --version @@ -70,6 +66,8 @@ post-patch: .for _dirdel in ${_DIR2DEL} ${FIND} -s ${WRKSRC}/${_dirdel} -type d -empty -delete .endfor + ${REINPLACE_CMD} -e "s|%%WWWDIR%%|${WWWDIR}|g" \ + ${WRKSRC}/config/kibana.yml cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES} ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp @@ -103,6 +101,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample + ${INSTALL_DATA} ${WRKSRC}/config/node.options ${STAGEDIR}${ETCDIR}/node.options.sample (cd ${WRKSRC} && \ ${RM} -r config node optimize && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \ @@ -120,6 +119,7 @@ do-install: post-install: ${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST} + ${ECHO} "@sample ${ETCDIR}/node.options.sample" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} diff --git a/textproc/kibana8/distinfo b/textproc/kibana8/distinfo index 7f05be1a15cb..81311f89a29d 100644 --- a/textproc/kibana8/distinfo +++ b/textproc/kibana8/distinfo @@ -1,7 +1,7 @@ -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.19.1_GH0.tar.gz) = 414a77a9690b074f88803b8d680684895ce470957b2b0af2008199df20c4a244 -SIZE (uhop-node-re2-1.19.1_GH0.tar.gz) = 47211 +TIMESTAMP = 1703504995 +SHA256 (kibana-8.11.3-linux-x86_64.tar.gz) = 4848297835d7f72881f617fc0adcfa299693038c51fbae70065057702b46e245 +SIZE (kibana-8.11.3-linux-x86_64.tar.gz) = 308895953 +SHA256 (nodejs-nan-v2.18.0_GH0.tar.gz) = 376361b98b931840804f8a145b28fa32c8da2634a3f93c2cbc7fdb14c6274b71 +SIZE (nodejs-nan-v2.18.0_GH0.tar.gz) = 180599 +SHA256 (uhop-node-re2-1.20.0_GH0.tar.gz) = 4bd036e3810b6a3a2d87fceb008e528482761349618dd9bd45e96fe304ab69c3 +SIZE (uhop-node-re2-1.20.0_GH0.tar.gz) = 48072 diff --git a/textproc/kibana8/files/extra-node-re2-binding-gyp.patch b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch index b4dd40eea2b2..8633323f5292 100644 --- a/textproc/kibana8/files/extra-node-re2-binding-gyp.patch +++ b/textproc/kibana8/files/extra-node-re2-binding-gyp.patch @@ -1,37 +1,93 @@ ---- 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 @@ +--- binding.gyp.orig 2023-07-28 19:43:03.000000000 +0200 ++++ binding.gyp 2023-12-24 18:44:16.120540000 +0100 +@@ -14,86 +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" +- "vendor/re2/re2/bitmap256.cc", +- "vendor/re2/re2/bitstate.cc", +- "vendor/re2/re2/compile.cc", +- "vendor/re2/re2/dfa.cc", +- "vendor/re2/re2/filtered_re2.cc", +- "vendor/re2/re2/mimics_pcre.cc", +- "vendor/re2/re2/nfa.cc", +- "vendor/re2/re2/onepass.cc", +- "vendor/re2/re2/parse.cc", +- "vendor/re2/re2/perl_groups.cc", +- "vendor/re2/re2/prefilter.cc", +- "vendor/re2/re2/prefilter_tree.cc", +- "vendor/re2/re2/prog.cc", +- "vendor/re2/re2/re2.cc", +- "vendor/re2/re2/regexp.cc", +- "vendor/re2/re2/set.cc", +- "vendor/re2/re2/simplify.cc", +- "vendor/re2/re2/tostring.cc", +- "vendor/re2/re2/unicode_casefold.cc", +- "vendor/re2/re2/unicode_groups.cc", +- "vendor/re2/util/pcre.cc", +- "vendor/re2/util/rune.cc", +- "vendor/re2/util/strutil.cc", +- "vendor/abseil-cpp/absl/base/internal/cycleclock.cc", +- "vendor/abseil-cpp/absl/base/internal/low_level_alloc.cc", +- "vendor/abseil-cpp/absl/base/internal/raw_logging.cc", +- "vendor/abseil-cpp/absl/base/internal/spinlock.cc", +- "vendor/abseil-cpp/absl/base/internal/spinlock_wait.cc", +- "vendor/abseil-cpp/absl/base/internal/sysinfo.cc", +- "vendor/abseil-cpp/absl/base/internal/thread_identity.cc", +- "vendor/abseil-cpp/absl/base/internal/throw_delegate.cc", +- "vendor/abseil-cpp/absl/base/internal/unscaledcycleclock.cc", +- "vendor/abseil-cpp/absl/container/internal/raw_hash_set.cc", +- "vendor/abseil-cpp/absl/debugging/stacktrace.cc", +- "vendor/abseil-cpp/absl/debugging/symbolize.cc", +- "vendor/abseil-cpp/absl/flags/commandlineflag.cc", +- "vendor/abseil-cpp/absl/flags/flag.cc", +- "vendor/abseil-cpp/absl/flags/internal/commandlineflag.cc", +- "vendor/abseil-cpp/absl/flags/internal/flag.cc", +- "vendor/abseil-cpp/absl/flags/internal/private_handle_accessor.cc", +- "vendor/abseil-cpp/absl/flags/internal/program_name.cc", +- "vendor/abseil-cpp/absl/flags/marshalling.cc", +- "vendor/abseil-cpp/absl/flags/reflection.cc", +- "vendor/abseil-cpp/absl/flags/usage_config.cc", +- "vendor/abseil-cpp/absl/hash/internal/city.cc", +- "vendor/abseil-cpp/absl/hash/internal/hash.cc", +- "vendor/abseil-cpp/absl/hash/internal/low_level_hash.cc", +- "vendor/abseil-cpp/absl/numeric/int128.cc", +- "vendor/abseil-cpp/absl/strings/ascii.cc", +- "vendor/abseil-cpp/absl/strings/charconv.cc", +- "vendor/abseil-cpp/absl/strings/internal/charconv_bigint.cc", +- "vendor/abseil-cpp/absl/strings/internal/charconv_parse.cc", +- "vendor/abseil-cpp/absl/strings/internal/memutil.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/arg.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/bind.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/extension.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/output.cc", +- "vendor/abseil-cpp/absl/strings/internal/str_format/parser.cc", +- "vendor/abseil-cpp/absl/strings/match.cc", +- "vendor/abseil-cpp/absl/strings/numbers.cc", +- "vendor/abseil-cpp/absl/strings/str_cat.cc", +- "vendor/abseil-cpp/absl/strings/str_split.cc", +- "vendor/abseil-cpp/absl/strings/string_view.cc", +- "vendor/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc", +- "vendor/abseil-cpp/absl/synchronization/internal/graphcycles.cc", +- "vendor/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc", +- "vendor/abseil-cpp/absl/synchronization/internal/waiter.cc", +- "vendor/abseil-cpp/absl/synchronization/mutex.cc", +- "vendor/abseil-cpp/absl/time/clock.cc", +- "vendor/abseil-cpp/absl/time/duration.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc", +- "vendor/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc", +- "vendor/abseil-cpp/absl/time/time.cc", ], "cflags": [ "-std=c++2a", -@@ -46,7 +22,7 @@ +@@ -102,7 +22,7 @@ "-Wno-sign-compare", "-Wno-unused-parameter", "-Wno-missing-field-initializers", @@ -40,13 +96,15 @@ "-O3", "-g" ], -@@ -55,7 +31,8 @@ +@@ -111,9 +31,8 @@ "NOMINMAX" ], "include_dirs": [ - "second; -- result += groups[index].as_string(); -+ result += std::string(groups[index]); - } - i = nameEnd + 1 - data; - } diff --git a/textproc/kibana8/files/patch-config_kibana.yml b/textproc/kibana8/files/patch-config_kibana.yml index c5420a65b3ad..4fd4d0a02634 100644 --- a/textproc/kibana8/files/patch-config_kibana.yml +++ b/textproc/kibana8/files/patch-config_kibana.yml @@ -1,11 +1,15 @@ ---- config/kibana.yml.orig 2023-01-04 12:19:12 UTC +--- config/kibana.yml.orig 2023-12-25 14:26:21 UTC +++ config/kibana.yml -@@ -125,7 +125,7 @@ - #path.data: data +@@ -122,10 +122,10 @@ + + # =================== System: Other =================== + # The path where Kibana stores persistent data not saved in Elasticsearch. Defaults to data +-#path.data: data ++path.data: %%WWWDIR%%/data # Specifies the path where Kibana creates the process ID file. -#pid.file: /run/kibana/kibana.pid -+pid.file: /var/run/kibana.pid ++pid.file: /var/run/kibana/kibana.pid # Set the interval in milliseconds to sample system and process performance # metrics. Minimum is 100ms. Defaults to 5000ms. diff --git a/textproc/kibana8/files/patch-config_node.options b/textproc/kibana8/files/patch-config_node.options new file mode 100644 index 000000000000..051087956ccb --- /dev/null +++ b/textproc/kibana8/files/patch-config_node.options @@ -0,0 +1,14 @@ +--- config/node.options.orig 2023-12-25 14:25:19 UTC ++++ config/node.options +@@ -6,10 +6,7 @@ + #--max-old-space-size=4096 + + ## do not terminate process on unhandled promise rejection +- --unhandled-rejections=warn ++--unhandled-rejections=warn + + ## restore < Node 16 default DNS lookup behavior + --dns-result-order=ipv4first +- +-## enable OpenSSL 3 legacy provider +---openssl-legacy-provider