From nobody Wed May 07 20:07:35 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 4Zt5sN1Z7fz5vD0V; Wed, 07 May 2025 20:07:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt5sN0t01z3l3l; Wed, 07 May 2025 20:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746648456; 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=TJTbaU3HVfxqSytSNBAe5EYgcZL170VLZ6PEkb6dJyk=; b=QbLC8Z43PcBFZTjxQy0lZh2fFnK3ouGOjwWb2+F/IIYdDIIa6oueFAv2aFyZ8hhRPM9FKg jMqIG/jl3icuSKzFCvotZOAhnfOmiH+6OdyMR+z4Oo7p39Isoi52Jw8t6Sf5Y0ETRjoBg5 7UQonOkH/B6/P6P7EahlQC3joRV79ac81h0tdCGzUZ/fO7H8mnuNzxroYbMGohRlO8X3qt u8HLrt261dxAjL/RboWhzs8nGi+NZDlfmnIMDt1oSeNpUMfSUJM8Tdp4xPcUR3C2njUVGq xpWRmpokw+mMmpqw3VboDLSPAhpQCMh7WllLhb/BjtS50Opsk5ALvANNr6W4UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746648456; 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=TJTbaU3HVfxqSytSNBAe5EYgcZL170VLZ6PEkb6dJyk=; b=sop85CbiENCKoim7u08Vbp9zgGYh+6hTAvaVNMUU5vwCRPHRzZodA3aZm70bnERJ9kSTIJ jb/Jy0taq84U7RPjPuAQTBO+XR5Qp0G3m2/WWF3P3dsI1x/gIuuPD7djK0syDLac4w1Uba HwNcRuUFbKG3ONfMkCTOUmhIS+QA71pyLqbAvG8ir7RgSTdWd0+vJXh2ATVqFviBZTvUxk o7U1aV/HXWGdhQ6AERNv887NAWNvEJt51SQzYJwxJi0aaiyV0jq6a1Wnr/9Jlnr8EVj6VO /PPMdPZTZWK6JsOEu19gIw16pCrZGbbJDM0oItvwe1fTb0ffOp+rgIR6HQKucQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746648456; a=rsa-sha256; cv=none; b=CinbNA9lHAbeaeeLPPglx3cWC+37BbbDL0wE+6wD10unGCezWpp6cur5n/X/7JBG4CVs+V 3eSiIXsU9nXMeZykiwtUVbYbfenMc0raPrFrm5JfFSRwXilOaXK9O7svz+1zRIk25kZaiy gVUuQGHFgfFcnNdh5CpsYaCvaWYhcuc4Q+lK2V46sF12RwFx885+YotGVpfLnKayPH++I2 OpSH+cOATDJ1TMEzNL9y/mpGqGpYE7pvbPz67Or+nh7I4j0J/pTZrD8qvliVHCVt3pswNP cI0vO8jzwzZT4dBsiXzVhmfloaO+4saoq4xnAL1l4VWzuS6LbFOKFH8NKlzvuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt5sN0L2nzkFt; Wed, 07 May 2025 20:07:36 +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 547K7ZYW023478; Wed, 7 May 2025 20:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547K7Zqd023475; Wed, 7 May 2025 20:07:35 GMT (envelope-from git) Date: Wed, 7 May 2025 20:07:35 GMT Message-Id: <202505072007.547K7Zqd023475@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 8d64c95d5223 - main - net-mgmt/telegraf: Update to 1.34.3 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: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d64c95d5223cff2617cdffbb8c0a60ff8d4a1d7 Auto-Submitted: auto-generated The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d64c95d5223cff2617cdffbb8c0a60ff8d4a1d7 commit 8d64c95d5223cff2617cdffbb8c0a60ff8d4a1d7 Author: Palle Girgensohn AuthorDate: 2025-05-07 19:44:56 +0000 Commit: Palle Girgensohn CommitDate: 2025-05-07 20:07:31 +0000 net-mgmt/telegraf: Update to 1.34.3 Release notes: https://github.com/influxdata/telegraf/releases/tag/v1.34.3 --- net-mgmt/telegraf/Makefile | 5 ++++- net-mgmt/telegraf/distinfo | 10 +++++----- net-mgmt/telegraf/files/patch-config_config.go | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index 68b721ce7ffe..af91620f22f9 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,6 +1,6 @@ PORTNAME= telegraf DISTVERSIONPREFIX=v -DISTVERSION= 1.34.2 +DISTVERSION= 1.34.3 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org @@ -35,6 +35,9 @@ GROUPS= ${TELEGRAF_GROUP} TELEGRAF_LOGDIR=/var/log/${PORTNAME} +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config/config.go + post-install: ${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR} diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo index d36d63ceba8e..a01e86bb1876 100644 --- a/net-mgmt/telegraf/distinfo +++ b/net-mgmt/telegraf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1744714785 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = cc8644deb9eb449241d909b0d0dc8ca9d19943863bfe84d683c123511957a360 -SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.mod) = 27169 -SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 6eb4ae787983b612c4b85018c8c57d225d95bc202ae51209f019763906076d4d -SIZE (go/net-mgmt_telegraf/telegraf-v1.34.2/v1.34.2.zip) = 7051054 +TIMESTAMP = 1746522044 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.mod) = 495fb5a3b430b68bf92d257e615c839a6ba7b713ad160e0f86d4d15e072f2044 +SIZE (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.mod) = 27383 +SHA256 (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.zip) = 66739fe2f568a3c2aa7bc2f28250804afbc9de75ec4321f6528a8bde8f86dfbd +SIZE (go/net-mgmt_telegraf/telegraf-v1.34.3/v1.34.3.zip) = 7055291 diff --git a/net-mgmt/telegraf/files/patch-config_config.go b/net-mgmt/telegraf/files/patch-config_config.go new file mode 100644 index 000000000000..a6f1c04b7722 --- /dev/null +++ b/net-mgmt/telegraf/files/patch-config_config.go @@ -0,0 +1,18 @@ +--- config/config.go.orig 2025-05-06 11:09:55.069815000 +0000 ++++ config/config.go 2025-05-06 11:10:17.098859000 +0000 +@@ -481,12 +481,12 @@ + // Try to find a default config file at these locations (in order): + // 1. $TELEGRAF_CONFIG_PATH + // 2. $HOME/.telegraf/telegraf.conf +-// 3. /etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf ++// 3. /usr/local/etc/telegraf/telegraf.conf and /etc/telegraf/telegraf.d/*.conf + func GetDefaultConfigPath() ([]string, error) { + envfile := os.Getenv("TELEGRAF_CONFIG_PATH") + homefile := os.ExpandEnv("${HOME}/.telegraf/telegraf.conf") +- etcfile := "/etc/telegraf/telegraf.conf" +- etcfolder := "/etc/telegraf/telegraf.d" ++ etcfile := "/usr/local/etc/telegraf/telegraf.conf" ++ etcfolder := "/usr/local/etc/telegraf/telegraf.d" + + if runtime.GOOS == "windows" { + programFiles := os.Getenv("ProgramFiles")