diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 290ff8c4554e..3865be12ea1c 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,241 +1,249 @@ PORTNAME= librenms -PORTVERSION= 23.7.0 -PORTREVISION= 2 +PORTVERSION= 23.8.2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor DISTFILES= ${PORTNAME}-vendor-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:vendor MAINTAINER= dvl@FreeBSD.org COMMENT= Autodiscovering PHP/MySQL/SNMP based network monitoring WWW= https://www.librenms.org LICENSE= GPLv3 IGNORE_WITH_PHP= 82 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dotenv>0:www/py-python-dotenv@${PY_FLAVOR} \ bash:shells/bash \ dot:graphics/graphviz \ rrdtool:databases/rrdtool \ snmpget:net-mgmt/net-snmp \ sudo:security/sudo USES= cpe php python shebangfix USE_GITHUB= yes USE_PHP= ctype curl dom fileinfo filter gd hash json ldap mbstring \ mysqli openssl pdo pdo_mysql phar posix session simplexml snmp \ sockets tokenizer xml xmlwriter zip USE_RC_SUBR= librenms SHEBANG_FILES= ../${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 \ ../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/new-os.php \ scripts/pre-commit.php scripts/purge-port.php \ scripts/removespikes.php scripts/removespikes.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 SUB_FILES+= pkg-message SUB_LIST+= GROUP="${WWWGRP}" \ PHP="${PHPBASE}/bin/php" \ PYTHON=${PYTHON_CMD} \ PYTHON_VERSION=${PYTHON_VERSION} \ USER="${WWWOWN}" \ WWWDIR="${WWWDIR}" USERS= www PORTDOCS= * PORTEXAMPLES= snmpd.conf.example DBDIR= /var/db/${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS \ NMAP WMIC X11 OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI MYSQLD_DESC= Use local MySQL server WMIC_DESC= Enable support for WMI polling FPING_RUN_DEPENDS= fping:net/fping IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt MYSQLD_USES= mysql:server MYSQLD_USES_OFF= mysql:client NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client X11_RUN_DEPENDS= mtr:net/mtr 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 _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 # It sits here so you remember to update it with each release -_RELEASE_TIMESTAMP= 1689568961 +_RELEASE_TIMESTAMP= 1692632893 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ - scripts sql-schema tests + scripts tests _DOCS= AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt \ README.md # these are directories which require a generic @DIR entry in pkg-plist _STORAGE_DIRS= app app/public debugbar framework framework/cache \ framework/cache/data framework/sessions framework/testing \ framework/views logs # these are directories which require a generic @DIR entry in pkg-plist _OTHER_DIRS= database/seeders/config html/plugins html/js/lang \ resources/views/overview/custom tests/Browser/console \ tests/Browser/source tests/Browser/screenshots \ vendor/librenms/laravel-vue-i18n-generator/tests/output \ vendor/symfony/string/Resources/bin post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/LibreNMS/Validations/Php.php ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/LibreNMS/Util/Version.php ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/LibreNMS/Util/Version.php ${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${_RELEASE_TIMESTAMP}|g' ${WRKSRC}/LibreNMS/Util/Version.php + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/LibreNMS/Validations/System.php ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/includes/html/output/capture.inc.php ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config.php.default ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dist/librenms-scheduler.cron + ${REINPLACE_CMD} 's|%%WWWDIR%%|${WWWDIR}|g' ${WRKSRC}/dist/librenms-scheduler.cron + ${REINPLACE_CMD} 's|%%USER%%|${WWWOWN}|g' ${WRKSRC}/dist/librenms-scheduler.cron ${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php ${RM} -rf ${WRKSRC}/logs do-install: ${MKDIR} ${STAGEDIR}/${WWWDIR} .for dir in ${_ROOT_DIRS} ${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir} (cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir}) .endfor .for f in ${_ROOT_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor .for f in ${_SCRIPT_FILES} ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor ${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor (cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor) # As of 1.66_1, the package installs bootstrap/cache # This was previously left to the code to populate. # That causese problems when the code doesn't do that update. ${MV} ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache/* ${STAGEDIR}/${WWWDIR}/bootstrap/cache/ ${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache # similarly with html/js/lang ${MV} ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang/* ${STAGEDIR}/${WWWDIR}/html/js/lang/ ${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang -# Make daily.sh executable -# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh -# lnms does not fall into any other +x category -# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/lnms # Files in scripts dir should be executable ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable ${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ '*.php' -exec ${CHMOD} +x {} \; # these values should be outside the www tree now ${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} ${MKDIR} ${STAGEDIR}${DBDIR} ${MKDIR} ${STAGEDIR}${DBDIR}/storage ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} (cd ${STAGEDIR}/${WWWDIR} && ${LN} -s ../../../..${DBDIR}/storage) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} .for f in ${_DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} .endfor cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} .endfor post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' -or -name '.gitignore' ')' -delete ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} # we do this file separately because it needs a different chmod/chown # it will eventually contains secrets ${INSTALL_DATA} ${WRKSRC}/.env.example ${STAGEDIR}/${WWWDIR} ${ECHO_CMD} "@dir(www,www,0775) ${DBDIR}/storage" >> ${TMPPLIST} ${ECHO_CMD} "@dir(www,www,0775) ${DBDIR}" >> ${TMPPLIST} ${ECHO_CMD} "@dir(www,www,0775) /var/log/${PORTNAME}" >> ${TMPPLIST} ${ECHO_CMD} "@(root,www,0750) ${WWWDIR}/.env.example" >> ${TMPPLIST} ${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/bootstrap/cache" >> ${TMPPLIST} ${ECHO_CMD} "@dir(www,www,0775) /var/run/${PORTNAME}" >> ${TMPPLIST} .for f in ${_STORAGE_DIRS} ${MKDIR} ${STAGEDIR}/${DBDIR}/storage/${f} ${ECHO_CMD} "@dir(root,www,0775) ${DBDIR}/storage/${f}" >> ${TMPPLIST} .endfor .for f in ${_OTHER_DIRS} ${ECHO_CMD} "@dir(root,www,0775) ${WWWDIR}/${f}" >> ${TMPPLIST} .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${FILESDIR}/newsyslog.conf.sample ${STAGEDIR}/${PREFIX}/etc/newsyslog.conf.d/librenms.conf.sample ${ECHO_CMD} "@dir etc/newsyslog.conf.d" >> ${TMPPLIST} ${ECHO_CMD} "@sample etc/newsyslog.conf.d/librenms.conf.sample" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}${PREFIX}/etc/cron.d/ + ${INSTALL_DATA} ${WRKSRC}/dist/librenms-scheduler.cron ${STAGEDIR}${PREFIX}/etc/cron.d/librenms + ${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. + ${RLN} ${STAGEDIR}${WWWDIR}/lnms ${STAGEDIR}${PREFIX}/bin/lnms + ${ECHO_CMD} "bin/lnms" >> ${TMPPLIST} + .include diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index 944426062ff4..7b9c2fbf3373 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1689616753 -SHA256 (librenms-vendor-23.7.0.tar.gz) = a452f2e4488e637de673be1975e8d5e0a898f9281ac45d01cd5d70fd0b2dc9f0 -SIZE (librenms-vendor-23.7.0.tar.gz) = 27501794 -SHA256 (librenms-librenms-23.7.0_GH0.tar.gz) = c9a8be8a830b292a490eeb491367b831a463336934629272c4c1f205e792dae3 -SIZE (librenms-librenms-23.7.0_GH0.tar.gz) = 57749912 +TIMESTAMP = 1692633919 +SHA256 (librenms-vendor-23.8.2.tar.gz) = 015bc3d79bd7312fcafbf14161f93093e1f395d134311c38c54daf7d47c445f3 +SIZE (librenms-vendor-23.8.2.tar.gz) = 27762415 +SHA256 (librenms-librenms-23.8.2_GH0.tar.gz) = e232f39bdf2e3238bbcbc60122b59ac7141f5760d7552aee41f3f9382f95a710 +SIZE (librenms-librenms-23.8.2_GH0.tar.gz) = 57980278 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php new file mode 100644 index 000000000000..744b3533df01 --- /dev/null +++ b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php @@ -0,0 +1,24 @@ +--- LibreNMS/Validations/System.php.orig 2023-08-21 20:59:01 UTC ++++ LibreNMS/Validations/System.php +@@ -40,19 +40,12 @@ class System extends BaseValidation + { + $install_dir = $validator->getBaseDir(); + +- $lnms = str_replace('lnms:', '', rtrim(`whereis -b lnms 2>/dev/null`)); ++ $lnms = rtrim(`/usr/bin/find /usr/local/bin -name lnms`); + $path = rtrim(`echo "\$PATH"`); + + // if couldn't find lnms and we have PATH + if (empty($lnms) && ! empty($path)) { +- $paths = explode(':', $path); +- $bin = Arr::first(array_intersect([ +- '/usr/local/bin', +- '/usr/bin', +- '/bin', +- ], $paths), null, Arr::last($paths)); +- +- $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms $bin/lnms"); ++ $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms %%LOCALBASE%%/bin/lnms"); + } + + $bash_completion_dir = '/etc/bash_completion.d/'; diff --git a/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py index dd8aae6e73de..d0f9187b21cf 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py +++ b/net-mgmt/librenms/files/patch-LibreNMS_wrapper.py @@ -1,11 +1,11 @@ ---- LibreNMS/wrapper.py.orig 2023-07-30 23:13:00 UTC +--- LibreNMS/wrapper.py.orig 2023-08-21 15:25:48 UTC +++ LibreNMS/wrapper.py -@@ -278,7 +278,7 @@ def poll_worker( +@@ -280,7 +280,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( ++ command = "/usr/local/bin/php php {} -h {}".format(executable, device_id) + if modules is not None and len(str(modules).strip()): + module_str = re.sub("\s", "", str(modules).strip()) + command = command + " -m {}".format(module_str) diff --git a/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron b/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron new file mode 100644 index 000000000000..8e5019131323 --- /dev/null +++ b/net-mgmt/librenms/files/patch-dist_librenms-scheduler.cron @@ -0,0 +1,6 @@ +--- dist/librenms-scheduler.cron.orig 2023-08-21 17:05:45 UTC ++++ dist/librenms-scheduler.cron +@@ -1 +1,2 @@ +-* * * * * php /opt/librenms/artisan schedule:run --no-ansi --no-interaction > /dev/null 2>&1 ++#minute hour mday month wday who command ++* * * * * %%USER%% %%LOCALBASE%%/bin/php %%WWWDIR%%/artisan schedule:run --no-ansi --no-interaction > /dev/null 2>&1 diff --git a/net-mgmt/librenms/files/pkg-message.in b/net-mgmt/librenms/files/pkg-message.in index de2af2e0d07d..9baa7ecdf16a 100644 --- a/net-mgmt/librenms/files/pkg-message.in +++ b/net-mgmt/librenms/files/pkg-message.in @@ -1,141 +1,132 @@ [ { type: install message: <