sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-mgmt/librenms: Update version 201506=>201509 [1]

Browse source 
- Correct the path of fping [1]
- Make proper use of OPTIONSNG

PR:		202938 [1]
Submitted by:	dvl [1]
Differential Revision:	https://reviews.freebsd.org/D3578 [1]
This commit is contained in:
Muhammad Moinur Rahman 2015-09-15 08:52:04 +00:00
parent 60a6927961
commit d85a259c0c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=396947
4 changed files with 57 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
net-mgmt/librenms/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= librenms PORTNAME= librenms
PORTVERSION= 201506 PORTVERSION= 201509
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= http://www.librenms.org/ MASTER_SITES= http://www.librenms.org/
@ -46,8 +46,8 @@ RUN_DEPENDS+= rrdtool:${PORTSDIR}/databases/rrdtool \
snmpget:${PORTSDIR}/net-mgmt/net-snmp \ snmpget:${PORTSDIR}/net-mgmt/net-snmp \
bash:${PORTSDIR}/shells/bash bash:${PORTSDIR}/shells/bash
OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC OPTIONS_DEFINE= APACHEMOD FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES
OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES
APACHEMOD_DESC= Use PHP with Apache 2.2+ module APACHEMOD_DESC= Use PHP with Apache 2.2+ module
FPING_DESC= Enable fping support ping monitoring FPING_DESC= Enable fping support ping monitoring
IPMITOOL_DESC= Enable support for monitoring hardware IPMI IPMITOOL_DESC= Enable support for monitoring hardware IPMI
@ -65,29 +65,26 @@ WMIC_RUN_DEPENDS= wmic:${PORTSDIR}/net-mgmt/wmi-client
MYSQLD_USE= MYSQL=server MYSQLD_USE= MYSQL=server
MYSQLD_USE_OFF= MYSQL=client MYSQLD_USE_OFF= MYSQL=client
.include <bsd.port.options.mk>
SUB_FILES+= pkg-message SUB_FILES+= pkg-message
SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD}
ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \ ROOT_FILES= addhost.php adduser.php alerts.php build-base.php build.sql \
billing-calculate.php callback.php check-errors.php \ billing-calculate.php callback.php \
check-services.php config_to_json.php daily.php daily.sh \ check-services.php config_to_json.php daily.php daily.sh \
delhost.php discovery.php dist-pollers.php irc.php \ delhost.php discovery.php dist-pollers.php irc.php \
poll-billing.php poller.php poller-wrapper.py renamehost.php \ poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \
snmptrap.php syslog.php validate.php snmp-scan.php snmptrap.php syslog.php validate.php
ROOT_DIRS= contrib html includes lib mibs scripts sql-schema \ ROOT_DIRS= contrib html includes lib mibs scripts sql-schema
upgrade-scripts
DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md DOCS= AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
PORTDOCS= * PORTDOCS= *
PORTEXAMPLES= snmp.conf.example snmpd.conf.example PORTEXAMPLES= snmp.conf.example snmpd.conf.example
NO_ARCH= yes NO_ARCH= yes
.if ${PORT_OPTIONS:MAPACHEMOD} && !defined(PACKAGE_BUILDING) .if !defined(PACKAGE_BUILDING)
WANT_PHP_MOD= yes APACHEMOD_VARS_ON= WANT_PHP_MOD=yes
USE_APACHE_RUN= 22+ APACHEMOD_USE= APACHE_RUN=22+
.else .else
# Package builder doesn't create php5 with module # Package builder doesn't create php5 with module
WANT_PHP_WEB= yes WANT_PHP_WEB= yes
@ -113,21 +110,19 @@ do-install:
# Ensure PHP and Python scripts are executable # Ensure PHP and Python scripts are executable
@${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \ @${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \
'*.php' -exec ${CHMOD} +x {} \; '*.php' -exec ${CHMOD} +x {} \;
# Rename for @sample
.if ${PORT_OPTIONS:MDOCS} do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}/${DOCSDIR} @${MKDIR} ${STAGEDIR}/${DOCSDIR}
.for f in ${DOCS} .for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
.endfor .endfor
@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES} do-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
.for f in ${PORTEXAMPLES} .for f in ${PORTEXAMPLES}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR}
.endfor .endfor
.endif
post-install: post-install:
@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST} @${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}

4
net-mgmt/librenms/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (librenms-librenms-201506_GH0.tar.gz) = 7618b02292847d1a308cd6bd0649eb386e87d2fbac1e0991914cea6383a540df SHA256 (librenms-librenms-201509_GH0.tar.gz) = 920f8ede391f532ffb53e9fb481386506d4bfaf211601d5ca3a759e99dccbfea
SIZE (librenms-librenms-201506_GH0.tar.gz) = 23898595 SIZE (librenms-librenms-201509_GH0.tar.gz) = 28524457

4
net-mgmt/librenms/files/patch-config.php.default
View file

@ -1,6 +1,6 @@
--- config.php.default.orig 2015-06-15 14:48:46 UTC --- config.php.default.orig 2015-09-06 16:13:08 UTC
+++ config.php.default +++ config.php.default
@@ -14,7 +14,7 @@ $config['memcached']['host'] = "local @@ -15,7 +15,7 @@ $config['memcached']['host'] = "local
$config['memcached']['port'] = 11211; $config['memcached']['port'] = 11211;
### Locations - it is recommended to keep the default ### Locations - it is recommended to keep the default

86
net-mgmt/librenms/files/patch-includes_defaults.inc.php
View file

