git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1834 98d490a6-b407-0410...

diff --git a/debian/changelog b/debian/changelog
index 7d2e3d92f7a79d7e289511678d80f07b2952a83b..9f2a85580f373ef01d4478d0e93687ad6bd011f7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-nagvis (1:1.4.6-1) UNRELEASED; urgency=low
-
-  * (NOT RELEASED YET)
+nagvis (1:1.4.6-1) unstable; urgency=low
 
   [ 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@scunc.net>  Fri, 19 Feb 2010 12:33:48 +0100

diff --git a/debian/config b/debian/config
index 7f21a9e5bc5fe5c2f1598ce8610a115a2169f46d..7e02dfc63e4bb7fac09cb42f8d001d0edcad1316 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 . /usr/share/debconf/confmodule
 

diff --git a/debian/control b/debian/control
index 75f01d97c192623d9764f31cb3d7693295199df2..2a19df70c2fb4a2586c906f42e68255bf3e53357 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: Visualization addon for Nagios
   * 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

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644 (file)
index 1b94a80..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
-

diff --git a/debian/patches/00list b/debian/patches/00list
index e1c801989c5078af10c967236ca60b19aaa41db5..ca25319c517f770e426b2df826d66058ddfd9477 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
-10_pathnames.dpatch
+config
 php5.3-deprecated-ereg
 visibility_magic-set-method
+fix-get_class-object

diff --git a/debian/patches/10_pathnames.dpatch b/debian/patches/10_pathnames.dpatch
deleted file mode 100755 (executable)
index 2d0e76c..0000000
--- a/debian/patches/10_pathnames.dpatch
+++ /dev/null
@@ -1,100 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_pathnames.dpatch by Wolfgang Barth <wob@swobspace.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@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');

diff --git a/debian/patches/config.dpatch b/debian/patches/config.dpatch
new file mode 100755 (executable)
index 0000000..b02c730
--- /dev/null
+++ b/debian/patches/config.dpatch
@@ -0,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## config.dpatch by Wolfgang Barth <wob@swobspace.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: changes default configs
+
+@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');

diff --git a/debian/patches/fix-get_class-object.dpatch b/debian/patches/fix-get_class-object.dpatch
new file mode 100755 (executable)
index 0000000..c5d2274
--- /dev/null
+++ b/debian/patches/fix-get_class-object.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-get_class-object.dpatch by Hendrik Frenzel <hfrenzel@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()
+
+@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');
+               }
+               

diff --git a/debian/patches/php5.3-deprecated-ereg.dpatch b/debian/patches/php5.3-deprecated-ereg.dpatch
index 815b3f567934b2169a7ffa09913a65f6b28818be..7f83baf726409a481b59078073d2a4d25fff4743 100755 (executable)
--- a/debian/patches/php5.3-deprecated-ereg.dpatch
+++ b/debian/patches/php5.3-deprecated-ereg.dpatch
@@ -2,7 +2,7 @@
 ## php5.3-deprecated-ereg.dpatch by Hendrik Frenzel <hfrenzel@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

diff --git a/debian/patches/visibility_magic-set-method.dpatch b/debian/patches/visibility_magic-set-method.dpatch
index b76d11deb27f529b0a3f2a6dedc7ca890a4d2486..f2e9187ba63e91b9db984acc2e8ef59defd6716f 100755 (executable)
--- a/debian/patches/visibility_magic-set-method.dpatch
+++ b/debian/patches/visibility_magic-set-method.dpatch
@@ -2,7 +2,7 @@
 ## visibility_magic-set-method.dpatch by Hendrik Frenzel <hfrenzel@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