[Pkg-nagios-changes] [pkg-icinga-web] 01/03: Update package for PHP 7

[Markus Frosch (old DM Account)]

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit 15e0ff93d7dd090e20a2509c64154ea5dc7bc1e1
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Jul 18 10:12:09 2016 +0200

    Update package for PHP 7
    
    Closes: #821679 #821505 #821506 #821507
---
 debian/control             | 18 +++++++++---------
 debian/icinga-web.postinst |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 677bb3c..5174f71 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Markus Frosch <lazyfrosch at debian.org>, Alexander Wirt <formorer at debian.org>, Jan Wagner <waja at cyconet.org>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf, php5-cli, php5-xsl, php5-json
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf, php-cli, php-xsl, php-json
 Standards-Version: 3.9.6
 Homepage: http://www.icinga.org
 Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-icinga-web.git
@@ -12,12 +12,12 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nagios/pkg-icinga-web.git;a
 Package: icinga-web
 Architecture: all
 Depends: dbconfig-common,
-         php5,
-         php5-cli,
-         php5-gd,
-         php5-mysql | php5-mysqlnd | php5-pgsql,
-         php5-xsl,
-         php5-json,
+         php,
+         php-cli,
+         php-gd,
+         php-mysql | php-pgsql,
+         php-xsl,
+         php-json,
          ucf,
          ${misc:Depends}
 # Notice: this will prevent users from using icinga-web 1.11 with a
@@ -83,7 +83,7 @@ Architecture: all
 Depends:
     icinga-web (= ${source:Version}),
     icinga2-ido-mysql,
-    php5-mysql | php5-mysqlnd,
+    php-mysql,
     ucf,
     ${misc:Depends}
 Conflicts: icinga-web-config-icinga, icinga-web-config-icinga2-ido-pgsql
@@ -111,7 +111,7 @@ Architecture: all
 Depends:
     icinga-web (= ${source:Version}),
     icinga2-ido-pgsql,
-    php5-pgsql,
+    php-pgsql,
     ucf,
     ${misc:Depends}
 Conflicts: icinga-web-config-icinga, icinga-web-config-icinga2-ido-mysql
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index 64d3641..6c0903f 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -119,12 +119,12 @@ setpassword() {
     source /etc/dbconfig-common/icinga-web.conf
 
     # gen new salt
-    salt=$(php5 -r 'echo hash("sha256", uniqid("root_", mt_rand()));')
+    salt=$(php -r 'echo hash("sha256", uniqid("root_", mt_rand()));')
 
     # gen new pw hash
     export SALT="$salt"
     export PW="$password"
-    pwhash=$(php5 -r 'echo hash_hmac("sha256", getenv("PW"), getenv("SALT"));')
+    pwhash=$(php -r 'echo hash_hmac("sha256", getenv("PW"), getenv("SALT"));')
 
     salt_e=${salt/\'/\\\'}
     pwhash_e=${pwhash/\'/\\\'}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git