From nobody Wed Dec 20 15:34:58 2023 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 4SwHgQ3WpQz554Sh; Wed, 20 Dec 2023 15:34:58 +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 4SwHgQ2cNZz4g2V; Wed, 20 Dec 2023 15:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703086498; 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=V4lrvy7tNR9jHp42mfR2qx19kQk3rZEGFaoyafIHK0g=; b=yd3gtKNbEVw5PT20IaOIbpERdu45jatttb7eyBfdcpG2xteQpE+AoqOSnvcI7FLTsOvFaN iXfbDo0x1nseiNOSy2XpHgcMIZugWDX+1NQQhX3qYU4VneVC3NExsfhqm5eGFwh/3Y7xjD XJQ0wgkhnSzFpPBkOuZCgrCqq0RN+tagLTkbplRPbl86IGXMJ8ddgr08gEcDTJu/caIriK ztDD6rFwHtMBtFjFM30hp/czeHwKlCXK2fr1gXEt4EPswLlR7+KHoVoropQkKoaaWrbd/p 261SUrk33or7LNwdgsZ31IyF7zPTBqEQ4u6ghEMJwlpuHIroCS4zAW0h4SFIcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703086498; a=rsa-sha256; cv=none; b=s+du+DzkEpHRHjcY+Iryoup8gniyUbgK3xvKGaOmTlUsfUxYqBvNgjkfe0WYh4mo8N5qTK s/r92Og6bm/vHYBFfqizySl5cvdf9S8D1NqTiwfiU6TmsWrdj38fMW04AEKAZs8b9DiVIj XN6OXWwm52P2IeLb5MKbFPGl5k7xo4PL9z2UiB+RNJVG/RN3buTqAAS9pzUU1S+TVkWlwJ V6sthzXBj2tgXfmlgUFjvdgalQ+IjzTmAbFUDV9fRdHwOFffeVxzbO6qpP9DN6L7E+j7z4 NDZ+YIJ0Y4F1Gze+1CuYTYqTn9ss/gNzfJ2lUg+HxaHpHOak1yp6F52ZbowVsg== 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=1703086498; 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=V4lrvy7tNR9jHp42mfR2qx19kQk3rZEGFaoyafIHK0g=; b=qAFKeU48h2dL0GkNT/+E0M1obnd5OxygFS7SnpFcMGOsxPhia+i+nwz3Y5ZPRrJJG5txJd r8p4eJ5fRDN5+1jVQZ7jiqYqN+MzuAFlmyom5njl6kCnmzWSwX4wNTMkPBTDLfCIDT7E2B tM73qhtdFmAL7ER9TXA5Fl5+e8G9A5nKvC9/YTzJKW/ewRh6mfr5UQsxUPYK1E2BN/4ovJ gOxnYUPwx/hT5oXMf/gyauuZuaGr2jkTq57woX6020L9D610dga5BT50bQkL3vkMiUkq3F 6H/DKxxrWoPeD8Cr0Q2pmBcAPiTdmARfCdcFX5nfSlrZgiXuK2U+9of+Q+U/BQ== 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 4SwHgQ1gMyztpH; Wed, 20 Dec 2023 15:34:58 +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 3BKFYwmJ047681; Wed, 20 Dec 2023 15:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BKFYw3m047678; Wed, 20 Dec 2023 15:34:58 GMT (envelope-from git) Date: Wed, 20 Dec 2023 15:34:58 GMT Message-Id: <202312201534.3BKFYw3m047678@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: d7df63431951 - main - net-mgmt/librenms: Unbreak capture page 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: d7df634319511db8234937808723b1b7695a4288 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7df634319511db8234937808723b1b7695a4288 commit d7df634319511db8234937808723b1b7695a4288 Author: Dan Langille AuthorDate: 2023-12-20 15:34:23 +0000 Commit: Dan Langille CommitDate: 2023-12-20 15:34:23 +0000 net-mgmt/librenms: Unbreak capture page My previous patch was broken, now fixed. --- net-mgmt/librenms/Makefile | 1 + net-mgmt/librenms/files/patch-includes_html_output_capture.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 140c730b38bd..38bd57339b9d 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,6 @@ PORTNAME= librenms PORTVERSION= 23.11.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor diff --git a/net-mgmt/librenms/files/patch-includes_html_output_capture.inc.php b/net-mgmt/librenms/files/patch-includes_html_output_capture.inc.php index 22e95d6b950a..9db94e486f2b 100644 --- a/net-mgmt/librenms/files/patch-includes_html_output_capture.inc.php +++ b/net-mgmt/librenms/files/patch-includes_html_output_capture.inc.php @@ -5,7 +5,7 @@ switch ($type) { case 'poller': - $cmd = ['php', \LibreNMS\Config::get('install_dir') . '/lnms', 'device:poll', $hostname, '--no-data', '-vv']; -+ $cmd = [''%%LOCALBASE%%/bin/php', \LibreNMS\Config::get('install_dir') . '/lnms', 'device:poll', $hostname, '--no-data', '-vv']; ++ $cmd = ['%%LOCALBASE%%/bin/php', \LibreNMS\Config::get('install_dir') . '/lnms', 'device:poll', $hostname, '--no-data', '-vv']; $filename = "poller-$hostname.txt"; break; case 'snmpwalk': @@ -14,7 +14,7 @@ break; case 'discovery': - $cmd = ['php', \LibreNMS\Config::get('install_dir') . '/discovery.php', '-h', $hostname, '-d']; -+ $cmd = [''%%LOCALBASE%%/bin/php', \LibreNMS\Config::get('install_dir') . '/discovery.php', '-h', $hostname, '-d']; ++ $cmd = ['%%LOCALBASE%%/bin/php', \LibreNMS\Config::get('install_dir') . '/discovery.php', '-h', $hostname, '-d']; $filename = "discovery-$hostname.txt"; break; default: