git: 73922d6b363a - main - net-mgmt/librenms: Fix start on FreeBSD 14/nginx
Date: Sat, 07 Oct 2023 11:52:59 UTC
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=73922d6b363a6902a05721d9102386ce657b03d4 commit 73922d6b363a6902a05721d9102386ce657b03d4 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2023-10-07 11:49:41 +0000 Commit: Dan Langille <dvl@FreeBSD.org> 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 = () +