[Pkg-nagios-changes] [pkg-nagios] r1834 - in nagvis/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Fri Mar 5 11:56:42 UTC 2010
tags 533379 pending
tags 560705 pending
thanks
Author: hfrenzel-guest
Date: 2010-03-05 11:56:40 +0000 (Fri, 05 Mar 2010)
New Revision: 1834
Added:
nagvis/trunk/debian/patches/config.dpatch
nagvis/trunk/debian/patches/fix-get_class-object.dpatch
Removed:
nagvis/trunk/debian/lintian-overrides
nagvis/trunk/debian/patches/10_pathnames.dpatch
Modified:
nagvis/trunk/debian/changelog
nagvis/trunk/debian/config
nagvis/trunk/debian/control
nagvis/trunk/debian/patches/00list
nagvis/trunk/debian/patches/php5.3-deprecated-ereg.dpatch
nagvis/trunk/debian/patches/visibility_magic-set-method.dpatch
Log:
Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/changelog 2010-03-05 11:56:40 UTC (rev 1834)
@@ -1,9 +1,8 @@
-nagvis (1:1.4.6-1) UNRELEASED; urgency=low
+nagvis (1:1.4.6-1) unstable; urgency=low
- * (NOT RELEASED YET)
-
[ Hendrik Frenzel ]
- * New upstream version
+ * New upstream version (Closes: #533379)
+ * Fixed desctiption (Closes: #560705)
* Patched deprecated ereg to preg_match to get them work with php 5.3+
-- Hendrik Frenzel <hfrenzel at scunc.net> Fri, 19 Feb 2010 12:33:48 +0100
Modified: nagvis/trunk/debian/config
===================================================================
--- nagvis/trunk/debian/config 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/config 2010-03-05 11:56:40 UTC (rev 1834)
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
. /usr/share/debconf/confmodule
Modified: nagvis/trunk/debian/control
===================================================================
--- nagvis/trunk/debian/control 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/control 2010-03-05 11:56:40 UTC (rev 1834)
@@ -23,7 +23,7 @@
* Display of single Hosts or Services
* Display the state of a Host dependent on the state of its services
("recognize services")
- * Visualize a complete Host- oder Servicegroup with one icon
+ * Visualization of Host- oder Servicegroups with one icon
* Define Sub-Map icons wich represent a complete NagVis Map of
Hosts/Services/Groups in one icon (drill down)
* Visualization of complete IT Processes using self drawn graphics
Deleted: nagvis/trunk/debian/lintian-overrides
===================================================================
--- nagvis/trunk/debian/lintian-overrides 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/lintian-overrides 2010-03-05 11:56:40 UTC (rev 1834)
@@ -1,2 +0,0 @@
-nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
-
Modified: nagvis/trunk/debian/patches/00list
===================================================================
--- nagvis/trunk/debian/patches/00list 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/patches/00list 2010-03-05 11:56:40 UTC (rev 1834)
@@ -1,3 +1,4 @@
-10_pathnames.dpatch
+config
php5.3-deprecated-ereg
visibility_magic-set-method
+fix-get_class-object
Deleted: nagvis/trunk/debian/patches/10_pathnames.dpatch
===================================================================
--- nagvis/trunk/debian/patches/10_pathnames.dpatch 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/patches/10_pathnames.dpatch 2010-03-05 11:56:40 UTC (rev 1834)
@@ -1,100 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_pathnames.dpatch by Wolfgang Barth <wob at swobspace.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
---- nagvis-1.4.6~/etc/nagvis.ini.php-sample 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2010-03-01 18:40:01.000000000 +0100
-@@ -24,17 +24,26 @@
-
- ; Path definitions
- [paths]
--; absolute physical NagVis path
--;base="/usr/local/nagios/share/nagvis/"
-+base="/usr/share/nagvis/htdocs/"
-+cfg="/etc/nagvis/"
-+var="/var/cache/nagvis/"
-+mapcfg="/etc/nagvis/maps/"
-+images="/var/lib/nagvis/images/"
-+icon="/var/lib/nagvis/images/iconsets/"
-+shape="/var/lib/nagvis/images/shapes/"
-+map="/var/lib/nagvis/images/maps/"
-+headertemplate="/etc/nagvis/templates/header/"
-+hovertemplate="/etc/nagvis/templates/hover/"
-+contexttemplate="/etc/nagvis/templates/context/"
- ; absolute html NagVis path
--;htmlbase="/nagios/nagvis"
-+htmlbase="/nagvis"
- ; absolute html NagVis cgi path
--;htmlcgi="/nagios/cgi-bin"
-+htmlcgi="/nagios3/cgi-bin"
-
- ; Default values which get inherited to the maps and its objects
- [defaults]
- ; default backend (id of the default backend)
--;backend="ndomy_1"
-+backend="ndomy_1"
- ; background color of maps
- ;backgroundcolor="#fff"
- ; Enable/Disable the context menu on map objects. With the context menu you are
-@@ -158,8 +168,8 @@
- ; ----------------------------
-
- ; Example definition of a livestatus backend. In this case the backend_id is live_1
--[backend_live_1]
--backendtype="mklivestatus"
-+;[backend_live_1]
-+;backendtype="mklivestatus"
- ;socket="unix:/usr/local/nagios/var/rw/live"
-
- ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
-@@ -186,9 +196,9 @@
- ;htmlcgi="/nagios/cgi-bin"
-
- ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
--[backend_ndo2fs_1]
-+;[backend_ndo2fs_1]
- ; type of backend - MUST be set
--backendtype="ndo2fs"
-+;backendtype="ndo2fs"
- ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
- ;path="/usr/local/ndo2fs/var"
- ; Name of the instance to get the data from
-@@ -223,12 +233,12 @@
-
- ; in this example the browser switches between the maps demo and demo2 every 15
- ; seconds, the rotation is enabled by url: index.php?rotation=demo
--[rotation_demo]
-+;[rotation_demo]
- ; These steps are rotated. The "Demo2:" is a label which is being displayed in
- ; the index pages rotation list.
--maps="demo,Demo2:demo2"
-+;maps="demo,Demo2:demo2"
- ; rotation interval (seconds)
--interval=15
-+;interval=15
-
- ; ------------------------------------------------------------------------------
- ; Below you find some advanced stuff
-diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
---- nagvis-1.4.6~/nagvis/includes/defines/global.php 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/defines/global.php 2010-03-01 18:39:30.000000000 +0100
-@@ -61,13 +61,13 @@
- define('DEBUGLEVEL', 4);
-
- // Path to the debug file
--define('DEBUGFILE', '../var/nagvis-debug.log');
-+define('DEBUGFILE', '/var/log/nagvis-debug.log');
-
- // NagVis Version
- define('CONST_VERSION', '1.4.6');
-
- // Path to the main configuration file
--define('CONST_MAINCFG', '../etc/nagvis.ini.php');
-+define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
-
- // Needed minimal PHP version
- define('CONST_NEEDED_PHP_VERSION', '5.0');
Copied: nagvis/trunk/debian/patches/config.dpatch (from rev 1833, nagvis/trunk/debian/patches/10_pathnames.dpatch)
===================================================================
--- nagvis/trunk/debian/patches/config.dpatch (rev 0)
+++ nagvis/trunk/debian/patches/config.dpatch 2010-03-05 11:56:40 UTC (rev 1834)
@@ -0,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## config.dpatch by Wolfgang Barth <wob at swobspace.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: changes default configs
+
+ at DPATCH@
+diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
+--- nagvis-1.4.6~/etc/nagvis.ini.php-sample 2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2010-03-01 18:40:01.000000000 +0100
+@@ -24,17 +24,26 @@
+
+ ; Path definitions
+ [paths]
+-; absolute physical NagVis path
+-;base="/usr/local/nagios/share/nagvis/"
++base="/usr/share/nagvis/htdocs/"
++cfg="/etc/nagvis/"
++var="/var/cache/nagvis/"
++mapcfg="/etc/nagvis/maps/"
++images="/var/lib/nagvis/images/"
++icon="/var/lib/nagvis/images/iconsets/"
++shape="/var/lib/nagvis/images/shapes/"
++map="/var/lib/nagvis/images/maps/"
++headertemplate="/etc/nagvis/templates/header/"
++hovertemplate="/etc/nagvis/templates/hover/"
++contexttemplate="/etc/nagvis/templates/context/"
+ ; absolute html NagVis path
+-;htmlbase="/nagios/nagvis"
++htmlbase="/nagvis"
+ ; absolute html NagVis cgi path
+-;htmlcgi="/nagios/cgi-bin"
++htmlcgi="/nagios3/cgi-bin"
+
+ ; Default values which get inherited to the maps and its objects
+ [defaults]
+ ; default backend (id of the default backend)
+-;backend="ndomy_1"
++backend="ndomy_1"
+ ; background color of maps
+ ;backgroundcolor="#fff"
+ ; Enable/Disable the context menu on map objects. With the context menu you are
+@@ -158,8 +168,8 @@
+ ; ----------------------------
+
+ ; Example definition of a livestatus backend. In this case the backend_id is live_1
+-[backend_live_1]
+-backendtype="mklivestatus"
++;[backend_live_1]
++;backendtype="mklivestatus"
+ ;socket="unix:/usr/local/nagios/var/rw/live"
+
+ ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
+@@ -186,9 +196,9 @@
+ ;htmlcgi="/nagios/cgi-bin"
+
+ ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
+-[backend_ndo2fs_1]
++;[backend_ndo2fs_1]
+ ; type of backend - MUST be set
+-backendtype="ndo2fs"
++;backendtype="ndo2fs"
+ ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
+ ;path="/usr/local/ndo2fs/var"
+ ; Name of the instance to get the data from
+@@ -223,12 +233,12 @@
+
+ ; in this example the browser switches between the maps demo and demo2 every 15
+ ; seconds, the rotation is enabled by url: index.php?rotation=demo
+-[rotation_demo]
++;[rotation_demo]
+ ; These steps are rotated. The "Demo2:" is a label which is being displayed in
+ ; the index pages rotation list.
+-maps="demo,Demo2:demo2"
++;maps="demo,Demo2:demo2"
+ ; rotation interval (seconds)
+-interval=15
++;interval=15
+
+ ; ------------------------------------------------------------------------------
+ ; Below you find some advanced stuff
+diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
+--- nagvis-1.4.6~/nagvis/includes/defines/global.php 2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/defines/global.php 2010-03-01 18:39:30.000000000 +0100
+@@ -61,13 +61,13 @@
+ define('DEBUGLEVEL', 4);
+
+ // Path to the debug file
+-define('DEBUGFILE', '../var/nagvis-debug.log');
++define('DEBUGFILE', '/var/log/nagvis-debug.log');
+
+ // NagVis Version
+ define('CONST_VERSION', '1.4.6');
+
+ // Path to the main configuration file
+-define('CONST_MAINCFG', '../etc/nagvis.ini.php');
++define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
+
+ // Needed minimal PHP version
+ define('CONST_NEEDED_PHP_VERSION', '5.0');
Added: nagvis/trunk/debian/patches/fix-get_class-object.dpatch
===================================================================
--- nagvis/trunk/debian/patches/fix-get_class-object.dpatch (rev 0)
+++ nagvis/trunk/debian/patches/fix-get_class-object.dpatch 2010-03-05 11:56:40 UTC (rev 1834)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-get_class-object.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add is_object() to check for object before use get_class()
+
+ at DPATCH@
+diff -urNad nagvis-1.4.6~/nagvis/includes/classes/GlobalHeaderMenu.php nagvis-1.4.6/nagvis/includes/classes/GlobalHeaderMenu.php
+--- nagvis-1.4.6~/nagvis/includes/classes/GlobalHeaderMenu.php 2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/classes/GlobalHeaderMenu.php 2010-03-05 11:52:13.000000000 +0100
+@@ -84,7 +84,7 @@
+ */
+ public function replaceDynamicMacros() {
+ // Replace some special macros
+- if($this->OBJPAGE !== null && get_class($this->OBJPAGE) == 'NagVisMapCfg') {
++ if($this->OBJPAGE !== null && (is_object($this->OBJPAGE) && get_class($this->OBJPAGE) == 'NagVisMapCfg')) {
+ $arrKeys[] = '[current_map]';
+ $arrKeys[] = '[current_map_alias]';
+ $arrVals[] = $this->OBJPAGE->getName();
+@@ -122,7 +122,7 @@
+ }
+
+ // auto select current map
+- if(get_class($this->OBJPAGE) == 'NagVisMapCfg' && ($mapName == $this->OBJPAGE->getName() || $mapName == '__automap' && isset($_GET['automap']))) {
++ if((is_object($this->OBJPAGE) && get_class($this->OBJPAGE) == 'NagVisMapCfg') && ($mapName == $this->OBJPAGE->getName() || $mapName == '__automap' && isset($_GET['automap']))) {
+ $sReplaceObj = str_replace('[selected]','selected="selected"',$sReplaceObj);
+ } else {
+ $sReplaceObj = str_replace('[selected]','',$sReplaceObj);
+@@ -138,7 +138,7 @@
+ }
+
+ // Select overview in header menu when no map shown
+- if(get_class($this->OBJPAGE) != 'NagVisMapCfg') {
++ if((is_object($this->OBJPAGE) && get_class($this->OBJPAGE) != 'NagVisMapCfg')) {
+ $this->code = str_replace('[selected]','selected="selected"', $this->code);
+ }
+
+diff -urNad nagvis-1.4.6~/nagvis/includes/classes/NagVisFrontend.php nagvis-1.4.6/nagvis/includes/classes/NagVisFrontend.php
+--- nagvis-1.4.6~/nagvis/includes/classes/NagVisFrontend.php 2010-02-04 21:51:13.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/classes/NagVisFrontend.php 2010-03-05 11:44:49.000000000 +0100
+@@ -86,7 +86,7 @@
+ $prop['languageRoot'] = 'nagvis';
+
+ // Only do this, when a map needs to be displayed
+- if($this->MAPCFG !== null && get_class($this->MAPCFG) != '') {
++ if($this->MAPCFG !== null && (is_object($this->MAPCFG) && get_class($this->MAPCFG) != '')) {
+ $prop['allowedUsers'] = $this->MAPCFG->getValue('global',0, 'allowed_user');
+ }
+
Property changes on: nagvis/trunk/debian/patches/fix-get_class-object.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: nagvis/trunk/debian/patches/php5.3-deprecated-ereg.dpatch
===================================================================
--- nagvis/trunk/debian/patches/php5.3-deprecated-ereg.dpatch 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/patches/php5.3-deprecated-ereg.dpatch 2010-03-05 11:56:40 UTC (rev 1834)
@@ -2,7 +2,7 @@
## php5.3-deprecated-ereg.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: changes deprecated ereg() to preg_match() for use with php >= 5.3
@DPATCH@
diff -urNad nagvis-1.4.6~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.4.6/nagvis/includes/classes/GlobalMainCfg.php
Modified: nagvis/trunk/debian/patches/visibility_magic-set-method.dpatch
===================================================================
--- nagvis/trunk/debian/patches/visibility_magic-set-method.dpatch 2010-03-04 16:07:41 UTC (rev 1833)
+++ nagvis/trunk/debian/patches/visibility_magic-set-method.dpatch 2010-03-05 11:56:40 UTC (rev 1834)
@@ -2,7 +2,7 @@
## visibility_magic-set-method.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: make magicmethod __set public o avoid error
@DPATCH@
diff -urNad nagvis-1.4.6~/nagvis/includes/classes/validator/GlobalValidatorInteger.php nagvis-1.4.6/nagvis/includes/classes/validator/GlobalValidatorInteger.php
More information about the Pkg-nagios-changes
mailing list