svn commit: r527681 - in head: . net-mgmt/librenms net-mgmt/librenms/files
Dan Langille
dvl at FreeBSD.org
Tue Mar 3 16:25:36 UTC 2020
Author: dvl
Date: Tue Mar 3 16:25:33 2020
New Revision: 527681
URL: https://svnweb.freebsd.org/changeset/ports/527681
Log:
Update to 1.61
While here, adjust the webserver options (see PR)
NOTE: upgrading existing installations will break unless you read UPGRADING
and follow the instructions.
In short:
* Apache / mod_php is no longer an option
* config.php needs entries added manually
We are jumping a few versions here:
* https://github.com/librenms/librenms/releases/tag/1.61
* https://github.com/librenms/librenms/releases/tag/1.60
* https://github.com/librenms/librenms/releases/tag/1.59
* https://github.com/librenms/librenms/releases/tag/1.58.1
* https://github.com/librenms/librenms/releases/tag/1.58
PR: 235949
Submitted by: Dries Michiels <driesm.michiels at gmail.com>
Deleted:
head/net-mgmt/librenms/files/patch-includes_defaults.inc.php
Modified:
head/UPDATING
head/net-mgmt/librenms/Makefile
head/net-mgmt/librenms/distinfo
head/net-mgmt/librenms/files/patch-config.php.default
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Mar 3 15:21:56 2020 (r527680)
+++ head/UPDATING Tue Mar 3 16:25:33 2020 (r527681)
@@ -5,6 +5,54 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20200303:
+ AFFECTS: users of net-mgmt/librenms
+ AUTHOR: dvl at FreeBSD.org
+
+ 1. Apache / mod_php options removed
+
+ The APACHEMOD option has been removed. LibreNMS can be used
+ with other webservers, not just Apache. In other to simplify
+ the port, the option was removed.
+
+ Now you manually install the webserver of your preference.
+
+ If upgrading from LibreNMS < 1.61, you can do this to
+ prevent 'pkg autoremove' from uninstalling Apache / mod_php:
+
+ $ sudo pkg set -A 0 apache24 mod_php74
+ Mark apache24-2.4.41 as not automatically installed? [y/N]: y
+ Mark mod_php74-7.4.3 as not automatically installed? [y/N]: y
+
+ Adjust mod_php74 to suit the version of mod_php you have.
+
+ 2. include/defaults.inc.php is gone
+
+ The file include/defaults.inc.php is no longer distributed by
+ the upstream project. The FreeBSD port patched this file to
+ correct the paths to common tools such as ping, snmpwalk, etc.
+
+ These values previously adjusted by the port must now be specified
+ in config.php. New installs will have this automatically, but existing
+ installs must be updated manually. These are the entries you should
+ add if upgrading from LibreNMS < 1.61:
+
+ $config['snmpwalk'] = '/usr/local/bin/snmpwalk';
+ $config['snmpget'] = '/usr/local/bin/snmpget';
+ $config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
+ $config['snmptranslate'] = '/usr/local/bin/snmptranslate';
+
+ $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';
+ $config['nfdump'] = '/usr/local/bin/nfdump';
+
20200229:
AFFECTS: users of textproc/apache-solr
AUTHOR: mfechner at FreeBSD.org
Modified: head/net-mgmt/librenms/Makefile
==============================================================================
--- head/net-mgmt/librenms/Makefile Tue Mar 3 15:21:56 2020 (r527680)
+++ head/net-mgmt/librenms/Makefile Tue Mar 3 16:25:33 2020 (r527681)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= librenms
-PORTVERSION= 1.56
-PORTREVISION= 2
+PORTVERSION= 1.61
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= LOCAL/dvl:vendor
@@ -19,7 +18,7 @@ USES= python${PY_MYSQL} shebangfix
# 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= 1569841625
+RELEASE_TIMESTAMP= 1583121812
# perhaps we also need python-memcache python-mysqldb
RUN_DEPENDS+= rrdtool:databases/rrdtool \
@@ -32,7 +31,7 @@ RUN_DEPENDS+= rrdtool:databases/rrdtool \
USE_PHP= ctype curl dom fileinfo filter gd hash json ldap mbstring \
mysqli openssl pdo pdo_mysql phar posix session simplexml \
- snmp tokenizer xml xmlwriter zip
+ snmp sockets tokenizer xml xmlwriter zip
USE_GITHUB= yes
GH_ACCOUNT= librenms
@@ -42,9 +41,8 @@ WWW_USER= www
NO_BUILD= yes
-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
+OPTIONS_DEFINE= FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER WMIC DOCS EXAMPLES 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
@@ -108,7 +106,8 @@ SCRIPT_FILES= daily.sh lnms
ROOT_DIRS= LibreNMS app bootstrap config contrib database doc html includes licenses logs mibs misc resources routes scripts sql-schema storage tests
# these are directories which require a generic @DIR entry in pkg-plist
-OTHER_DIRS= storage/app/public \
+OTHER_DIRS= html/js/lang \
+ storage/app/public \
storage/debugbar \
storage/framework/cache/data \
storage/framework/testing \
@@ -130,9 +129,6 @@ DOCS= AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE
PORTDOCS= *
PORTEXAMPLES= snmp.conf.example snmpd.conf.example
NO_ARCH= yes
-
-APACHEMOD_USES= php:mod
-APACHEMOD_USES_OFF= php:web
post-patch:
@${REINPLACE_CMD} 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/config.php.default
Modified: head/net-mgmt/librenms/distinfo
==============================================================================
--- head/net-mgmt/librenms/distinfo Tue Mar 3 15:21:56 2020 (r527680)
+++ head/net-mgmt/librenms/distinfo Tue Mar 3 16:25:33 2020 (r527681)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1569845138
-SHA256 (librenms-vendor-1.56.tar.gz) = 51be3b30670abafce213f842d239b1cf272d3463a560d872e0e7e4ee375c73f1
-SIZE (librenms-vendor-1.56.tar.gz) = 32955402
-SHA256 (librenms-librenms-1.56_GH0.tar.gz) = 63bd84e22ae08637551570e5049f2ae0f4541bbaa88de623787abcb585d77391
-SIZE (librenms-librenms-1.56_GH0.tar.gz) = 40159747
+TIMESTAMP = 1583189328
+SHA256 (librenms-vendor-1.61.tar.gz) = d18119cb25d40df911cb2dbadf3886fdcb9db6959aaa8971c67106cf61a8e40d
+SIZE (librenms-vendor-1.61.tar.gz) = 32364486
+SHA256 (librenms-librenms-1.61_GH0.tar.gz) = ac260ac5cec27bb3c007d957fa951cc3db5e86a651d271d26521eb77d94958b2
+SIZE (librenms-librenms-1.61_GH0.tar.gz) = 43179635
Modified: head/net-mgmt/librenms/files/patch-config.php.default
==============================================================================
--- head/net-mgmt/librenms/files/patch-config.php.default Tue Mar 3 15:21:56 2020 (r527680)
+++ head/net-mgmt/librenms/files/patch-config.php.default Tue Mar 3 16:25:33 2020 (r527681)
@@ -1,4 +1,4 @@
---- config.php.default.orig 2018-08-04 20:07:12 UTC
+--- config.php.default.orig 2020-03-02 04:03:32 UTC
+++ config.php.default
@@ -2,15 +2,20 @@
@@ -22,3 +22,26 @@
### 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
+@@ -49,3 +54,22 @@ $config['enable_billing'] = 1;
+
+ # Enable the in-built services support (Nagios plugins)
+ $config['show_services'] = 1;
++
++# These paths are supplied by the FreeBSD port and correct those found in
++# the code.
++
++$config['snmpwalk'] = '/usr/local/bin/snmpwalk';
++$config['snmpget'] = '/usr/local/bin/snmpget';
++$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
++$config['snmptranslate'] = '/usr/local/bin/snmptranslate';
++
++$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';
++$config['nfdump'] = '/usr/local/bin/nfdump';
More information about the svn-ports-all
mailing list