Attachment #190362 for bug #225705

View | Details | Raw Unified | Return to bug 225705
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	nagvis
PORTVERSION=	1.9.5
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	http://www.nagvis.org/share/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Visualization addon for Nagios

LICENSE=	GPLv2

NDO2DB_DESC=	Depend on ndo2db broker
GRAPHVIZ_DESC=	Graphviz is needed for automaps

USES=		gettext php:web
NLS_USES=	gettext
NLS_CONFIGURE_OFF=	--disable-nls

NO_BUILD=	yes
USE_PHP=	gd gettext mbstring session json pdo pdo_sqlite
WANT_PHP_WEB=	yes

.include <bsd.port.options.mk>


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1466888430	1	TIMESTAMP = 1517898888
2	SHA256 (nagvis-1.8.5.tar.gz) = e42a2451efcf8acf3bc317ab9b1b041a511c034c11ccedc634c2c69bf4814487	2	SHA256 (nagvis-1.9.5.tar.gz) = ca7595709a6ab68f9d43cfeafde419d53f5239d585cec78016c93820ac9f0bd5
3	SIZE (nagvis-1.8.5.tar.gz) = 1466361	3	SIZE (nagvis-1.9.5.tar.gz) = 1788889




--- share/server/core/classes/objects/NagVisMapObj.php.orig	2017-12-21 20:54:27.936999000 +0100
+++ share/server/core/classes/objects/NagVisMapObj.php	2017-12-21 20:54:31.229491000 +0100
@@ -187,7 +187,7 @@
      *
      * @author	Lars Michelsen <lars@vertical-visions.de>
      */