@ -1,55 +1,49 @@
--- includes/defaults.inc.php.orig 2015-06-15 11:23:55 UTC --- includes/defaults.inc.php.orig 2015-09-06 18:47:34 UTC
+++ includes/defaults.inc.php +++ includes/defaults.inc.php
@@ -31,7 +31,7 @@ $config['project_name'] = "LibreNMS" @@ -40,7 +40,7 @@ $config['project_name'] = 'LibreNMS';
$config['project_id'] = strtolower($config['project_name']); $config['project_id'] = strtolower($config['project_name']);
$config['temp_dir'] = "/tmp"; $config['temp_dir'] = '/tmp';
-$config['install_dir'] = "/opt/" . $config['project_id']; -$config['install_dir'] = '/opt/'.$config['project_id'];
+$config['install_dir'] = "/usr/local/www/" . $config['project_id']; +$config['install_dir'] = '/usr/local/www/' . $config['project_id'];
$config['log_dir'] = $config['install_dir'] . "/logs"; $config['log_dir'] = $config['install_dir'].'/logs';
// What is my own hostname (used to identify this host in its own database) // MySQL extension to use
@@ -39,26 +39,26 @@ $config['own_hostname'] = "localhost"; @@ -50,24 +50,24 @@ $config['db']['extension'] = 'mysq
$config['own_hostname'] = 'localhost';
// Location of executables // Location of executables
-$config['rrdtool'] = '/usr/bin/rrdtool';
-$config['rrdtool'] = "/usr/bin/rrdtool"; -$config['fping'] = '/usr/bin/fping';
-$config['fping'] = "/usr/bin/fping"; +$config['rrdtool'] = '/usr/local/bin/rrdtool';
+$config['rrdtool'] = "/usr/local/bin/rrdtool"; +$config['fping'] = '/usr/local/sbin/fping';
+$config['fping'] = "/usr/local/sbin/fping";
$config['fping_options']['retries'] = 3; $config['fping_options']['retries'] = 3;
$config['fping_options']['timeout'] = 500; $config['fping_options']['timeout'] = 500;
-$config['fping6'] = "/usr/bin/fping6"; $config['fping_options']['count'] = 3;
-$config['snmpwalk'] = "/usr/bin/snmpwalk"; $config['fping_options']['millisec'] = 200;
-$config['snmpget'] = "/usr/bin/snmpget"; -$config['snmpwalk'] = '/usr/bin/snmpwalk';
-$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk"; -$config['snmpget'] = '/usr/bin/snmpget';
+$config['fping6'] = "/usr/local/sbin/fping6"; -$config['snmpbulkwalk'] = '/usr/bin/snmpbulkwalk';
+$config['snmpwalk'] = "/usr/local/bin/snmpwalk"; +$config['snmpwalk'] = '/usr/local/bin/snmpwalk';
+$config['snmpget'] = "/usr/local/bin/snmpget"; +$config['snmpget'] = '/usr/local/bin/snmpget';
+$config['snmpbulkwalk'] = "/usr/local/bin/snmpbulkwalk"; +$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
$config['whois'] = "/usr/bin/whois"; $config['whois'] = '/usr/bin/whois';
-$config['ping'] = "/bin/ping"; -$config['ping'] = '/bin/ping';
-$config['mtr'] = "/usr/bin/mtr"; -$config['mtr'] = '/usr/bin/mtr';
-$config['nmap'] = "/usr/bin/nmap"; -$config['nmap'] = '/usr/bin/nmap';
-$config['nagios_plugins'] = "/usr/lib/nagios/plugins"; -$config['nagios_plugins'] = '/usr/lib/nagios/plugins';
-$config['ipmitool'] = "/usr/bin/ipmitool"; -$config['ipmitool'] = '/usr/bin/ipmitool';
-$config['virsh'] = "/usr/bin/virsh"; -$config['virsh'] = '/usr/bin/virsh';
-$config['dot'] = "/usr/bin/dot"; -$config['dot'] = '/usr/bin/dot';
-$config['unflatten'] = "/usr/bin/unflatten"; -$config['sfdp'] = '/usr/bin/sfdp';
-$config['neato'] = "/usr/bin/neato"; +$config['ping'] = '/sbin/ping';
-$config['sfdp'] = "/usr/bin/sfdp"; +$config['mtr'] = '/usr/local/bin/mtr';
-$config['svn'] = "/usr/bin/svn"; +$config['nmap'] = '/usr/local/bin/nmap';
+$config['ping'] = "/sbin/ping"; +$config['nagios_plugins'] = '/usr/local/libexec/nagios';
+$config['mtr'] = "/usr/local/bin/mtr"; +$config['ipmitool'] = '/usr/local/bin/ipmitool';
+$config['nmap'] = "/usr/local/bin/nmap"; +$config['virsh'] = '/usr/local/bin/virsh';
+$config['nagios_plugins'] = "/usr/local/libexec/nagios"; +$config['dot'] = '/usr/local/bin/dot';
+$config['ipmitool'] = "/usr/local/bin/ipmitool"; +$config['sfdp'] = '/usr/local/bin/sfdp';
+$config['virsh'] = "/usr/local/bin/virsh";
+$config['dot'] = "/usr/local/bin/dot";
+$config['unflatten'] = "/usr/local/bin/unflatten";
+$config['neato'] = "/usr/local/bin/neato";
+$config['sfdp'] = "/usr/local/bin/sfdp";
+$config['svn'] = "/usr/bin/svnlite";
// Memcached - Keep immediate statistics // Memcached - Keep immediate statistics
$config['memcached']['enable'] = false;