[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][experimental] 5 commits: Update upstream branch in gbp.conf.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Sat Jul 31 14:12:40 BST 2021



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


Commits:
5c2779ec by Bas Couwenberg at 2021-07-31T15:03:04+02:00
Update upstream branch in gbp.conf.

- - - - -
3a48eac7 by Bas Couwenberg at 2021-07-31T15:03:35+02:00
New upstream version 2.8.4
- - - - -
0b8007ff by Bas Couwenberg at 2021-07-31T15:04:09+02:00
Update upstream source from tag 'upstream/2.8.4'

Update to upstream version '2.8.4'
with Debian dir 819296e9aff76be07f796680cb4a6a7c1aa57500
- - - - -
b0b9c0c7 by Bas Couwenberg at 2021-07-31T15:04:43+02:00
New upstream release.

- - - - -
4ed5fe76 by Bas Couwenberg at 2021-07-31T15:05:40+02:00
Set distribution to experimental.

- - - - -


13 changed files:

- CHANGELOG.md
- VERSION
- application/VERSION
- debian/changelog
- debian/gbp.conf
- library/Icinga/Application/Version.php
- modules/doc/module.info
- modules/migrate/module.info
- modules/monitoring/library/Monitoring/Object/MonitoredObject.php
- modules/monitoring/module.info
- modules/setup/module.info
- modules/test/module.info
- modules/translation/module.info


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -4,6 +4,10 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
 
 ## What's New
 
+### What's New in Version 2.8.4
+
+This release only contains a single fix for flattened custom variables. [#4439](https://github.com/Icinga/icingaweb2/issues/4439)
+
 ### What's New in Version 2.8.3
 
 **Notice**: This is a security release. It is recommended to upgrade to this release if you don't plan to upgrade to v2.9.0.


=====================================
VERSION
=====================================
@@ -1 +1 @@
-v2.8.3
+v2.8.4


=====================================
application/VERSION
=====================================
@@ -1 +1 @@
-479f990d5981354c05c362700117fe086cd048a9 2021-07-12 09:58:18 +0200
+800378d819cb54d2fbb7b26c0d8ef19edbd16788 2021-07-27 15:48:44 +0200


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+icingaweb2 (2.8.4-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Jul 2021 15:05:23 +0200
+
 icingaweb2 (2.8.3-1~exp1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/gbp.conf
=====================================
@@ -2,7 +2,7 @@
 
 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream
+upstream-branch = upstream-2.8
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").


=====================================
library/Icinga/Application/Version.php
=====================================
@@ -8,7 +8,7 @@ namespace Icinga\Application;
  */
 class Version
 {
-    const VERSION = '2.8.3';
+    const VERSION = '2.8.4';
 
     /**
      * Get the version of this instance of Icinga Web 2


=====================================
modules/doc/module.info
=====================================
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.8.3
+Version: 2.8.4
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.


=====================================
modules/migrate/module.info
=====================================
@@ -1,5 +1,5 @@
 Module: migrate
-Version: 2.8.3
+Version: 2.8.4
 Description: Migrate module
  This module was introduced with the domain-aware authentication feature in version 2.5.0.
  It helps you migrating users and user configurations according to a given domain.


=====================================
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
=====================================
@@ -466,19 +466,22 @@ abstract class MonitoredObject implements Filterable
             return $customvars;
         }
 
-        $obfuscatedCustomVars = [];
-        $obfuscator = function ($vars) use ($blacklistPattern, &$obfuscatedCustomVars, &$obfuscator) {
+        $obfuscator = function ($vars) use ($blacklistPattern, &$obfuscator) {
+            $result = [];
             foreach ($vars as $name => $value) {
                 if ($blacklistPattern && preg_match($blacklistPattern, $name)) {
-                    $obfuscatedCustomVars[$name] = '***';
+                    $result[$name] = '***';
+                } elseif ($value instanceof stdClass || is_array($value)) {
+                    $obfuscated = $obfuscator($value);
+                    $result[$name] = $value instanceof stdClass ? (object) $obfuscated : $obfuscated;
                 } else {
-                    $obfuscatedCustomVars[$name] = $value instanceof stdClass || is_array($value)
-                        ? $obfuscator($value)
-                        : $value;
+                    $result[$name] = $value;
                 }
             }
+
+            return $result;
         };
-        $obfuscator($customvars);
+        $obfuscatedCustomVars = $obfuscator($customvars);
 
         return $customvars instanceof stdClass ? (object) $obfuscatedCustomVars : $obfuscatedCustomVars;
     }


=====================================
modules/monitoring/module.info
=====================================
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.8.3
+Version: 2.8.4
 Description: Icinga monitoring module
  IDO accessor and UI for your monitoring. This is the initial instalment for a
  graphical presentation of Icinga environments. The predecessor of Icinga DB.


=====================================
modules/setup/module.info
=====================================
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.8.3
+Version: 2.8.4
 Description: Setup module
  Web based wizard for setting up Icinga Web 2 and its modules.
  This includes the data backends (e.g. relational database, LDAP),


=====================================
modules/test/module.info
=====================================
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.8.3
+Version: 2.8.4
 Description: Translation module
  This module allows developers to run (unit) tests against Icinga Web 2 and
  any of its modules. Usually you do not need to enable this.


=====================================
modules/translation/module.info
=====================================
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.8.3
+Version: 2.8.4
 Description: Translation module
  This module allows developers and translators to translate Icinga Web 2 and
  its modules for multiple languages. You do not need this module to run an



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/77a18288f6ea76c7f9e966eb99022f6539b9bde8...4ed5fe761fe7e137a5af679bed6ff38c6b2fdbc8

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/77a18288f6ea76c7f9e966eb99022f6539b9bde8...4ed5fe761fe7e137a5af679bed6ff38c6b2fdbc8
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/20210731/ad33741b/attachment-0001.htm>


More information about the pkg-nagios-changes mailing list