-    public function queueState($_unused_flag = true, $_unused_flag = true) {
+    public function queueState($_unused_flag = true, $_unused_flag2 = true) {
         // Get state of all member objects
         foreach($this->getStateRelevantMembers() AS $OBJ) {
             // The states of the map objects members only need to be fetched when this
--- share/server/core/classes/objects/NagVisService.php.orig	2017-12-21 20:55:07.358180000 +0100
+++ share/server/core/classes/objects/NagVisService.php	2017-12-21 20:55:31.487418000 +0100
@@ -56,7 +56,7 @@
     /**
      * Queues state fetching for this object
      */
-    public function queueState($_unused_flag = true, $_unused_flag = true) {
+    public function queueState($_unused_flag = true, $_unused_flag2 = true) {
         global $_BACKEND;
         $_BACKEND->queue(Array('serviceState' => true), $this);
     }




--- share/server/core/ext/php-gettext-1.0.9/gettext.php.orig	2017-12-21 20:52:04.548840000 +0100
+++ share/server/core/ext/php-gettext-1.0.9/gettext.php	2017-12-21 20:52:26.904652000 +0100
@@ -98,7 +98,7 @@
    * @param object Reader the StreamReader object
    * @param boolean enable_cache Enable or disable caching of strings (default on)
    */
-  function gettext_reader($Reader, $enable_cache = true) {
+  function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
     if (! $Reader || isset($Reader->error) ) {
       $this->short_circuit = true;
--- share/server/core/ext/php-gettext-1.0.9/streams.php.orig	2017-12-21 20:52:12.507752000 +0100
+++ share/server/core/ext/php-gettext-1.0.9/streams.php	2017-12-21 20:53:08.533635000 +0100
@@ -49,7 +49,7 @@
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  function __construct($str='') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -86,7 +86,7 @@
   var $_fd;
   var $_length;
 
-  function FileReader($filename) {
+  function __construct($filename) {
     if (file_exists($filename)) {
 
       $this->_length=filesize($filename);
@@ -143,7 +143,7 @@
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
+  function __construct($filename) {
     if (file_exists($filename)) {
 
       $length=filesize($filename);




%%WWWDIR%%/COPYING
%%WWWDIR%%/ChangeLog
%%WWWDIR%%/LICENCE
%%WWWDIR%%/README
%%WWWDIR%%/docs/cleanup_new_notes.sh
%%WWWDIR%%/docs/de_DE/about.html
%%WWWDIR%%/docs/de_DE/after_installation.html
%%WWWDIR%%/docs/de_DE/auth.html

%%WWWDIR%%/docs/en_US/backend_mklivestatus.html
%%WWWDIR%%/docs/en_US/backend_nagiosbp.html
%%WWWDIR%%/docs/en_US/backend_ndomy.html
%%WWWDIR%%/docs/en_US/backend_pgsql.html
%%WWWDIR%%/docs/en_US/backends.html
%%WWWDIR%%/docs/en_US/changelog.html
%%WWWDIR%%/docs/en_US/context_templates.html

%%WWWDIR%%/docs/en_US/update_instructions.html
%%WWWDIR%%/docs/en_US/user_interface.html
%%WWWDIR%%/docs/en_US/welcome.html
%%WWWDIR%%/docs/en_US/worldmap.html
%%WWWDIR%%/docs/general/css/style.css
%%WWWDIR%%/docs/general/img/favicon.ico
%%WWWDIR%%/docs/general/img/iconset-std_mini.jpg

%%WWWDIR%%/etc/maps/demo-load.cfg
%%WWWDIR%%/etc/maps/demo-muc-srv1.cfg
%%WWWDIR%%/etc/maps/demo-overview.cfg
%%WWWDIR%%/etc/maps/demo-worldmap.cfg
%%WWWDIR%%/etc/nagvis.ini.php-sample
%%WWWDIR%%/etc/perms.db-sample
%%WWWDIR%%/install_lib

%%WWWDIR%%/nagvis-make-admin
%%WWWDIR%%/omd_install.sh
%%WWWDIR%%/share/config.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendMessage.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModInfo.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModLogonDialog.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModMap.php

%%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisMapView.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisOverviewView.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/NagVisUrlView.php
%%WWWDIR%%/share/frontend/nagvis-js/classes/ViewError.php
%%WWWDIR%%/share/frontend/nagvis-js/defines/nagvis-js.php
%%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/CHANGELOG
%%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo.compiled.php

%%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/functions/wordwrap.php
%%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/helper.array.php
%%WWWDIR%%/share/frontend/nagvis-js/ext/dwoo-1.1.0/plugins/builtin/processors/pre.smarty_compat.php
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/control_drag.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/control_locked.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/control_unlocked.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/dimension.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/favicon.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/favicon_ack.png

%%WWWDIR%%/share/frontend/nagvis-js/images/internal/info.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/loading.gif
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/logo.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/logo_small.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_critical.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_down.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_error.png

%%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_up.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/msg_warning.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/picker.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/sidebar_close.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/sidebar_open.png
%%WWWDIR%%/share/frontend/nagvis-js/images/internal/warning.png
%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/arrow.gif
%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/cross.gif
%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/hs.png
%%WWWDIR%%/share/frontend/nagvis-js/images/jscolor/hv.png
%%WWWDIR%%/share/frontend/nagvis-js/images/leaflet/layers-2x.png
%%WWWDIR%%/share/frontend/nagvis-js/images/leaflet/layers.png
%%WWWDIR%%/share/frontend/nagvis-js/images/leaflet/marker-icon-2x.png
%%WWWDIR%%/share/frontend/nagvis-js/images/leaflet/marker-icon.png
%%WWWDIR%%/share/frontend/nagvis-js/images/leaflet/marker-shadow.png
%%WWWDIR%%/share/frontend/nagvis-js/index.php
%%WWWDIR%%/share/frontend/nagvis-js/js/Element.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementBox.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementContext.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementGadget.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementHover.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementIcon.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementLabel.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementLine.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementShape.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ElementTile.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtBase.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtGenericResize.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtJSColor.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtLeaflet-src.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtLeaflet.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtStacktrace.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ExtWzJsGraphics.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackends.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackgrounds.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ManageShapes.js
%%WWWDIR%%/share/frontend/nagvis-js/js/MapManageTmpl.js
%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisAggr.js
%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisContainer.js
%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisDynGroup.js

%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisStatefulObject.js
%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisStatelessObject.js
%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisTextbox.js
%%WWWDIR%%/share/frontend/nagvis-js/js/View.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ViewMap.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ViewOverview.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ViewUrl.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ViewWorldmap.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ajax.js
%%WWWDIR%%/share/frontend/nagvis-js/js/ajaxActions.js
%%WWWDIR%%/share/frontend/nagvis-js/js/dynfavicon.js
%%WWWDIR%%/share/frontend/nagvis-js/js/edit.js
%%WWWDIR%%/share/frontend/nagvis-js/js/frontend.js
%%WWWDIR%%/share/frontend/nagvis-js/js/frontendContext.js
%%WWWDIR%%/share/frontend/nagvis-js/js/frontendEventlog.js
%%WWWDIR%%/share/frontend/nagvis-js/js/frontendHover.js
%%WWWDIR%%/share/frontend/nagvis-js/js/frontendMessage.js
%%WWWDIR%%/share/frontend/nagvis-js/js/hover.js
%%WWWDIR%%/share/frontend/nagvis-js/js/lines.js
%%WWWDIR%%/share/frontend/nagvis-js/js/nagvis.js
%%WWWDIR%%/share/frontend/nagvis-js/js/popupWindow.js
%%WWWDIR%%/share/frontend/nagvis-js/locale/de_DE/LC_MESSAGES/nagvis.mo

%%WWWDIR%%/share/frontend/nagvis-js/locale/pt_BR/LC_MESSAGES/nagvis.po
%%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.mo
%%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.po
%%WWWDIR%%/share/frontend/nagvis-js/locale/zh_CN/LC_MESSAGES/nagvis.mo
%%WWWDIR%%/share/frontend/nagvis-js/locale/zh_CN/LC_MESSAGES/nagvis.po
%%WWWDIR%%/share/index.php
%%WWWDIR%%/share/server/core/actions/rdp.php
%%WWWDIR%%/share/server/core/actions/win_ssh.php

%%WWWDIR%%/share/server/core/ajax_handler.php
%%WWWDIR%%/share/server/core/classes/CoreAuthHandler.php
%%WWWDIR%%/share/server/core/classes/CoreAuthModMySQL.php
%%WWWDIR%%/share/server/core/classes/CoreAuthModPDO.php
%%WWWDIR%%/share/server/core/classes/CoreAuthModSQLite.php
%%WWWDIR%%/share/server/core/classes/CoreAuthModule.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationHandler.php

%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModGroups.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMultisite.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMySQL.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModPDO.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModSQLite.php
%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModule.php
%%WWWDIR%%/share/server/core/classes/CoreBackendMgmt.php

%%WWWDIR%%/share/server/core/classes/CoreModUserMgmt.php
%%WWWDIR%%/share/server/core/classes/CoreModule.php
%%WWWDIR%%/share/server/core/classes/CoreModuleHandler.php
%%WWWDIR%%/share/server/core/classes/CorePDOHandler.php
%%WWWDIR%%/share/server/core/classes/CoreRequestHandler.php
%%WWWDIR%%/share/server/core/classes/CoreRotation.php
%%WWWDIR%%/share/server/core/classes/CoreSQLiteHandler.php
%%WWWDIR%%/share/server/core/classes/CoreSessionHandler.php
%%WWWDIR%%/share/server/core/classes/CoreTemplateSystem.php
%%WWWDIR%%/share/server/core/classes/CoreUriHandler.php
%%WWWDIR%%/share/server/core/classes/CoreUserCfg.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendInterface.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendPDO.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendTest.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendmkbi.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendmklivestatus.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendnagiosbp.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendndomy.php
%%WWWDIR%%/share/server/core/classes/GlobalBackendpgsql.php
%%WWWDIR%%/share/server/core/classes/GlobalBackground.php
%%WWWDIR%%/share/server/core/classes/GlobalCore.php
%%WWWDIR%%/share/server/core/classes/GlobalFileCache.php

%%WWWDIR%%/share/server/core/classes/NagVisHoverMenu.php
%%WWWDIR%%/share/server/core/classes/NagVisHoverUrl.php
%%WWWDIR%%/share/server/core/classes/NagVisMap.php
%%WWWDIR%%/share/server/core/classes/ViewAck.php
%%WWWDIR%%/share/server/core/classes/ViewChangePassword.php
%%WWWDIR%%/share/server/core/classes/NagVisViewChangePassword.php
%%WWWDIR%%/share/server/core/classes/NagVisViewManageRoles.php
%%WWWDIR%%/share/server/core/classes/NagVisViewSearch.php
%%WWWDIR%%/share/server/core/classes/NagVisViewToStaticMap.php
%%WWWDIR%%/share/server/core/classes/NagVisViewUserMgmt.php
%%WWWDIR%%/share/server/core/classes/ViewEditMainCfg.php
%%WWWDIR%%/share/server/core/classes/ViewManageBackends.php
%%WWWDIR%%/share/server/core/classes/ViewManageBackgrounds.php
%%WWWDIR%%/share/server/core/classes/ViewManageMaps.php
%%WWWDIR%%/share/server/core/classes/ViewManageRoles.php
%%WWWDIR%%/share/server/core/classes/ViewManageShapes.php
%%WWWDIR%%/share/server/core/classes/ViewManageUsers.php
%%WWWDIR%%/share/server/core/classes/ViewMapAddModify.php
%%WWWDIR%%/share/server/core/classes/ViewMapManageTmpl.php
%%WWWDIR%%/share/server/core/classes/ViewSearch.php
%%WWWDIR%%/share/server/core/classes/ViewToNewMap.php
%%WWWDIR%%/share/server/core/classes/ViewToStaticMap.php
%%WWWDIR%%/share/server/core/classes/objects/NagVisAggr.php
%%WWWDIR%%/share/server/core/classes/objects/NagVisContainer.php
%%WWWDIR%%/share/server/core/classes/objects/NagVisDynGroup.php

%%WWWDIR%%/share/server/core/classes/objects/NagVisTextbox.php
%%WWWDIR%%/share/server/core/defines/global.php
%%WWWDIR%%/share/server/core/defines/matches.php
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/AUTHORS
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/COPYING
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/README
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/gettext.inc
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/gettext.php
%%WWWDIR%%/share/server/core/ext/php-gettext-1.0.12/streams.php
%%WWWDIR%%/share/server/core/functions/autoload.php
%%WWWDIR%%/share/server/core/functions/core.php
%%WWWDIR%%/share/server/core/functions/debug.php

%%WWWDIR%%/share/server/core/sources/filter.php
%%WWWDIR%%/share/server/core/sources/general.php
%%WWWDIR%%/share/server/core/sources/geomap.php
%%WWWDIR%%/share/server/core/sources/worldmap.php
%%WWWDIR%%/share/userfiles/gadgets/gadgets_core.php
%%WWWDIR%%/share/userfiles/gadgets/std_bar.php
%%WWWDIR%%/share/userfiles/gadgets/std_html_bar.php

%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_critical.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_critical_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_critical_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_critical_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_down.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_down_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_down_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_down_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_error.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_ok.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_ok_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_ok_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_pending.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unchecked.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unknown.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unknown_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unknown_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unknown_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unreachable.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unreachable_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unreachable_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_unreachable_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_up.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_up_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_up_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_warning.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_warning_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_warning_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_geo_warning_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_dt.png

%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_down_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_error.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_ok.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_ok_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_ok_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_pending.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unchecked.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unknown_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_unreachable_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_up.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_up_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_up_stale.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning_ack.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning_dt.png
%%WWWDIR%%/share/userfiles/images/iconsets/std_small_warning_stale.png
%%WWWDIR%%/share/userfiles/images/maps/demo-germany.png
%%WWWDIR%%/share/userfiles/images/maps/demo-ham-racks.png
%%WWWDIR%%/share/userfiles/images/maps/demo-host.png

%%WWWDIR%%/share/userfiles/images/shapes/demo_traffic_load_legend.png
%%WWWDIR%%/share/userfiles/images/shapes/std_dummy.png
%%WWWDIR%%/share/userfiles/images/shapes/std_nagvis.png
%%WWWDIR%%/share/userfiles/images/templates/default.control_delete.gif
%%WWWDIR%%/share/userfiles/images/templates/default.control_drag.gif
%%WWWDIR%%/share/userfiles/images/templates/default.control_modify.gif
%%WWWDIR%%/share/userfiles/images/templates/default.control_togglemid.gif
%%WWWDIR%%/share/userfiles/images/templates/default.folder_closed.gif
%%WWWDIR%%/share/userfiles/images/templates/default.folder_open.gif
%%WWWDIR%%/share/userfiles/images/templates/default.header_down.png
%%WWWDIR%%/share/userfiles/images/templates/default.header_hide.png
%%WWWDIR%%/share/userfiles/images/templates/default.header_show.png
%%WWWDIR%%/share/userfiles/images/templates/default.zoombar_bg.gif
%%WWWDIR%%/share/userfiles/scripts/std_lq.php
%%WWWDIR%%/share/userfiles/sounds/std_critical.mp3

%%WWWDIR%%/share/userfiles/sounds/std_error.mp3
%%WWWDIR%%/share/userfiles/sounds/std_unreachable.mp3
%%WWWDIR%%/share/userfiles/sounds/std_warning.mp3
%%WWWDIR%%/share/userfiles/templates/default.changePassword.html
%%WWWDIR%%/share/userfiles/templates/default.context.css
%%WWWDIR%%/share/userfiles/templates/default.context.html
%%WWWDIR%%/share/userfiles/templates/default.css

%%WWWDIR%%/share/userfiles/templates/default.info.html
%%WWWDIR%%/share/userfiles/templates/default.login.css
%%WWWDIR%%/share/userfiles/templates/default.login.html
%%WWWDIR%%/share/userfiles/templates/default.manageRoles.html
%%WWWDIR%%/share/userfiles/templates/default.map.html
%%WWWDIR%%/share/userfiles/templates/default.overview.html
%%WWWDIR%%/share/userfiles/templates/default.search.html
%%WWWDIR%%/share/userfiles/templates/default.toStaticMap.html
%%WWWDIR%%/share/userfiles/templates/default.url.html
%%WWWDIR%%/share/userfiles/templates/jquery-3.2.1.min.js
%%WWWDIR%%/share/userfiles/templates/default.wuiManageBackends.html
%%WWWDIR%%/share/userfiles/templates/default.wuiManageBackgrounds.html
%%WWWDIR%%/share/userfiles/templates/default.wuiManageShapes.html
%%WWWDIR%%/share/userfiles/templates/default.wuiMapAddModify.html
%%WWWDIR%%/share/userfiles/templates/default.wuiMapManageTmpl.html
%%WWWDIR%%/share/userfiles/templates/on-demand-filter.header.html
%%WWWDIR%%/share/userfiles/templates/select2.min.css
%%WWWDIR%%/share/userfiles/templates/select2.min.js
@dir %%WWWDIR%%/etc/automaps
@dir %%WWWDIR%%/share/userfiles/images/gadgets
@dir %%WWWDIR%%/share/userfiles/styles

Return to bug 225705

Lines 2-13 Link Here

(-)Makefile (-5 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nagvis	4	PORTNAME= nagvis
5	PORTVERSION= 1.8.5	5	PORTVERSION= 1.9.5
6	PORTREVISION= 1
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= http://www.nagvis.org/share/	7	MASTER_SITES= http://www.nagvis.org/share/
9		8
10	MAINTAINER= derfi@vei.ru	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Visualization addon for Nagios	10	COMMENT= Visualization addon for Nagios
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
Lines 20-32 Link Here
20	NDO2DB_DESC= Depend on ndo2db broker	19	NDO2DB_DESC= Depend on ndo2db broker
21	GRAPHVIZ_DESC= Graphviz is needed for automaps	20	GRAPHVIZ_DESC= Graphviz is needed for automaps
22		21
23	USES= gettext	22	USES= gettext php:web
24	NLS_USES= gettext	23	NLS_USES= gettext
25	NLS_CONFIGURE_OFF= --disable-nls	24	NLS_CONFIGURE_OFF= --disable-nls
26		25
27	NO_BUILD= yes	26	NO_BUILD= yes
28	USE_PHP= gd gettext mbstring session json pdo pdo_sqlite	27	USE_PHP= gd gettext mbstring session json pdo pdo_sqlite
29	WANT_PHP_WEB= yes
30		28
31	.include <bsd.port.options.mk>	29	.include <bsd.port.options.mk>
32		30

Lines 1-22 Link Here

(-)files/patch-share_server_core_classes_objects_NagVisService.php (-22 lines)
1	--- share/server/core/classes/objects/NagVisMapObj.php.orig 2017-12-21 20:54:27.936999000 +0100
2	+++ share/server/core/classes/objects/NagVisMapObj.php 2017-12-21 20:54:31.229491000 +0100
3	@@ -187,7 +187,7 @@
4	*
5	* @author Lars Michelsen <lars@vertical-visions.de>
6	*/
7	- public function queueState($_unused_flag = true, $_unused_flag = true) {
8	+ public function queueState($_unused_flag = true, $_unused_flag2 = true) {
9	// Get state of all member objects
10	foreach($this->getStateRelevantMembers() AS $OBJ) {
11	// The states of the map objects members only need to be fetched when this
12	--- share/server/core/classes/objects/NagVisService.php.orig 2017-12-21 20:55:07.358180000 +0100
13	+++ share/server/core/classes/objects/NagVisService.php 2017-12-21 20:55:31.487418000 +0100
14	@@ -56,7 +56,7 @@
15	/**
16	* Queues state fetching for this object
17	*/
18	- public function queueState($_unused_flag = true, $_unused_flag = true) {
19	+ public function queueState($_unused_flag = true, $_unused_flag2 = true) {
20	global $_BACKEND;
21	$_BACKEND->queue(Array('serviceState' => true), $this);
22	}

Lines 1-40 Link Here

(-)files/patch-share_server_core_ext_php_gettext.php (-40 lines)
1	--- share/server/core/ext/php-gettext-1.0.9/gettext.php.orig 2017-12-21 20:52:04.548840000 +0100
2	+++ share/server/core/ext/php-gettext-1.0.9/gettext.php 2017-12-21 20:52:26.904652000 +0100
3	@@ -98,7 +98,7 @@
4	* @param object Reader the StreamReader object
5	* @param boolean enable_cache Enable or disable caching of strings (default on)
6	*/
7	- function gettext_reader($Reader, $enable_cache = true) {
8	+ function __construct($Reader, $enable_cache = true) {
9	// If there isn't a StreamReader, turn on short circuit mode.
10	if (! $Reader \|\| isset($Reader->error) ) {
11	$this->short_circuit = true;
12	--- share/server/core/ext/php-gettext-1.0.9/streams.php.orig 2017-12-21 20:52:12.507752000 +0100
13	+++ share/server/core/ext/php-gettext-1.0.9/streams.php 2017-12-21 20:53:08.533635000 +0100
14	@@ -49,7 +49,7 @@
15	var $_pos;
16	var $_str;
17
18	- function StringReader($str='') {
19	+ function __construct($str='') {
20	$this->_str = $str;
21	$this->_pos = 0;
22	}
23	@@ -86,7 +86,7 @@
24	var $_fd;
25	var $_length;
26
27	- function FileReader($filename) {
28	+ function __construct($filename) {
29	if (file_exists($filename)) {
30
31	$this->_length=filesize($filename);
32	@@ -143,7 +143,7 @@
33	// Preloads entire file in memory first, then creates a StringReader
34	// over it (it assumes knowledge of StringReader internals)
35	class CachedFileReader extends StringReader {
36	- function CachedFileReader($filename) {
37	+ function __construct($filename) {
38	if (file_exists($filename)) {
39
40	$length=filesize($filename);