From nobody Tue Aug 20 20:32:40 2024 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 4WpLkJ4JfWz5SYfn; Tue, 20 Aug 2024 20:32:40 +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 4WpLkJ3Qytz4hFJ; Tue, 20 Aug 2024 20:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724185960; 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=mdkLCpdQhLk1ZKr8hLmjW9fqcEcXsQ7VDOStB3yIjU8=; b=WXIRMBQKUgJKWiFAHN17AZOTJWNaT14qrwv/x6vvkJLbRb1we57qnCXQF5L9IEvrjQidJX BshKgujDAdKUYVEHTOIO4YrUyF4+UMq6O6dnHzPvjEbzfzPsVaPItfhrlMSigBGT8UWSjE YcIbv69kqwuQUcgLLCrPeR9CEpuDwWlZtvHUSjHLiYYh1+a6YlLzzTPgrRasE62bW7USVT u6PUc70IcJpToHduYC5UjSThOydcomWD1/HYAV+t8iJoA7URIzjpUJxYkZnhebJXUxjCAB UgnmIsgFdvN4PtMuaJaAChbroXJGdmUab7GqiVaWCWAhR1vOOHCsGFZKv0XtyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724185960; a=rsa-sha256; cv=none; b=wi+0JAdO+Y++k2aXQHawnqgJg9ULP/DLxyUY1p1LDZbSnbPhKojQJ55gF5IVDJCrek8b3w 74yYM20hf5vVqHr/OP8QolmMmZnD2f+PlIeLp6SqiM0fCZ9k6nAXZ2FFdADQfg2MFy5OHb JrEBrNWH3decYv/5GCogOdGD6hlKKY56MB5JLJd1RBtREnP7f4z8Vq17qpQIaUF3Zqq68S 99XuP1RPXpG954B5N+Jr5hlQWfXvuPwz5M1ZYWczVKpFSj1S/eaAlM/SWdAlxpMk3WLjss aSC2TpuXEQOSZT4KRXPjS8oS5xDU6BzO67LQPx3SpwOiH3MiH8x0uQyj9rSX/g== 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=1724185960; 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=mdkLCpdQhLk1ZKr8hLmjW9fqcEcXsQ7VDOStB3yIjU8=; b=OtxG82PzFKh915wKm85HbFbOrhfyQqbj42ymYCt5dwKo9EXjhHVYU+JkU+96rkKgW9uexE YE323aWb2m3QwNu7JLs17k0igokmzpuRoMCu/c8X7FH0Bmq6qL87BGvXunsJjvOrAYaVgs PX/cI6DUI+Ee8M0tTZhKtS69YOpe39zPFpm8mzZCt1XsSFq/+rW9adprl6otvYwOuAwGo9 4GhTFXcH8wcaw0ac5h6y9o+XY8WdTDL8KKa6o1VBDuXWucRRe1YsObPUrnESkkwd2xf6p8 ex/vc7V0UrVAysUSO60Mfr5EDNYK/W/70hLoy6bidLFcaMFSD8cmpE2EnZnFIQ== 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 4WpLkJ32PFzFvW; Tue, 20 Aug 2024 20:32:40 +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 47KKWeKf053320; Tue, 20 Aug 2024 20:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47KKWevD053317; Tue, 20 Aug 2024 20:32:40 GMT (envelope-from git) Date: Tue, 20 Aug 2024 20:32:40 GMT Message-Id: <202408202032.47KKWevD053317@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 61d4ddfb22cf - main - net-mgmt/check_mk_agent: update to 2.3.0p12 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: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61d4ddfb22cf8e9e3048887938550dabeb985b51 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=61d4ddfb22cf8e9e3048887938550dabeb985b51 commit 61d4ddfb22cf8e9e3048887938550dabeb985b51 Author: Ian Valentine AuthorDate: 2024-08-20 20:27:35 +0000 Commit: Zsolt Udvari CommitDate: 2024-08-20 20:32:23 +0000 net-mgmt/check_mk_agent: update to 2.3.0p12 Add dependencies on sysutils/ipmitool, devel/libstatgrab, ftp/wget, and USES=python since those are listed as required in the docs. [https://docs.checkmk.com/latest/en/agent_freebsd.html] Switch to PREFIX (from LOCALBASE). Change MK_VARDIR from /var/lib/check_mk_agent to /var/db/check_mk_agent. Update the pkg-message to remove reference to devel/libstatgrab and devel/libstatgrab since those are included now, and changed the docs URL to be current. Changelog: https://checkmk.com/werks PR: 280953 Approved by: submitter is maintainer --- net-mgmt/check_mk_agent/Makefile | 21 ++++++++++++--------- net-mgmt/check_mk_agent/distinfo | 14 +++++++------- .../files/patch-check__mk__agent.freebsd | 14 ++++++++------ net-mgmt/check_mk_agent/files/pkg-message.in | 4 +--- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/net-mgmt/check_mk_agent/Makefile b/net-mgmt/check_mk_agent/Makefile index aec345b5c61b..7d2e7cf89031 100644 --- a/net-mgmt/check_mk_agent/Makefile +++ b/net-mgmt/check_mk_agent/Makefile @@ -1,10 +1,10 @@ PORTNAME= check_mk_agent DISTVERSIONPREFIX= v -DISTVERSION= 2.1.0p22 +DISTVERSION= 2.3.0p12 CATEGORIES= net-mgmt -MASTER_SITES= https://raw.githubusercontent.com/tribe29/checkmk/${DISTVERSIONFULL}/agents/:agent \ - https://raw.githubusercontent.com/tribe29/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \ - https://raw.githubusercontent.com/tribe29/checkmk/${DISTVERSIONFULL}/:license +MASTER_SITES= https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/agents/:agent \ + https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/doc/agents/:doc \ + https://raw.githubusercontent.com/Checkmk/checkmk/${DISTVERSIONFULL}/:license DISTFILES= ${_CHECKMK_AGENT}:agent \ README.FreeBSD:doc \ COPYING:license @@ -17,9 +17,12 @@ WWW= https://checkmk.com/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= bash>0:shells/bash +RUN_DEPENDS= bash:shells/bash \ + ipmitool:sysutils/ipmitool \ + statgrab:devel/libstatgrab \ + wget:ftp/wget -USES= perl5 shebangfix +USES= perl5 python:3.4+ shebangfix USE_PERL5= run SHEBANG_FILES= ${_CHECKMK_AGENT} @@ -44,14 +47,14 @@ PORTDOCS= README.FreeBSD OPTIONS_DEFINE= DOCS _CHECKMK_AGENT= ${PORTNAME}.freebsd -_CHECKMK_CONFDIR= ${LOCALBASE}/etc/check_mk -_CHECKMK_LIBDIR= ${LOCALBASE}/lib/check_mk_agent +_CHECKMK_LIBDIR= ${PREFIX}/lib/check_mk_agent +_CHECKMK_CONFDIR= ${PREFIX}/etc/check_mk post-patch: @${REINPLACE_CMD} \ -e 's|%%CHECKMK_LIBDIR%%|${_CHECKMK_LIBDIR}|' \ -e 's|%%CHECKMK_CONFDIR%%|${_CHECKMK_CONFDIR}|' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/${_CHECKMK_AGENT} do-install: diff --git a/net-mgmt/check_mk_agent/distinfo b/net-mgmt/check_mk_agent/distinfo index 93c84aaa2b46..807877b24a33 100644 --- a/net-mgmt/check_mk_agent/distinfo +++ b/net-mgmt/check_mk_agent/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1677107456 -SHA256 (check_mk_agent-2.1.0.p22/check_mk_agent.freebsd) = c99b59beb8d0eee0916e8dc4b7f9dcce08afb62e157856e785837aadb0f071ec -SIZE (check_mk_agent-2.1.0.p22/check_mk_agent.freebsd) = 28094 -SHA256 (check_mk_agent-2.1.0.p22/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f -SIZE (check_mk_agent-2.1.0.p22/README.FreeBSD) = 1349 -SHA256 (check_mk_agent-2.1.0.p22/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f -SIZE (check_mk_agent-2.1.0.p22/COPYING) = 15174 +TIMESTAMP = 1723755628 +SHA256 (check_mk_agent-2.3.0.p12/check_mk_agent.freebsd) = e90757599339de56cab8f5059a1006d20f6bdfe9cb5cfd8460b95deee8039ffd +SIZE (check_mk_agent-2.3.0.p12/check_mk_agent.freebsd) = 32404 +SHA256 (check_mk_agent-2.3.0.p12/README.FreeBSD) = 01094a2197ca0a3a43ac16098c0f800d2ee808db2fd9a2f133f4bad04062ec5f +SIZE (check_mk_agent-2.3.0.p12/README.FreeBSD) = 1349 +SHA256 (check_mk_agent-2.3.0.p12/COPYING) = fbaab079995bef694ef8451f0f763b91b44e5b57b8e2a487d2a240b395187a7f +SIZE (check_mk_agent-2.3.0.p12/COPYING) = 15174 diff --git a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd index 0f20cdf271c2..b772f38e4d8e 100644 --- a/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd +++ b/net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd @@ -1,24 +1,26 @@ ---- check_mk_agent.freebsd.orig 2023-02-22 23:45:20 UTC +--- check_mk_agent.freebsd.orig 2024-08-15 18:32:18 UTC +++ check_mk_agent.freebsd -@@ -105,8 +105,8 @@ set_up_get_epoch() { +@@ -117,9 +117,9 @@ set_variable_defaults() { # set_variable_defaults() { - : "${MK_LIBDIR:=/usr/local/lib/check_mk_agent}" - : "${MK_CONFDIR:=/etc/check_mk}" +- : "${MK_VARDIR:=/var/lib/check_mk_agent}" + : "${MK_LIBDIR:=%%CHECKMK_LIBDIR%%}" + : "${MK_CONFDIR:=%%CHECKMK_CONFDIR%%}" - : "${MK_VARDIR:=/var/lib/check_mk_agent}" ++ : "${MK_VARDIR:=/var/db/check_mk_agent}" : "${MK_LOGDIR:=/var/log/check_mk_agent}" -@@ -126,8 +126,8 @@ preamble_1() { + # some 'booleans' +@@ -138,8 +138,8 @@ preamble_1() { # Make sure locally installed binaries are found # Only add binaries if they are not already in the path! If you append to path in a loop the process will # eventually each the 128k size limit for the environment and become a zombie process. See execve manpage. - [ "${PATH#*"/usr/local/bin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/bin" - [ "${PATH#*"/usr/local/sbin"}" != "${PATH}" ] || PATH="${PATH}:/usr/local/sbin" -+ [ "${PATH#*"%%LOCALBASE%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/bin" -+ [ "${PATH#*"%%LOCALBASE%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%LOCALBASE%%/sbin" ++ [ "${PATH#*"%%PREFIX%%/bin"}" != "${PATH}" ] || PATH="${PATH}:%%PREFIX%%/bin" ++ [ "${PATH#*"%%PREFIX%%/sbin"}" != "${PATH}" ] || PATH="${PATH}:%%PREFIX%%/sbin" [ -d "/var/qmail/bin" ] && { [ "${PATH#*"/var/qmail/bin"}" != "${PATH}" ] || PATH="${PATH}:/var/qmail/bin"; } # All executables in PLUGINSDIR will simply be executed and their diff --git a/net-mgmt/check_mk_agent/files/pkg-message.in b/net-mgmt/check_mk_agent/files/pkg-message.in index e09f614b1b4c..66c7125a0218 100644 --- a/net-mgmt/check_mk_agent/files/pkg-message.in +++ b/net-mgmt/check_mk_agent/files/pkg-message.in @@ -2,8 +2,6 @@ { type: install message: <