[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][master] 3 commits: Add DEP3 patch headers.

Mon Dec 14 11:01:17 GMT 2020


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


Commits:
5f80b83e by Bas Couwenberg at 2020-12-14T11:01:19+01:00
Add DEP3 patch headers.

- - - - -
aea80cb0 by Bas Couwenberg at 2020-12-14T11:55:14+01:00
Update lintian overrides.

- - - - -
b34cbef9 by Bas Couwenberg at 2020-12-14T11:55:14+01:00
Set distribution to experimental.

- - - - -


11 changed files:

- debian/changelog
- debian/icingaweb2-common.lintian-overrides
- debian/icingaweb2-module-doc.lintian-overrides
- debian/icingaweb2-module-monitoring.lintian-overrides
- debian/icingaweb2.lintian-overrides
- debian/patches/0001-setup-ensure-not-to-pass-an-empty-array-to-max.patch
- debian/patches/0002-downtimestarthistoryQuery-joinBaseTables-don-t-call-.patch
- debian/patches/0003-ApplicationBootstrap-setupErrorHandling-migrate-erro.patch
- debian/patches/0004-DashboardConfig-listConfigFilesForUser-silence-error.patch
- debian/patches/0005-Version-getGitHead-silence-errors-from-file_get_cont.patch
- − debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,16 +1,16 @@
-icingaweb2 (2.8.2-2~1.gbpe5dd68) UNRELEASED; urgency=medium
+icingaweb2 (2.8.2-2~exp1) experimental; urgency=medium
 
-  ** SNAPSHOT build @e5dd68a9108f2856206176b8c6a7d01b93e84751 **
+  * Team upload.
 
   [ Bas Couwenberg ]
-  * Team upload.
   * Bump watch file version to 4.
   * Bump Standards-Version to 4.5.1, no changes.
+  * Update lintian overrides.
 
   [ Ondřej Surý ]
   * Add upstream patches to support PHP 8.0
 
- -- Ondřej Surý <ondrej at debian.org>  Mon, 14 Dec 2020 10:08:04 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 14 Dec 2020 11:01:26 +0100
 
 icingaweb2 (2.8.2-1) unstable; urgency=high
 


=====================================
debian/icingaweb2-common.lintian-overrides
=====================================
@@ -1,3 +1,6 @@
 # Embedded module documentation
 package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/translation/doc/*
 
+# Not documentation
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/*/module.info
+


=====================================
debian/icingaweb2-module-doc.lintian-overrides
=====================================
@@ -1,3 +1,6 @@
 # Embedded module documentation
 package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/doc/doc/*
 
+# Not documentation
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/*/module.info
+


=====================================
debian/icingaweb2-module-monitoring.lintian-overrides
=====================================
@@ -1,3 +1,6 @@
 # Embedded module documentation
 package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/monitoring/doc/*
 
+# Not documentation
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/modules/*/module.info
+


