Index: branches/2020Q1/net-mgmt/observium/Makefile =================================================================== --- branches/2020Q1/net-mgmt/observium/Makefile (revision 522680) +++ branches/2020Q1/net-mgmt/observium/Makefile (revision 522681) @@ -1,137 +1,135 @@ # Created by: rflynn@acsalaska.net # $FreeBSD$ # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php PORTNAME= observium -PORTVERSION= 0.18.9.1 -PORTREVISION= 1 +PORTVERSION= 0.19.8 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= feld@FreeBSD.org COMMENT= Autodiscovering PHP/MySQL/SNMP based network monitoring - -BROKEN= unfetchable LICENSE= EULA LICENSE_NAME= "Observium License Version 1.0" LICENSE_FILE= ${WRKSRC}/LICENSE.COMMUNITY LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept WRKSRC= ${WRKDIR}/${PORTNAME} USES= php:cli python${PY_MYSQL} shebangfix SHEBANG_FILES= \ poller-wrapper.py \ poller.php \ scripts/ USE_PHP= ctype filter gd iconv json mcrypt mysqli openssl posix session snmp tokenizer xml zlib NO_ARCH= yes NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ dot:graphics/graphviz \ mtr:net/mtr-nox11 \ ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ snmpget:net-mgmt/net-snmp \ sudo:security/sudo LIB_DEPENDS+= libpng.so:graphics/png OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SVN WMIC OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SVN 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@${PY_FLAVOR} PYPOLLER_VARS= PY_MYSQL=:2.7 SVN_RUN_DEPENDS= svn:devel/subversion WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client .include SUB_FILES+= pkg-message observium.conf.sample SUB_LIST+= PHP="${PREFIX}/bin/php" PYTHON="${PYTHON_CMD}" ROOT_FILES= add_device.php adduser.php alerter.php \ check-errors.php check-services.php config_to_json.php \ config.php.default delete_device.php discovery.php housekeeping.php \ irc.php poller-wrapper.py poller.php rename_device.php \ snmp.conf.example snmpd.conf.example \ snmptrap.php snmptrap.php syslog.php test_alert.php test_code.php VERSION ROOT_DIRS= html includes libs logs mibs rrd scripts templates tests update PORTDOCS= INSTALL README VERSION PORTEXAMPLES= snmp.conf.example snmpd.conf.example .if ${PORT_OPTIONS:MAPACHEMOD} USES+= apache:run,2.2+ .endif .if !defined(PACKAGE_BUILDING) USES+= php:mod .else # Package builder doesn't create php5 with module USES+= php:web .endif .if ${PORT_OPTIONS:MMYSQLD} USES+= mysql:server .else USES+= mysql:client .endif post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php ${FIND} ${WRKSRC} -type d -empty -delete ${MKDIR} ${WRKSRC}/logs ${WRKSRC}/rrd do-install: ${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes ${INSTALL_DATA} ${WRKDIR}/observium.conf.sample ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes .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 # 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 ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR} .endfor do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for f in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR} .endfor post-install: @${ECHO} "@sample ${APACHEETCDIR}/Includes/observium.conf.sample" >> ${TMPPLIST} @${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' ')' -delete @${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/rrd" >> ${TMPPLIST} .include Index: branches/2020Q1/net-mgmt/observium/distinfo =================================================================== --- branches/2020Q1/net-mgmt/observium/distinfo (revision 522680) +++ branches/2020Q1/net-mgmt/observium/distinfo (revision 522681) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556045788 -SHA256 (observium-0.18.9.1/observium-community-latest.tar.gz) = b182abb41483389b2e18e8d336560733680f38d66b1dc2f291cbf113a7e1f4d7 -SIZE (observium-0.18.9.1/observium-community-latest.tar.gz) = 76524711 +TIMESTAMP = 1577933625 +SHA256 (observium-0.19.8/observium-community-latest.tar.gz) = 0603cc81c1fede6b87b187fde64843e11d6ed44f32705c68c41ddccf05d90d5b +SIZE (observium-0.19.8/observium-community-latest.tar.gz) = 85994042 Index: branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php =================================================================== --- branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php (revision 522680) +++ branches/2020Q1/net-mgmt/observium/files/patch-includes_defaults.inc.php (revision 522681) @@ -1,61 +1,63 @@ ---- includes/defaults.inc.php.orig 2017-09-07 22:26:04 UTC +--- includes/defaults.inc.php.orig 2019-08-23 07:09:46 UTC +++ includes/defaults.inc.php -@@ -36,7 +36,7 @@ $config['db']['debug'] = TRUE; +@@ -57,7 +57,7 @@ $config['db']['debug'] = TRUE; // If TRUE // Default directories -#$config['install_dir'] = "/opt/observium"; +$config['install_dir'] = "/usr/local/www/observium"; #$config['html_dir'] = $config['install_dir'] . "/html"; #$config['rrd_dir'] = $config['install_dir'] . "/rrd"; #$config['template_dir'] = $config['install_dir'] . "/templates"; -@@ -50,29 +50,29 @@ $config['db']['debug'] = TRUE; +@@ -71,30 +71,30 @@ $config['db']['debug'] = TRUE; // If TRUE // Location of executables -$config['rrdtool'] = "/usr/bin/rrdtool"; -$config['fping'] = "/usr/bin/fping"; -$config['fping6'] = "/usr/bin/fping6"; -$config['snmpwalk'] = "/usr/bin/snmpwalk"; -$config['snmpget'] = "/usr/bin/snmpget"; +-$config['snmpgetnext'] = "/usr/bin/snmpgetnext"; -$config['snmpbulkget'] = "/usr/bin/snmpbulkget"; -$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk"; -$config['snmptranslate'] = "/usr/bin/snmptranslate"; +$config['rrdtool'] = "/usr/local/bin/rrdtool"; +$config['fping'] = "/usr/local/sbin/fping"; +$config['fping6'] = "/usr/local/sbin/fping6"; +$config['snmpwalk'] = "/usr/local/bin/snmpwalk"; +$config['snmpget'] = "/usr/local/bin/snmpget"; ++$config['snmpgetnext'] = "/usr/local/bin/snmpgetnext"; +$config['snmpbulkget'] = "/usr/local/bin/snmpbulkget"; +$config['snmpbulkwalk'] = "/usr/local/bin/snmpbulkwalk"; +$config['snmptranslate'] = "/usr/local/bin/snmptranslate"; $config['whois'] = "/usr/bin/whois"; -$config['mtr'] = "/usr/bin/mtr"; -$config['nmap'] = "/usr/bin/nmap"; -$config['ipmitool'] = "/usr/bin/ipmitool"; -$config['virsh'] = "/usr/bin/virsh"; -$config['dot'] = "/usr/bin/dot"; -$config['unflatten'] = "/usr/bin/unflatten"; -$config['neato'] = "/usr/bin/neato"; -$config['sfdp'] = "/usr/bin/sfdp"; -$config['svn'] = "/usr/bin/svn"; -$config['git'] = "/usr/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2 -$config['wmic'] = "/bin/wmic"; +$config['mtr'] = "/usr/local/sbin/mtr"; +$config['nmap'] = "/usr/local/bin/nmap"; +$config['ipmitool'] = "/usr/local/bin/ipmitool"; +$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/local/bin/svn"; +$config['git'] = "/usr/local/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2 +$config['wmic'] = "/usr/local/bin/wmic"; $config['file'] = "/usr/bin/file"; $config['wc'] = "/usr/bin/wc"; -$config['sudo'] = "/usr/bin/sudo"; +$config['sudo'] = "/usr/local/bin/sudo"; $config['tail'] = "/usr/bin/tail"; $config['cut'] = "/usr/bin/cut"; $config['tr'] = "/usr/bin/tr"; Index: branches/2020Q1 =================================================================== --- branches/2020Q1 (revision 522680) +++ branches/2020Q1 (revision 522681) Property changes on: branches/2020Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r522628