new version 2.5.1-1

3 files changed, 7 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b99b668fb68..a891ca357442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = icingaweb2
 	pkgdesc = Icinga Web 2 Interface
-	pkgver = 2.5.0
+	pkgver = 2.5.1
 	pkgrel = 1
 	url = http://www.icinga.org
 	install = icingaweb2.install
@@ -10,11 +10,11 @@ pkgbase = icingaweb2
 	optdepends = php-gd: export data to PDF
 	optdepends = php-intl: support for internationalization
 	optdepends = php-pgsql: for PostgreSQL backend
-	source = https://github.com/Icinga/icingaweb2/archive/v2.5.0.tar.gz
+	source = https://github.com/Icinga/icingaweb2/archive/v2.5.1.tar.gz
 	source = pr3186-php72-support.diff
 	source = HTMLPurifier-autoload-deprecation-warning.diff
-	sha256sums = 870ef8390cb2cab20df0107d817846352dc606ee85ec734aa99452222a4a76fb
-	sha256sums = fa26be3173eec8f73f72b8208f3a78d1323dadb9b3e24382c1382dadf150dd98
+	sha256sums = a419f0d94d7633cf49ce71a63536bc7f7b820eb08329d7c92411485cd520fa10
+	sha256sums = 3313d453f542abdd99fefd17acd550b4a1f585a9aef9cdc7c78a3858126ddc2e
 	sha256sums = 69aa5ebf5ab234c2caad879199dfbaef85d867d701280ef05b50083cc0efffde
 
 pkgname = icingaweb2
diff --git a/PKGBUILD b/PKGBUILD
index d915f70f992c..3cf5b907786f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Julian Brost <julian@0x4a42.net>
 
 pkgname=icingaweb2
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="Icinga Web 2 Interface"
 license=('GPL')
@@ -16,8 +16,8 @@ source=("https://github.com/Icinga/${pkgname}/archive/v${pkgver}.tar.gz"
         'pr3186-php72-support.diff'
         'HTMLPurifier-autoload-deprecation-warning.diff')
 install='icingaweb2.install'
-sha256sums=('870ef8390cb2cab20df0107d817846352dc606ee85ec734aa99452222a4a76fb'
-            'fa26be3173eec8f73f72b8208f3a78d1323dadb9b3e24382c1382dadf150dd98'
+sha256sums=('a419f0d94d7633cf49ce71a63536bc7f7b820eb08329d7c92411485cd520fa10'
+            '3313d453f542abdd99fefd17acd550b4a1f585a9aef9cdc7c78a3858126ddc2e'
             '69aa5ebf5ab234c2caad879199dfbaef85d867d701280ef05b50083cc0efffde')
 
 prepare() {
diff --git a/pr3186-php72-support.diff b/pr3186-php72-support.diff
index 80ef2f30666b..78f7cd193739 100644
--- a/pr3186-php72-support.diff
+++ b/pr3186-php72-support.diff
@@ -282,25 +282,6 @@ index e00544cf9b..36dd84e9dd 100644
      /**
       * Create a new PHPSession object using the provided options (if any)
       *
-diff --git a/modules/monitoring/application/views/helpers/PluginOutput.php b/modules/monitoring/application/views/helpers/PluginOutput.php
-index 5224185bcb..2a8e300f40 100644
---- a/modules/monitoring/application/views/helpers/PluginOutput.php
-+++ b/modules/monitoring/application/views/helpers/PluginOutput.php
-@@ -163,8 +163,14 @@ protected function getPurifier()
-         if (self::$purifier === null) {
-             require_once 'HTMLPurifier/Bootstrap.php';
-             require_once 'HTMLPurifier.php';
-+
-+            $oldErrorReportingLevel = error_reporting();
-+            error_reporting($oldErrorReportingLevel & ~ E_DEPRECATED);
-+
-             require_once 'HTMLPurifier.autoload.php';
- 
-+            error_reporting($oldErrorReportingLevel);
-+
-             $config = HTMLPurifier_Config::createDefault();
-             $config->set('Core.EscapeNonASCIICharacters', true);
-             $config->set('HTML.Allowed', 'p,br,b,a[href|target],i,table,tr,th[colspan],td[colspan],div,*[class]');
 diff --git a/modules/monitoring/library/Monitoring/Plugin.php b/modules/monitoring/library/Monitoring/Plugin.php
 index 2edc459700..e8e1f5dbb8 100644
 --- a/modules/monitoring/library/Monitoring/Plugin.php