=====================================
debian/icingaweb2.lintian-overrides
=====================================
@@ -19,6 +19,11 @@ package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/doc/*
 # Placeholder to have directory exist
 package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/library/vendor/HTMLPurifier/DefinitionCache/Serializer/*
 
+# Not documentation
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/library/vendor/dompdf/lib/fonts/*.html
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/library/vendor/HTMLPurifier/ConfigSchema/schema/*
+package-contains-documentation-outside-usr-share-doc usr/share/icingaweb2/public/*html
+
 # Not a problem
 national-encoding *
 


=====================================
debian/patches/0001-setup-ensure-not-to-pass-an-empty-array-to-max.patch
=====================================
@@ -1,19 +1,13 @@
-From: "Alexander A. Klimov" <alexander.klimov at icinga.com>
-Date: Wed, 2 Dec 2020 19:22:19 +0100
-Subject: /setup/: ensure not to pass an empty array to max()
+Description: /setup/: ensure not to pass an empty array to max()
+ as PHP 8 doesn't tolerate such.
+Author: "Alexander A. Klimov" <alexander.klimov at icinga.com>
+Origin: https://github.com/Icinga/icingaweb2/pull/4289/commits/19172a84bc5659114bf8618059e3c5e4ad191916
+Bug: https://github.com/Icinga/icingaweb2/issues/4287
+Bug-Debian: https://bugs.debian.org/977337
 
-... as PHP 8 doesn't tolerate such.
-
-refs #4287
----
- modules/setup/application/views/scripts/index/index.phtml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml
-index b5fb407..f697458 100644
 --- a/modules/setup/application/views/scripts/index/index.phtml
 +++ b/modules/setup/application/views/scripts/index/index.phtml
-@@ -9,10 +9,10 @@ $currentPos = array_search($wizard->getCurrentPage(), $pages, true);
+@@ -9,10 +9,10 @@ $currentPos = array_search($wizard->getC
  list($configPagesLeft, $configPagesRight) = array_chunk($configPages, count($configPages) / 2, true);
  
  $visitedPages = array_keys($wizard->getPageData());


=====================================
debian/patches/0002-downtimestarthistoryQuery-joinBaseTables-don-t-call-.patch
=====================================
@@ -1,21 +1,13 @@
-From: "Alexander A. Klimov" <alexander.klimov at icinga.com>
-Date: Thu, 3 Dec 2020 19:42:19 +0100
-Subject: *downtimestarthistoryQuery#joinBaseTables(): don't call
- func_get_arg() with an invalid index
+Description: *downtimestarthistoryQuery#joinBaseTables(): don't call func_get_arg() with an invalid index
+ as PHP 8 doesn't tolerate that.
+Author: "Alexander A. Klimov" <alexander.klimov at icinga.com>
+Origin: https://github.com/Icinga/icingaweb2/pull/4289/commits/eaf0504e8c7b73e52cf1d916e8b6044b2a1a137e
+Bug: https://github.com/Icinga/icingaweb2/issues/4287
+Bug-Debian: https://bugs.debian.org/977337
 
-... as PHP 8 doesn't tolerate that.
-
-refs #4287
----
- .../Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php      | 2 +-
- .../Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
-index 831df6c..4b23428 100644
 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
 +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
-@@ -96,7 +96,7 @@ class HostdowntimestarthistoryQuery extends IdoQuery
+@@ -96,7 +96,7 @@ class HostdowntimestarthistoryQuery exte
              array()
          );
  
@@ -24,11 +16,9 @@ index 831df6c..4b23428 100644
              $this->select->where(
                  "hdh.actual_start_time > '1970-01-02 00:00:00'"
              );
-diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
-index 6ed081e..fd4dfba 100644
 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
 +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
-@@ -97,7 +97,7 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
+@@ -97,7 +97,7 @@ class ServicedowntimestarthistoryQuery e
              array()
          );
  


=====================================
debian/patches/0003-ApplicationBootstrap-setupErrorHandling-migrate-erro.patch
=====================================
@@ -1,18 +1,11 @@
-From: "Alexander A. Klimov" <alexander.klimov at icinga.com>
-Date: Fri, 4 Dec 2020 12:15:13 +0100
-Subject: ApplicationBootstrap#setupErrorHandling(): migrate error handler to
- PHP 8
+Description: ApplicationBootstrap#setupErrorHandling(): migrate error handler to PHP 8
+ as recommended here:
+ https://www.php.net/manual/de/migration80.incompatible.php
+Author: "Alexander A. Klimov" <alexander.klimov at icinga.com>
+Origin: https://github.com/Icinga/icingaweb2/pull/4289/commits/d1ba4930301a5f957d952ea80aeeb806f30731f3
+Bug: https://github.com/Icinga/icingaweb2/issues/4287
+Bug-Debian: https://bugs.debian.org/977337
 
-... as recommended here:
-https://www.php.net/manual/de/migration80.incompatible.php
-
-refs #4287
----
- library/Icinga/Application/ApplicationBootstrap.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
-index f3d8c08..0e774fd 100644
 --- a/library/Icinga/Application/ApplicationBootstrap.php
 +++ b/library/Icinga/Application/ApplicationBootstrap.php
 @@ -546,7 +546,7 @@ abstract class ApplicationBootstrap


=====================================
debian/patches/0004-DashboardConfig-listConfigFilesForUser-silence-error.patch
=====================================
@@ -1,17 +1,10 @@
-From: "Alexander A. Klimov" <alexander.klimov at icinga.com>
-Date: Thu, 3 Dec 2020 19:31:53 +0100
-Subject: DashboardConfig::listConfigFilesForUser(): silence errors from
- opendir()
+Description: DashboardConfig::listConfigFilesForUser(): silence errors from opendir()
+ which appeared with PHP 8.
+Author: "Alexander A. Klimov" <alexander.klimov at icinga.com>
+Origin: https://github.com/Icinga/icingaweb2/commit/97489945d9083de1d6163cf44229355a63b46223
+Bug: https://github.com/Icinga/icingaweb2/issues/4287
+Bug-Debian: https://bugs.debian.org/977337
 
-... which appeared with PHP 8.
-
-refs #4287
----
- library/Icinga/Legacy/DashboardConfig.php | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/library/Icinga/Legacy/DashboardConfig.php b/library/Icinga/Legacy/DashboardConfig.php
-index 3fb5c2f..cb9734b 100644
 --- a/library/Icinga/Legacy/DashboardConfig.php
 +++ b/library/Icinga/Legacy/DashboardConfig.php
 @@ -3,6 +3,7 @@


=====================================
debian/patches/0005-Version-getGitHead-silence-errors-from-file_get_cont.patch
=====================================
@@ -1,16 +1,10 @@
-From: "Alexander A. Klimov" <alexander.klimov at icinga.com>
-Date: Fri, 4 Dec 2020 11:21:23 +0100
-Subject: Version::getGitHead(): silence errors from file_get_contents()
+Description: Version::getGitHead(): silence errors from file_get_contents()
+ which appeared with PHP 8.
+Author: "Alexander A. Klimov" <alexander.klimov at icinga.com>
+Origin: https://github.com/Icinga/icingaweb2/commit/3ef5f53b1fc0e77fbf126f3c8c25eb2fdd350124
+Bug: https://github.com/Icinga/icingaweb2/issues/4287
+Bug-Debian: https://bugs.debian.org/977337
 
-... which appeared with PHP 8.
-
-refs #4287
----
- library/Icinga/Application/Version.php | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
-index a863cd4..8410205 100644
 --- a/library/Icinga/Application/Version.php
 +++ b/library/Icinga/Application/Version.php
 @@ -3,6 +3,8 @@


=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# Not worth the effort
-testsuite-autopkgtest-missing
-



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/d2decfe27785fbc7ac49da60316c8519b661982b...b34cbef94eaf70b45f1dea2e8476b9fcdfab2e79

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/d2decfe27785fbc7ac49da60316c8519b661982b...b34cbef94eaf70b45f1dea2e8476b9fcdfab2e79
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/20201214/341fa698/attachment-0001.html>
