From nobody Wed Oct 04 15:31:34 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 4S0zF26nCBz4w6kp; Wed, 4 Oct 2023 15:31:34 +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 4S0zF26Kmwz4T9T; Wed, 4 Oct 2023 15:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433494; 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=gDjdj9z8M1De65d5QsgPGqoDTBPAsY5fak8kHDXq8NY=; b=C7DXBlPespM4/KHOm+Ftk6kIs2qoOwG1bHITQsr7FnsfouqDOconpnAY5jnAqDs6ydW3Mw xiSlpHOEZ3MD7rMMZ7noCNq35KNmH3oOJy/OF6qr/zMICLXKC+QEADzRZ2ypDLsLqnO1h8 vS+OVOivZdQcckWPBHESPy5fDfNwTL75IzAC5rmBYlZncOQlefCwvaDfFfshuDoHyBS/bU jhIgUdj0/EVAgiI8CGEDNweOp1Be4XF7MK6OEkilch+RN+/K5jCvXZvNNyfnjnsZkNTDkK TSaszLmG3I6bWRFQYPxwtmFLcAvhdc+4QSqzXql78IDvdQo9aXKKy9AXX4Jq4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696433494; a=rsa-sha256; cv=none; b=wZt52VrAgdeL/AX0SPUxx/rOuJP+8FkBeSOIX1IdxF7UZUtyMsWOXxHPhmDebiymzrmzeE QqPtmr8IVpxnxQCi0nMaNs4z02w9XXe48NZ9s6krqbo1MsWmC1ramgm4u5pftVaAUQqC7l PleRecpGjs+lpGsSX/f7N+NMmCZlDsBAWL2SkOfffIAgqyxqtyBYuoDloZdCaIjO5c93Zg t+My/cQMTF+jWU/ABI9H2ypCqJI0i434X1/wzVq7QUwwnOK6vhOX/06wjRTKVO3MylYsxk lWNnUUbN7g3+lIrgg73NSVAmywlatHnW+qLiuRZAdan2fQQX6b3uUs3h6819tQ== 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=1696433494; 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=gDjdj9z8M1De65d5QsgPGqoDTBPAsY5fak8kHDXq8NY=; b=bI7qvneY/Q/Kjeq4Mz7r1AYC5H33SjhnwDi17Xd5sczGBZFpBwJ3Gwca08zlqPhjKqcDvV lhTUhyKIvqNMvQ/ml8iA4tqRbCKpB98J/vrg52L1WYIAiO4ejoDNrwy+c73V3BF15EG5gr LkAnCgzXkEk25zT0HjQJtWi+7I21oXM54yNY9E5d+3EEOnME3yMn3Pe6F9vwUlKrqhiahu zm4anCGjA4XUB1xUQ4xgUP4QHQmvfUr4nVcyZNtOayDVB5WZAq1LgxsDn1SGJ4xrsdGy9k toviR6vzOp9mz+zs/f8YzHKK8HtfnfFeAs+7ErG180wdGaEozbohk21/NZVmoA== 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 4S0zF25PmpzjbC; Wed, 4 Oct 2023 15:31:34 +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 394FVYa4001366; Wed, 4 Oct 2023 15:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394FVYR3001364; Wed, 4 Oct 2023 15:31:34 GMT (envelope-from git) Date: Wed, 4 Oct 2023 15:31:34 GMT Message-Id: <202310041531.394FVYR3001364@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: 8ff190a6fb75 - main - net-mgmt/librenms: remove /usr/bin/env usage 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: 8ff190a6fb75c40acd4ebf3a579187ebd8a26d57 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ff190a6fb75c40acd4ebf3a579187ebd8a26d57 commit 8ff190a6fb75c40acd4ebf3a579187ebd8a26d57 Author: Dan Langille AuthorDate: 2023-10-04 14:10:57 +0000 Commit: Dan Langille CommitDate: 2023-10-04 15:30:33 +0000 net-mgmt/librenms: remove /usr/bin/env usage This problem occurred on Nginx, but not Apache. Instead of "/usr/bin/env php", use "/usr/local/bin/php". While here: * add more to SHEBANG_FILES * portfmnt PR: 274248 --- net-mgmt/librenms/Makefile | 26 +++++++++++++--------- .../librenms/files/patch-LibreNMS_____init____.py | 11 +++++++++ net-mgmt/librenms/files/patch-snmp-scan.py | 21 +++++++++++++++++ 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index eb9d6042edfb..d3f45e23c89b 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,6 @@ PORTNAME= librenms PORTVERSION= 23.9.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -31,7 +32,8 @@ USE_PHP= ctype curl dom fileinfo filter gd hash json ldap mbstring \ sockets tokenizer xml xmlwriter zip USE_RC_SUBR= librenms -SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \ +SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/paragonie/random_compat/build-phar.sh \ + ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \ ../librenms-vendor-${PORTVERSION}/bin/carbon \ ../librenms-vendor-${PORTVERSION}/bin/doctrine-dbal \ ../librenms-vendor-${PORTVERSION}/bin/patch-type-declarations \ @@ -50,15 +52,19 @@ SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf ../librenms-vendor-${PORTVERSION}/symfony/var-dumper/Resources/bin/var-dump-server \ ../librenms-vendor-${PORTVERSION}/symfony/yaml/Resources/bin/yaml-lint \ addhost.php alerts.php artisan billing-calculate.php \ - check-services.php config_to_json.php daily.php delhost.php \ - discovery.php dist-pollers.php irc.php LibreNMS/wrapper.py lnms \ - ping.php poll-billing.php poller-wrapper.py poller.php \ - renamehost.php scripts/auth_test.php \ + check-services.php config_to_json.php cronic daily.php daily.sh \ + delhost.php discovery-wrapper.py discovery.php dist-pollers.php \ + irc.php librenms-service.py LibreNMS/command_runner.py \ + LibreNMS/wrapper.py lnms misc/lnms-completion.bash \ + misc/smokeping-debian.example misc/smokeping-rhel.example \ + pbin.sh ping.php poll-billing.php poller-wrapper.py poller.php \ + renamehost.php scripts/auth_test.php scripts/bash_lint.sh \ scripts/check_requirements.py scripts/collect-port-polling.php \ scripts/collect-snmp-data.php scripts/composer_wrapper.php \ scripts/dynamic_check_requirements.py scripts/gen_rancid.php \ - scripts/gen_smokeping.php scripts/github-remove scripts/ifAlias \ - scripts/json-app-tool.php scripts/manage_bills.php \ + scripts/gen_smokeping.php scripts/git-pre-commit-hook.sh \ + scripts/github-remove scripts/ifAlias scripts/json-app-tool.php \ + scripts/manage_bills.php \ scripts/Migration/Standard_Conversion/convert_no_xml.sh \ scripts/Migration/Standard_Conversion/destwork_no_xml.sh \ scripts/Migration/Standard_Conversion/mkdir.sh \ @@ -71,7 +77,7 @@ SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf scripts/save-test-data.php scripts/syslog-notify-oxidized.php \ scripts/test-alert.php scripts/test-template.php \ scripts/tune_port.php scripts/watchmaillog/watchmaillog.pl \ - snmptrap.php syslog.php validate.php + snmp-scan.py snmptrap.php syslog.php validate.php NO_ARCH= yes NO_BUILD= yes @@ -241,8 +247,8 @@ post-install: ${ECHO_CMD} "@dir etc/cron.d" >> ${TMPPLIST} ${ECHO_CMD} "etc/cron.d/librenms" >> ${TMPPLIST} - # avoid the "Global lnms shortcut not installed." validataion warning. - # this can also be run as root. +# avoid the "Global lnms shortcut not installed." validataion warning. +# this can also be run as root. ${RLN} ${STAGEDIR}${WWWDIR}/lnms ${STAGEDIR}${PREFIX}/bin/lnms ${ECHO_CMD} "bin/lnms" >> ${TMPPLIST} diff --git a/net-mgmt/librenms/files/patch-LibreNMS_____init____.py b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py new file mode 100644 index 000000000000..bf16fd97c055 --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py @@ -0,0 +1,11 @@ +--- LibreNMS/__init__.py.orig 2023-10-04 13:52:17 UTC ++++ LibreNMS/__init__.py +@@ -167,7 +167,7 @@ def get_config_data(base_dir): + ) + logger.debug("Traceback:", exc_info=True) + +- config_cmd = ["/usr/bin/env", "php", "%s/config_to_json.php" % base_dir] ++ config_cmd = "/usr/local/bin/php %s/config_to_json.php" % base_dir + try: + exit_code, output = command_runner(config_cmd, timeout=300, stderr=False) + if exit_code != 0: diff --git a/net-mgmt/librenms/files/patch-snmp-scan.py b/net-mgmt/librenms/files/patch-snmp-scan.py new file mode 100644 index 000000000000..8c8ad9ddfc03 --- /dev/null +++ b/net-mgmt/librenms/files/patch-snmp-scan.py @@ -0,0 +1,21 @@ +--- snmp-scan.py.orig 2023-10-04 12:28:53 UTC ++++ snmp-scan.py +@@ -133,8 +133,7 @@ def scan_host(scan_ip): + return Result(scan_ip, hostname, Outcome.NODNS, "DNS not Resolved") + + arguments = [ +- "/usr/bin/env", +- "lnms", ++ "/usr/local/bin/lnms", + "device:add", + "-g", + POLLER_GROUP, +@@ -259,7 +258,7 @@ Example: 192.168.0.1/32 will be treated as a single ho + chdir(install_dir) + try: + CONFIG = json.loads( +- check_output(["/usr/bin/env", "php", "config_to_json.php"]).decode() ++ check_output(["/usr/local/bin/php", "config_to_json.php"]).decode() + ) + except CalledProcessError as e: + parser.error(