From nobody Sun Jul 30 23:55:30 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 4RDdY00Jcgz4pbtT; Sun, 30 Jul 2023 23:55:31 +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 4RDdXz1R2Lz4229; Sun, 30 Jul 2023 23:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690761331; 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=Hcs8VRTYJT4tybGJW/niqo+oP+NrFFv0oDIYbLdhyTE=; b=MdneClPrutkel1M4cagoovjro66OxUz4ky50jadprGI+/Q9f7oQawFC6w7x5BXHPq8A90I OY2h9OKuUIyBar8Vo+AWTue4vMuN92Coc56C85XyeLxfIUWwmNfLTP/9lLMloY9Zs0OLur DjYDfH7kyeKcbQvlWX462SSxGunOO1w7iqChe673kerNRfDfu3Ip1sBjRHBKhe84RLvh0T Fv2OFEX+SMVbKJALbQJo82cSwWIIHscov6mxE7/29JmI3vBHVIkHq9G7Rq7n4kruk6DFKx NdWCbc2Xiiu4hCyJfhDNp1q5swT3RLICDJQi3Hru1rSLPyUryStqD6LxAOzrfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690761331; 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=Hcs8VRTYJT4tybGJW/niqo+oP+NrFFv0oDIYbLdhyTE=; b=SFI3V28fHY7ZXufiMcAby32+1gKfyErzYhR7QHbiIP3MRfWOZuR/R7FBU8xQ0jziv8PkHY ugLRZMiQSnNbLp0Kt7c2Z4+urkMS8ZSzuwq94Vtozdx45ADwcWDUZ7swdBuEpUEJ1LVA3Z ilgJK37+CQ+jL3WewhmggXsqx2jk2vcGJkALw4p8foOE3VeGm5rKkXt1fhgyI6AXBIjsXE kLG2xlCRQi+0KjATA8P82QEbh0c3VEOjFIebaPMAjbm7KSaw4l2Eg4nZP2ajCyFhP0DWoY tzCoxCeDOL0qh/u38vcBiNWVdpcUldSXiDnldkQ1pX41zaX5tQ2lHukzMece5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690761331; a=rsa-sha256; cv=none; b=aIVc7KJbQ5Ni7vsmacdL4pgwCR4YAJ14oKuFtU3/PmW0xwbbbIuLXskeO6aS46/JV+FnO3 GTD+0BRwJ7gM65PQ+fw/gBkr5TG1/N6QNmtjFYn3ISIbSzU0yhcJkIUq8GmpI2hg1d5b9a ukbGaQGzkPBhFIlmu34IzcNliGphIoKcA2+Nv8JEm4H6q1p/D9RTYV4fMgXYkt3c+pSu06 6QXEhtnacI2EuM15eSs+xxz9qQrgxhjCrDYYKAAAG86i9xrLFJlXQ8JWBQAxNA5cTyvwtj mU5WSqEhV9Pxmfa07IWS1yWtWlsHqJp/9GB3xe3d92FgAFZcGZj/lJBw9imymQ== 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 4RDdXy6GFtzZCP; Sun, 30 Jul 2023 23:55:30 +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 36UNtUNX001224; Sun, 30 Jul 2023 23:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36UNtUnZ001223; Sun, 30 Jul 2023 23:55:30 GMT (envelope-from git) Date: Sun, 30 Jul 2023 23:55:30 GMT Message-Id: <202307302355.36UNtUnZ001223@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: 917c4c6dd4bb - main - net-mgmt/librenms: add many files to SHEBANG_FILES 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: 917c4c6dd4bbda3ce239856697e3607e8cfb4381 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=917c4c6dd4bbda3ce239856697e3607e8cfb4381 commit 917c4c6dd4bbda3ce239856697e3607e8cfb4381 Author: Dan Langille AuthorDate: 2023-07-30 23:51:50 +0000 Commit: Dan Langille CommitDate: 2023-07-30 23:55:25 +0000 net-mgmt/librenms: add many files to SHEBANG_FILES While here, run portfmt over the Makefile - that accounts for the majority of changes seen in the diff patch LibreNMS/wrapper.py which contains "/usr/bin/env php" mid-file PR: 260085 --- net-mgmt/librenms/Makefile | 59 +++++++++++++++++------ net-mgmt/librenms/files/patch-LibreNMS_wrapper.py | 11 +++++ 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index f505c2851ee7..8ddd7a98f94a 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -32,18 +32,47 @@ USE_PHP= ctype curl dom fileinfo filter gd hash json ldap mbstring \ USE_RC_SUBR= librenms SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \ - poller-wrapper.py poller.php scripts/auth_test.php \ - scripts/check_requirements.py \ - scripts/dynamic_check_requirements.py scripts/github-remove \ - scripts/ifAlias \ + ../librenms-vendor-${PORTVERSION}/bin/carbon \ + ../librenms-vendor-${PORTVERSION}/bin/doctrine-dbal \ + ../librenms-vendor-${PORTVERSION}/bin/patch-type-declarations \ + ../librenms-vendor-${PORTVERSION}/bin/php-parse \ + ../librenms-vendor-${PORTVERSION}/bin/psysh \ + ../librenms-vendor-${PORTVERSION}/bin/validate-json \ + ../librenms-vendor-${PORTVERSION}/bin/var-dump-server \ + ../librenms-vendor-${PORTVERSION}/bin/yaml-lint \ + ../librenms-vendor-${PORTVERSION}/doctrine/dbal/bin/doctrine-dbal \ + ../librenms-vendor-${PORTVERSION}/justinrainbow/json-schema/bin/validate-json \ + ../librenms-vendor-${PORTVERSION}/nesbot/carbon/bin/carbon \ + ../librenms-vendor-${PORTVERSION}/nikic/php-parser/bin/php-parse \ + ../librenms-vendor-${PORTVERSION}/predis/predis/bin/create-command-test \ + ../librenms-vendor-${PORTVERSION}/psy/psysh/bin/psysh \ + ../librenms-vendor-${PORTVERSION}/symfony/error-handler/Resources/bin/extract-tentative-return-types.php \ + ../librenms-vendor-${PORTVERSION}/symfony/error-handler/Resources/bin/patch-type-declarations \ + ../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 \ + 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/Migration/Standard_Conversion/convert_no_xml.sh \ scripts/Migration/Standard_Conversion/destwork_no_xml.sh \ scripts/Migration/Standard_Conversion/mkdir.sh \ scripts/Migration/XML_Conversion/convert.sh \ scripts/Migration/XML_Conversion/destwork.sh \ - scripts/Migration/XML_Conversion/mkdir.sh \ + scripts/Migration/XML_Conversion/mkdir.sh scripts/new-os.php \ + scripts/pre-commit.php scripts/purge-port.php \ scripts/removespikes.php scripts/removespikes.pl \ - scripts/watchmaillog/watchmaillog.pl + scripts/rename-mibs.php scripts/rrdstep.php \ + 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 NO_ARCH= yes NO_BUILD= yes @@ -52,6 +81,7 @@ SUB_FILES+= pkg-message SUB_LIST+= GROUP="${WWWGRP}" \ PHP="${PHPBASE}/bin/php" \ PYTHON=${PYTHON_CMD} \ + PYTHON_VERSION=${PYTHON_VERSION} \ USER="${WWWOWN}" \ WWWDIR="${WWWDIR}" @@ -84,15 +114,14 @@ X11_RUN_DEPENDS_OFF= mtr:net/mtr-nox11 X11_USES= magick:6 X11_USES_OFF= magick:6,nox11 -_ROOT_FILES= addhost.php alerts.php artisan \ - billing-calculate.php check-services.php composer.json \ - composer.lock config.php.default config_to_json.php \ - cronic daily.php delhost.php discovery-wrapper.py \ - discovery.php dist-pollers.php irc.php \ - librenms-service.py mkdocs.yml pbin.sh phpunit.xml \ - ping.php poll-billing.php poller.php poller-wrapper.py \ - renamehost.php snmp-scan.py snmptrap.php syslog.php \ - validate.php +_ROOT_FILES= addhost.php alerts.php artisan billing-calculate.php \ + check-services.php composer.json composer.lock \ + config.php.default config_to_json.php cronic daily.php \ + delhost.php discovery-wrapper.py discovery.php \ + dist-pollers.php irc.php librenms-service.py mkdocs.yml \ + pbin.sh phpunit.xml ping.php poll-billing.php \ + poller.php poller-wrapper.py renamehost.php \ + snmp-scan.py snmptrap.php syslog.php validate.php _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py new file mode 100644 index 000000000000..dd8aae6e73de --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py @@ -0,0 +1,11 @@ +--- LibreNMS/wrapper.py.orig 2023-07-30 23:13:00 UTC ++++ LibreNMS/wrapper.py +@@ -278,7 +278,7 @@ def poll_worker( + os.path.dirname(os.path.dirname(os.path.realpath(__file__))), + wrappers[wrapper_type]["executable"], + ) +- command = "/usr/bin/env php {} -h {}".format(executable, device_id) ++ command = "/usr/local/bin/php {} -h {}".format(executable, device_id) + if debug: + command = command + " -d" + exit_code, output = command_runner(