From nobody Mon Jul 14 11:49:55 2025 X-Original-To: dev-commits-ports-all@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 4bggbm1kRbz61fGC; Mon, 14 Jul 2025 11:49:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bggbl51FKz3XVK; Mon, 14 Jul 2025 11:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752493795; 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=mJAVDiUfh2hUDTft4/urR62L9I8gu9EQJwRw1xhOu/o=; b=YhIi6cBowGxdOq+egKolHEPmxB0FjCuyU3HhA/Xc9Ds/y86N7GuAfEQ8g90aKZWAEd9Odt cV4dZ2pegSC8gO6Rx6YxokISQ/qjsOeCjxL7p0QMks2AseGub7zx3v41Ai9jUJkOOnLLOi DVrytSfgaUZbxh0OEOobomg+iP7rLvu1y7l865eeqWGkLDWSDzw7fSLwuWa3doNY5EKPh3 5JS0o5p2KiGDFqJmn5p+Vwvw5J+2B7wErgfd2iWBJreR3eapZ0jgqPrtHuK0u85KKOYvwj xi59Ttuu4QAeJrB+qvcXGGB+8weuTtYsuMji3askJhBmjmhe5W8QmiI1iTZohQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752493795; 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=mJAVDiUfh2hUDTft4/urR62L9I8gu9EQJwRw1xhOu/o=; b=v5YO5uWghZ4i6hTijAQo1wlfHpo7rm6smg58gMCSmEWbTWDflVwVIwFPNiH8QiK+tyzX0U d6Me6Hfns4ADD00jz41a9R9N7Gq2ovVZa+IetISJtBqFsG4buTKDUknUGxA8F+5fYo4Pg5 AXm9/RFobSniSiCj4CqwoJBJy5jS/YF67+vzybFY7WZ0jOBpTclRXEcJixOackDviJUPYD vFyesX4/UjHhD/8Aufm3IhA3RAQUPTgjlck24CbtWzhQGYxm0eYLxDUfA7MtAc/7oYrUqO peKLWZfQ5ER0eqHij2gXS0Wn83LoJ5UqfLswlapt9hrtPjavrnN7IA5J85jm+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752493795; a=rsa-sha256; cv=none; b=IrGhfFceO/BCEiOQK/shNGYT+XACT4t8VEl5AS5sufEBFj4VxwetL4Jl96xjT6h5SRxVdP G/JcvmlvauduVJpP3qxLOpkmCt1CvQ566Uucg9sYykg0pycSIPK/PoXzY5bzi0W4xmOXPE SYrIu35lGviibOYpLcPI4I3nsyI/xiM9M990tTwiwYvbsrgTmm7t/DcvWTA+clnBW0OEm3 XhOorJjriYQLOkfZLKAJ5lurIR7ddzZ9OiwdfbFdby9EvLbaldTPOAQt3halwOfbUP7VyA uwITQOyZT7isK0cih+SlHnpEnyK1uAw0sME29GOsp63jh59lhW4CwvcfQZEl8w== 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 4bggbl4T3Czsxq; Mon, 14 Jul 2025 11:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EBntHh000277; Mon, 14 Jul 2025 11:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EBntTx000274; Mon, 14 Jul 2025 11:49:55 GMT (envelope-from git) Date: Mon, 14 Jul 2025 11:49:55 GMT Message-Id: <202507141149.56EBntTx000274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 918dc3c45f2a - main - net-mgmt/icingadb: Update to 1.4.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 918dc3c45f2a2f19313fb4d918468cb0af8bd9e1 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=918dc3c45f2a2f19313fb4d918468cb0af8bd9e1 commit 918dc3c45f2a2f19313fb4d918468cb0af8bd9e1 Author: Dan Langille AuthorDate: 2025-07-14 11:45:48 +0000 Commit: Dan Langille CommitDate: 2025-07-14 11:49:26 +0000 net-mgmt/icingadb: Update to 1.4.0 re: https://github.com/Icinga/icingadb/releases/tag/v1.4.0 Note the changed requirements in the above. PR: 285943 --- net-mgmt/icingadb/Makefile | 5 ++--- net-mgmt/icingadb/distinfo | 14 +++++++------- net-mgmt/icingadb/files/patch-internal_config_config.go | 11 +++++++++++ net-mgmt/icingadb/files/patch-pkg_config_config.go | 11 ----------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/net-mgmt/icingadb/Makefile b/net-mgmt/icingadb/Makefile index eb0452038bf2..93e83b0e2dcf 100644 --- a/net-mgmt/icingadb/Makefile +++ b/net-mgmt/icingadb/Makefile @@ -1,7 +1,6 @@ PORTNAME= icingadb DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 -PORTREVISION= 7 +DISTVERSION= 1.4.0 CATEGORIES= net-mgmt MAINTAINER= dvl@FreeBSD.org @@ -39,7 +38,7 @@ SUB_LIST+= ICINGA2USER=${ICINGA2USER} \ PREFIX=${PREFIX} post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX|${PREFIX}|g' ${WRKSRC}/pkg/config/config.go + @${REINPLACE_CMD} -e 's|%%PREFIX|${PREFIX}|g' ${WRKSRC}/internal/config/config.go post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/net-mgmt/icingadb/distinfo b/net-mgmt/icingadb/distinfo index b692bebb072e..d169b14713ee 100644 --- a/net-mgmt/icingadb/distinfo +++ b/net-mgmt/icingadb/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1722340400 -SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.mod) = 7ae965983fb00d3e058aad4e8d38d15eeac66c314cc8b6830a4b3b2983dbfe12 -SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.mod) = 1502 -SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.zip) = a7ff457bad4ef78a5c65d3fc06571541bec5deee6f0fabbfd88a888e263dcc6d -SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.zip) = 3379031 -SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/Icinga-icingadb-v1.2.0_GH0.tar.gz) = f3452f796a471e848c2e51d2820444df8907be7f972cdd139e2abcd6f66a4890 -SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/Icinga-icingadb-v1.2.0_GH0.tar.gz) = 3345811 +TIMESTAMP = 1752491323 +SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.mod) = af22816190cdd4935f3dd696a4e98f6b2246d8580460173f126c408299258d3c +SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.mod) = 1625 +SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.zip) = eb065d6314499169207e9d47b04714cb5afa858a3fe7b4ce5a5c943295bdf930 +SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.zip) = 3354764 +SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/Icinga-icingadb-v1.4.0_GH0.tar.gz) = e244998da7c6f817fc590ca0852451a12fee4bc8fda8d3183c4f6c4df1ab38bd +SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/Icinga-icingadb-v1.4.0_GH0.tar.gz) = 3343081 diff --git a/net-mgmt/icingadb/files/patch-internal_config_config.go b/net-mgmt/icingadb/files/patch-internal_config_config.go new file mode 100644 index 000000000000..418f02d52e51 --- /dev/null +++ b/net-mgmt/icingadb/files/patch-internal_config_config.go @@ -0,0 +1,11 @@ +--- internal/config/config.go.orig 2025-07-14 11:25:55 UTC ++++ internal/config/config.go +@@ -56,7 +56,7 @@ type Flags struct { + Version bool `long:"version" description:"print version and exit"` + + // Config is the path to the config file. If not provided, it defaults to DefaultConfigPath. +- Config string `short:"c" long:"config" description:"path to config file (default: /etc/icingadb/config.yml)"` ++ Config string `short:"c" long:"config" description:"path to config file (default: %%PREFIX%%/etc/icingadb/config.yml)"` + // default must be kept in sync with DefaultConfigPath. + + // DatabaseAutoImport results in an initial schema check and update; mostly for containerized setups. diff --git a/net-mgmt/icingadb/files/patch-pkg_config_config.go b/net-mgmt/icingadb/files/patch-pkg_config_config.go deleted file mode 100644 index 1b5b0066118c..000000000000 --- a/net-mgmt/icingadb/files/patch-pkg_config_config.go +++ /dev/null @@ -1,11 +0,0 @@ ---- pkg/config/config.go.orig 2023-09-08 17:19:58 UTC -+++ pkg/config/config.go -@@ -46,7 +46,7 @@ type Flags struct { - // Version decides whether to just print the version and exit. - Version bool `long:"version" description:"print version and exit"` - // Config is the path to the config file -- Config string `short:"c" long:"config" description:"path to config file" required:"true" default:"/etc/icingadb/config.yml"` -+ Config string `short:"c" long:"config" description:"path to config file" required:"true" default:"%%PREFIX%%/etc/icinga2/icingadb.yml"` - } - - // FromYAMLFile returns a new Config value created from the given YAML config file.