Index: head/net-mgmt/librenms/Makefile =================================================================== --- head/net-mgmt/librenms/Makefile (revision 431599) +++ head/net-mgmt/librenms/Makefile (revision 431600) @@ -1,145 +1,146 @@ # Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 201607 +PORTVERSION= 1.23 +PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= net-mgmt -MASTER_SITES= http://www.librenms.org/ +USE_GITHUB= yes +GH_ACCOUNT= librenms + MAINTAINER= bofh@FreeBSD.org COMMENT= Autodiscovering PHP/MySQL/SNMP based network monitoring LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= librenms USES= python shebangfix -SHEBANG_FILES= html/js/makemini.pl mibs/process.pl scripts/agent-local/bind \ - scripts/agent-local/dmi scripts/agent-local/dpkg \ - scripts/agent-local/drbd scripts/agent-local/hddtemp \ - scripts/agent-local/memcached scripts/agent-local/mysql \ - scripts/agent-local/rpm scripts/agent-local/temperature \ - scripts/agent-local/tinydns scripts/apache-stats.py \ - scripts/check_mk_agent scripts/cron.sh scripts/cron-hourly.sh \ - scripts/cron-minute.sh scripts/get-geshi.sh \ - scripts/get-jpgraph.sh scripts/ifAlias \ +SHEBANG_FILES= html/js/makemini.pl mibs/process.pl \ + scripts/cron-hourly.sh scripts/cron-minute.sh \ + scripts/cron.sh scripts/deploy-docs.sh scripts/ifAlias \ 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 validate.php \ - scripts/postfix-queues scripts/removespikes.php \ + scripts/removespikes.php scripts/agent-local/nfs-stats.sh \ scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl USE_PHP= ctype filter gd json mcrypt mysql session snmp tokenizer xml WANT_PHP_CLI= yes NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ dot:graphics/graphviz \ ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \ ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \ snmpget:net-mgmt/net-snmp \ bash:shells/bash OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES X11 OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC APACHEMOD_DESC= Use PHP with Apache 2.2+ module 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 PYPOLLER_DESC= Enable Python Poller Wrapper FPING_RUN_DEPENDS= fping:net/fping IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick \ mtr:net/mtr X11_RUN_DEPENDS_OFF= Magick-config:graphics/ImageMagick-nox11 \ mtr:net/mtr-nox11 WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client MYSQLD_USE= MYSQL=server MYSQLD_USE_OFF= MYSQL=client SUB_FILES+= pkg-message SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ billing-calculate.php \ check-services.php config_to_json.php daily.php daily.sh \ delhost.php discovery.php dist-pollers.php irc.php \ poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \ snmp-scan.php snmptrap.php syslog.php validate.php -ROOT_DIRS= contrib html includes lib mibs scripts sql-schema +ROOT_DIRS= LibreNMS contrib html includes lib mibs scripts sql-schema DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md PORTDOCS= * PORTEXAMPLES= snmp.conf.example snmpd.conf.example NO_ARCH= yes .if !defined(PACKAGE_BUILDING) APACHEMOD_VARS_ON= WANT_PHP_MOD=yes APACHEMOD_USE= APACHE_RUN=22+ .else # Package builder doesn't create php5 with module WANT_PHP_WEB= yes .endif post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php + ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' \ + ${WRKSRC}/includes/common.php 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 # Create empty rrd dir writable by www @${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd + @${CHMOD} 0775 ${STAGEDIR}/${WWWDIR}/rrd # 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 {} \; 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: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} @${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST} @${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${INSTALL_DATA} ${WRKSRC}/config.php.default \ ${STAGEDIR}/${WWWDIR}/config.php.sample @${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST} @${ECHO} @dir ${WWWDIR}/rrd >> ${TMPPLIST} @${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/build >> ${TMPPLIST} @${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/docs >> ${TMPPLIST} @${ECHO} @dir ${WWWDIR}/lib/influxdb-php/vendor/guzzlehttp/guzzle/tests >> ${TMPPLIST} @${ECHO_CMD} "@group" >> ${TMPPLIST} @${ECHO_CMD} "@owner" >> ${TMPPLIST} .include Index: head/net-mgmt/librenms/distinfo =================================================================== --- head/net-mgmt/librenms/distinfo (revision 431599) +++ head/net-mgmt/librenms/distinfo (revision 431600) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469519614 -SHA256 (librenms-librenms-201607_GH0.tar.gz) = b044d35824d6179f09d92500b873ba3cecb55dc0882f9f1f24e72b1802ecd5a7 -SIZE (librenms-librenms-201607_GH0.tar.gz) = 31554157 +TIMESTAMP = 1483966724 +SHA256 (librenms-librenms-1.23_GH0.tar.gz) = 68ca903e46d4ae62869fabb4ad4e8cb6da2cabdc16095808f29cdee03de2dfc1 +SIZE (librenms-librenms-1.23_GH0.tar.gz) = 31302664 Index: head/net-mgmt/librenms/files/patch-config.php.default =================================================================== --- head/net-mgmt/librenms/files/patch-config.php.default (revision 431599) +++ head/net-mgmt/librenms/files/patch-config.php.default (nonexistent) @@ -1,11 +0,0 @@ ---- config.php.default.orig 2015-09-06 16:13:08 UTC -+++ config.php.default -@@ -15,7 +15,7 @@ $config['memcached']['host'] = "local - $config['memcached']['port'] = 11211; - - ### Locations - it is recommended to keep the default --#$config['install_dir'] = "/opt/librenms"; -+$config['install_dir'] = "/usr/local/www/librenms"; - - ### This should *only* be set if you want to *force* a particular hostname/port - ### It will prevent the web interface being usable form any other hostname Property changes on: head/net-mgmt/librenms/files/patch-config.php.default ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/librenms/files/patch-includes_defaults.inc.php =================================================================== --- head/net-mgmt/librenms/files/patch-includes_defaults.inc.php (revision 431599) +++ head/net-mgmt/librenms/files/patch-includes_defaults.inc.php (revision 431600) @@ -1,52 +1,43 @@ ---- includes/defaults.inc.php.orig 2015-10-16 23:09:41 UTC -+++ includes/defaults.inc.php -@@ -40,7 +40,7 @@ $config['project_name'] = 'LibreNMS'; - $config['project_id'] = strtolower($config['project_name']); - - $config['temp_dir'] = '/tmp'; --$config['install_dir'] = '/opt/'.$config['project_id']; -+$config['install_dir'] = '/usr/local/www/'.$config['project_id']; - $config['log_dir'] = $config['install_dir'].'/logs'; - - // MySQL extension to use -@@ -50,26 +50,26 @@ $config['db']['extension'] = 'mysq +--- includes/defaults.inc.php.orig 2017-01-01 15:50:41.000000000 +0000 ++++ includes/defaults.inc.php 2017-01-09 13:24:06.964918000 +0000 +@@ -36,26 +36,26 @@ $config['own_hostname'] = 'localhost'; - + // Location of executables -$config['rrdtool'] = '/usr/bin/rrdtool'; +$config['rrdtool'] = '/usr/local/bin/rrdtool'; $config['rrdtool_version'] = 1.4; // Doesn't need to contain minor numbers. -$config['fping'] = '/usr/bin/fping'; -$config['fping6'] = 'fping6'; +$config['fping'] = '/usr/local/sbin/fping'; +$config['fping6'] = '/usr/local/sbin/fping6'; $config['fping_options']['retries'] = 3; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3; $config['fping_options']['millisec'] = 200; -$config['snmpwalk'] = '/usr/bin/snmpwalk'; -$config['snmpget'] = '/usr/bin/snmpget'; -$config['snmpbulkwalk'] = '/usr/bin/snmpbulkwalk'; +$config['snmpwalk'] = '/usr/local/bin/snmpwalk'; +$config['snmpget'] = '/usr/local/bin/snmpget'; +$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk'; $config['whois'] = '/usr/bin/whois'; -$config['ping'] = '/bin/ping'; -$config['mtr'] = '/usr/bin/mtr'; -$config['nmap'] = '/usr/bin/nmap'; -$config['nagios_plugins'] = '/usr/lib/nagios/plugins'; -$config['ipmitool'] = '/usr/bin/ipmitool'; -$config['virsh'] = '/usr/bin/virsh'; -$config['dot'] = '/usr/bin/dot'; -$config['sfdp'] = '/usr/bin/sfdp'; +$config['ping'] = '/sbin/ping'; +$config['mtr'] = '/usr/local/bin/mtr'; +$config['nmap'] = '/usr/local/bin/nmap'; +$config['nagios_plugins'] = '/usr/local/libexec/nagios'; +$config['ipmitool'] = '/usr/local/bin/ipmitool'; +$config['virsh'] = '/usr/local/bin/virsh'; +$config['dot'] = '/usr/local/bin/dot'; +$config['sfdp'] = '/usr/local/bin/sfdp'; - + // Memcached - Keep immediate statistics $config['memcached']['enable'] = false;