[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][experimental] 8 commits: New upstream version 1.9.27

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Fri Jul 16 08:58:32 BST 2021



Bas Couwenberg pushed to branch experimental at Debian Nagios Maintainer Group / pkg-nagvis


Commits:
d96f843d by Bas Couwenberg at 2021-07-16T09:35:27+02:00
New upstream version 1.9.27
- - - - -
54c63d48 by Bas Couwenberg at 2021-07-16T09:35:35+02:00
Update upstream source from tag 'upstream/1.9.27'

Update to upstream version '1.9.27'
with Debian dir a23bf4c62b6784bf37db959ac55fd56bf50181a6
- - - - -
ca0f2074 by Bas Couwenberg at 2021-07-16T09:35:55+02:00
New upstream release.

- - - - -
e45c046b by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Mark patches as Forwarded: not-needed.

- - - - -
b9e2607f by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Drop obsolete Files-Excluded & repacksuffix.

- - - - -
93890a1e by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Update lintian overrides.

- - - - -
dd84aebb by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Use .maintscript file for dpkg-maintscript-helper commands.

- - - - -
4dda1f53 by Bas Couwenberg at 2021-07-16T09:54:01+02:00
Set distribution to experimental.

- - - - -


13 changed files:

- ChangeLog
- debian/changelog
- debian/copyright
- debian/nagvis.lintian-overrides
- debian/nagvis.maintscript
- debian/nagvis.postinst
- debian/nagvis.postrm
- debian/nagvis.preinst
- debian/patches/config.patch
- debian/patches/jquery_path.patch
- debian/watch
- share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo/Compiler.php
- share/server/core/defines/global.php


Changes:

=====================================
ChangeLog
=====================================
@@ -1,13 +1,18 @@
+1.9.27
+Core
+  * FIX: Fix PHP 7 (or older) incompatibilities introduced with 1.9.26
+    (Error (Error): Call to undefined method ReflectionType::getName())
+
 1.9.26
-Core:
+Core
   * FIX: Fix PHP 8 incompatibilites
 
-Worldmap:
+Worldmap
   * Add new option filter_group for filtering host objects on a worldmap based
     on the membership of hosts in a host group.
 
 1.9.25
-Core:
+Core
   * FIX: Fix map corruption regression introduced with 1.9.24
   This issue was triggered by objects on a map having a numeric "object_id"
   attribute. The issue resulted in map configuration files without "define
