From nobody Sun Oct 31 19:27:54 2021 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 EC2CB1829347; Sun, 31 Oct 2021 19:27:54 +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 4Hj5mB6JmPz3lSB; Sun, 31 Oct 2021 19:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B76D22380B; Sun, 31 Oct 2021 19:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19VJRsBL080126; Sun, 31 Oct 2021 19:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19VJRs5Z080125; Sun, 31 Oct 2021 19:27:54 GMT (envelope-from git) Date: Sun, 31 Oct 2021 19:27:54 GMT Message-Id: <202110311927.19VJRs5Z080125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3b79b890498d - main - net-mgmt/check_mk_agent: Fix patches for 2.0.0p13 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b79b890498dc57ca0816e1854034ad8ebad35e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b79b890498dc57ca0816e1854034ad8ebad35e7 commit 3b79b890498dc57ca0816e1854034ad8ebad35e7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-10-31 19:26:58 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-10-31 19:27:39 +0000 net-mgmt/check_mk_agent: Fix patches for 2.0.0p13 --- net-mgmt/check_mk_agent/files/patch-check__mk__agent.freebsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 2185ffe1e486..1516ac616f85 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,6 +1,6 @@ ---- check_mk_agent.freebsd.orig 2020-02-05 09:13:20 UTC +--- check_mk_agent.freebsd.orig 2021-10-31 19:22:57 UTC +++ check_mk_agent.freebsd -@@ -41,15 +41,15 @@ +@@ -27,15 +27,15 @@ $MK_RUN_SYNC_PARTS || { export LC_ALL=C unset LANG @@ -17,10 +17,10 @@ # Make sure, locally installed binaries are found -PATH=$PATH:/usr/local/bin:/usr/local/sbin +PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin + [ -d /var/qmail/bin ] && PATH=$PATH:/var/qmail/bin # All executables in PLUGINSDIR will simply be executed and their - # ouput appended to the output of the agent. Plugins define their own -@@ -109,7 +109,7 @@ function run_cached() { +@@ -102,7 +102,7 @@ function run_cached() { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then