From nobody Sat Oct 07 11:52:59 2023 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 4S2kFR5BjPz4wr7B; Sat, 7 Oct 2023 11:52:59 +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 4S2kFR4hBfz3fqP; Sat, 7 Oct 2023 11:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696679579; 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=4tyxeNXYgHsKf5NFlhjRRcj44aSmZxkpnhSS7CmUqIs=; b=hCM0byDIp4lDUfFhvdAg3JOSqVUJ0ttJRGfK/a9YyWWYkSB5jfO1KnmWBEj5w99aDRKLYz s3NOUjZ7Qp3DlK71LLLDp1l4ixkB/a3OZcxwZ86lmtXeP0W7qqRd6H8JPKmoe6hCnX2+ON Sms7CYBdqUETQbWA5Bdth9pJbNabc8dS8O3xQ8h5pZZ9rXz03nh3DlKL4T1fw4/Jn6mTcH CG9F5BsrKgk2QAc6vMNgiejVzSRCJ6D+IKoNOdfrm915scUdnRuIxLiyMw2wNYe66uJmaA bQVoBfCd4Rhjo4E2hJm+Lw70eVs3x/NNOzCoMbIg2+5M4kMQkk7SN0EmdzFj5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696679579; a=rsa-sha256; cv=none; b=jRaNkA1KSNBBLlDteNx1gkhr2pn7dk9yTjw9tVGqaK+KgcnHZNgTzyDv+iHG6o0AxTAuVe nJtzIpaCGuASdLHd2zKcqHjgsDwmSpeR2K4wN9hPq9jlBfAqBkTd0tYXuc4wDDgZeRWfWG KhdRaJ0Ibfj5dMkvw+AC2uft/aQLLqkrTD/gWK4y2KPL3R4fwvgVj+VOk1cNa35j7dPhk9 74ie7hlnb2LVwRuwfQg6XBCRpwV7MyndaTEs69lMbSewhGQYIQXaSTMCyxrqtYIVQYY+MU B7a8J1gIzogp9BM16dJXQNQE8hUZy+LZcYVdNXkpi33tp5mPBgvrmThMOBbTKw== 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=1696679579; 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=4tyxeNXYgHsKf5NFlhjRRcj44aSmZxkpnhSS7CmUqIs=; b=eZiwhuDJbFZsWYfYZzuSl+7+mYuQCBND0+VBgHhkPM3q+88C6/WZMOV89At5xB+nlPbsh9 xUhTJ+N9maxP6EUupdV3J+FpU+dMDDRCTySc8UuPb6HlLrn494oC6t5fB6vgzNYXOWee7z QOTALUfBkazBYAa2HbL9J8s3G4jn7WcZgDYFKJGguPLikvGTOWtNttmsouKxkIrjZYEv4D SXFpnTinjjPbzYK/ZO7sQrB2/w6Q/ydI2RqawdvrpUCjZBxTz6aXMruXuLjZPIXnwIlR93 Upbx6/pJyP8vQQ0F/L7+mX/kE/Wi52SK4ooVNGxK+XGgAEy3Uh27XbkXfV0kHA== 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 4S2kFR3lRyzVXs; Sat, 7 Oct 2023 11:52:59 +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 397BqxNm037185; Sat, 7 Oct 2023 11:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 397BqxAf037182; Sat, 7 Oct 2023 11:52:59 GMT (envelope-from git) Date: Sat, 7 Oct 2023 11:52:59 GMT Message-Id: <202310071152.397BqxAf037182@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: 73922d6b363a - main - net-mgmt/librenms: Fix start on FreeBSD 14/nginx 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73922d6b363a6902a05721d9102386ce657b03d4 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=73922d6b363a6902a05721d9102386ce657b03d4 commit 73922d6b363a6902a05721d9102386ce657b03d4 Author: Dan Langille AuthorDate: 2023-10-07 11:49:41 +0000 Commit: Dan Langille CommitDate: 2023-10-07 11:49:41 +0000 net-mgmt/librenms: Fix start on FreeBSD 14/nginx This may be a path issue or a shell issue, but nginx on FreeBSD 14 is not finding /usr/local/bin/php. The fix: use /usr/local/bin/php as we have done with other patches. PR: 274248 --- net-mgmt/librenms/Makefile | 2 +- net-mgmt/librenms/files/patch-LibreNMS_____init____.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index d3f45e23c89b..1b64004a9593 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,6 +1,6 @@ PORTNAME= librenms PORTVERSION= 23.9.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor diff --git a/net-mgmt/librenms/files/patch-LibreNMS_____init____.py b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py index bf16fd97c055..a5a301d57649 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_____init____.py +++ b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py @@ -1,4 +1,4 @@ ---- LibreNMS/__init__.py.orig 2023-10-04 13:52:17 UTC +--- LibreNMS/__init__.py.orig 2023-09-19 01:59:06 UTC +++ LibreNMS/__init__.py @@ -167,7 +167,7 @@ def get_config_data(base_dir): ) @@ -9,3 +9,12 @@ try: exit_code, output = command_runner(config_cmd, timeout=300, stderr=False) if exit_code != 0: +@@ -194,7 +194,7 @@ def call_script(script, args=()): + """ + if script.endswith(".php"): + # save calling the sh process +- base = ("/usr/bin/env", "php") ++ base = ("/usr/local/bin/php",) + else: + base = () +