@@ -18,11 +23,11 @@ Core:
   * FIX: Fix possible map corruption caused by object ID cleanup (#280)
   * FIX: Fix missing socket string in some livestatus backend error messages
 
-Frontend:
+Frontend
   * FIX: Fix editing map options when object_id not set in global section object
 
 1.9.24
-Core:
+Core
   * FIX: Fix more PHP 7.4 incompatibilites (#265)
     (This fixes one issue related to the PDO auth module and one issue related
     to map configurations with numeric object_id attributes.)
@@ -30,20 +35,20 @@ Core:
     (Undefined index 'downtime' was shown)
 
 1.9.23
-Frontend:
+Frontend
   * Make NagVis compatible with Checkmk 2.0 auth cookies
 
 1.9.22
-Core:
+Core
   * FIX: Fix error handling of DB backends when DB opening failed
     (Undefined property: CorePDOHandler::$dsn) (#267)
 
-Frontend:
+Frontend
   * Colors with alpha channel are now allowed (format: #RRGGBBAA) (#270)
   * FIX: Improve validation of file names in several places to prevent input of
     not printable characters.
 
-Worldmap:
+Worldmap
   * Improve recently introduced textbox scaling according to zoom (pull #263)
 
 1.9.21


=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+nagvis (1:1.9.27-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Mark patches as Forwarded: not-needed.
+  * Drop obsolete Files-Excluded & repacksuffix.
+  * Update lintian overrides.
+  * Use .maintscript file for dpkg-maintscript-helper commands.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 16 Jul 2021 09:36:27 +0200
+
 nagvis (1:1.9.26-1~exp1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/copyright
=====================================
@@ -1,7 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: NagVis
 Source: http://sourceforge.net/projects/nagvis/files/
-Files-Excluded: uifx share/netmap/shell.html share/netmap/shell.swf share/netmap/modules/gmap
 
 Files: *
 Copyright: Copyright 2007-2013, Lars Michelsen <lars at vertical-visions.de>


=====================================
debian/nagvis.lintian-overrides
=====================================
@@ -6,3 +6,11 @@ apache2-reverse-dependency-calls-invoke-rc.d postinst
 
 # user and group
 spelling-error-in-readme-debian nagios nagios (duplicate word) nagios
+
+# Not a problem
+package-contains-documentation-outside-usr-share-doc *
+extra-license-file usr/share/nagvis/share/server/core/ext/*/COPYING
+
+# Not guaranteed to be compatible
+embedded-php-library usr/share/nagvis/share/server/core/ext/php-gettext* please use php-php-gettext
+


=====================================
debian/nagvis.maintscript
=====================================
@@ -1 +1,5 @@
 symlink_to_dir /usr/share/nagvis/share/server/core/ext/php-gettext-1.0.12 ../../../../../php/php-php-gettext 1:1.9.25-2~
+
+mv_conffile /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf 1:1.7.9+dfsg1-1~
+rm_conffile /etc/nagvis/automaps/__automap.cfg 1:1.7.9+dfsg1-1~
+


=====================================
debian/nagvis.postinst
=====================================
@@ -21,20 +21,12 @@ if dpkg --compare-versions "$2" lt-nl "1:1.7.9+dfsg1-1~"; then
     # help by adding a empty file
     touch /etc/nagvis/apache2.conf
 
-    # move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
-    dpkg-maintscript-helper mv_conffile \
-        /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
     # unregister old file
     ucf -p /etc/apache2/conf.d/nagvis.conf
     ucfr -p nagvis /etc/apache2/conf.d/nagvis.conf
     # delete helper file
     rm -f /etc/nagvis/apache2.conf.dpkg-new
 
-    # remove old automap
-    dpkg-maintscript-helper rm_conffile \
-        /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
     rmdir /etc/nagvis/automaps/ 2>/dev/null || true
 fi
 


=====================================
debian/nagvis.postrm
=====================================
@@ -18,14 +18,6 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-# move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
-dpkg-maintscript-helper mv_conffile \
-    /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
-# remove old automap
-dpkg-maintscript-helper rm_conffile \
-    /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
 # Apache2
 if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
     . /usr/share/apache2/apache2-maintscript-helper


=====================================
debian/nagvis.preinst
=====================================
@@ -13,14 +13,6 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-# move /etc/apache2/conf.d/nagvis.conf to /etc/nagvis/apache2.conf
-dpkg-maintscript-helper mv_conffile \
-    /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
-# remove old automap
-dpkg-maintscript-helper rm_conffile \
-    /etc/nagvis/automaps/__automap.cfg "1:1.7.9+dfsg1-1~" nagvis -- "$@"
-
 case "$1" in
     install|upgrade)
     ;;


=====================================
debian/patches/config.patch
=====================================
@@ -1,13 +1,8 @@
-From: Alexander Reichle-Schmehl <tolimar at debian.org>
-Date: Wed, 12 Dec 2018 07:53:28 +0100
-Subject: Change nagvis config paths for Debian
+Description: Change nagvis config paths for Debian
+Author: Alexander Reichle-Schmehl <tolimar at debian.org>
+Forwarded: not-needed
 
 Reviewed-by: Markus Frosch <markus at lazyfrosch.de>
-Last-Update: 2013-12-12
----
- share/server/core/classes/GlobalMainCfg.php | 10 +++++-----
- share/server/core/defines/global.php        |  6 +++---
- 2 files changed, 8 insertions(+), 8 deletions(-)
 
 --- a/share/server/core/classes/GlobalMainCfg.php
 +++ b/share/server/core/classes/GlobalMainCfg.php


=====================================
debian/patches/jquery_path.patch
=====================================
@@ -1,9 +1,8 @@
 Description: Remove version from jquery.min.js filename
  So we can use a symlink to libjs-jquery
 Author: Markus Frosch <lazyfrosch at debian.org>
-Last-Update: 2019-01-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Forwarded: not-needed
+
 --- a/share/userfiles/templates/on-demand-filter.header.html
 +++ b/share/userfiles/templates/on-demand-filter.header.html
 @@ -1,5 +1,5 @@


=====================================
debian/watch
=====================================
@@ -2,7 +2,6 @@ version=4
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g,\
-repacksuffix=+dfsg,\
 filenamemangle=s/(?:.*?)?(?:rel|v|nagvis)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/nagvis-$1.$2/ \
 https://github.com/NagVis/nagvis/releases \
 (?:.*?/)?(?:rel|v|nagvis)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))


=====================================
share/frontend/nagvis-js/ext/dwoo-1.1.0/Dwoo/Compiler.php
=====================================
@@ -3006,18 +3006,34 @@ class Dwoo_Compiler implements Dwoo_ICompiler
 		}
 
 		$out = array();
-                foreach ($ref->getParameters() as $param) {
-			if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo') {
-				continue;
-			}
-			if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo_Compiler') {
-				continue;
+
+		if (PHP_VERSION_ID < 70100) {
+			foreach ($ref->getParameters() as $param) {
+				if (($class = $param->getClass()) !== null && $class->name === 'Dwoo') {
+					continue;
+				}
+				if (($class = $param->getClass()) !== null && $class->name === 'Dwoo_Compiler') {
+					continue;
+				}
+				if ($param->getName() === 'rest' && $param->isArray() === true) {
+					$out[] = array('*', $param->isOptional(), null);
+				}
+				$out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
 			}
-			if ($param->getName() === 'rest' && $param->getType() && $param->getType()->getName() === 'array') {
-				$out[] = array('*', $param->isOptional(), null);
+		} else {
+			foreach ($ref->getParameters() as $param) {
+				if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo') {
+					continue;
+				}
+				if ($param->getType() && !$param->getType()->isBuiltin() && $param->getType()->getName() === 'Dwoo_Compiler') {
+					continue;
+				}
+				if ($param->getName() === 'rest' && $param->getType() && $param->getType()->getName() === 'array') {
+					$out[] = array('*', $param->isOptional(), null);
+				}
+				$out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
 			}
-			$out[] = array($param->getName(), $param->isOptional(), $param->isOptional() ? $param->getDefaultValue() : null);
-		}
+		}
 
 		return $out;
 	}


=====================================
share/server/core/defines/global.php
=====================================
@@ -23,7 +23,7 @@
  *****************************************************************************/
  
 // NagVis Version
-define('CONST_VERSION', '1.9.26');
+define('CONST_VERSION', '1.9.27');
 
 // Set PHP error handling to standard level
 // Different levels for php versions below 5.1 because PHP 5.1 reports



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/b3adb675f09471516d338de6a09505ddd5d9459d...4dda1f536c81f658c8a52c091e1d47538b14d88b

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/b3adb675f09471516d338de6a09505ddd5d9459d...4dda1f536c81f658c8a52c091e1d47538b14d88b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20210716/eb0c7b56/attachment-0001.htm>


More information about the pkg-nagios-changes mailing list