Commit 37ff688f authored by Leonardo Arena's avatar Leonardo Arena

community/zabbix: fix webif depends and php7.1 compatibility

Fixes #7282 #7283
parent 73552925
......@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zabbix
pkgver=3.2.6
pkgrel=0
pkgrel=1
pkgdesc="Enterprise-class open source distributed monitoring"
url="http://www.zabbix.com"
arch="all"
......@@ -12,7 +12,8 @@ license="GPL"
depends="fping"
_php=php7
_php_depends="$_php ${_php}-gd ${_php}-curl ${_php}-bcmath ${_php}-sockets
${_php}-iconv ${_php}-xmlreader ${_php}-ctype ${_php}-gettext"
${_php}-iconv ${_php}-xmlreader ${_php}-xmlwriter ${_php}-ctype
${_php}-gettext"
makedepends="postgresql-dev curl-dev net-snmp-dev
sqlite-dev mariadb-dev curl-dev openipmi-dev unixodbc-dev
libxml2-dev autoconf automake libssh2-dev gnutls-dev
......@@ -23,14 +24,16 @@ pkggroups="zabbix"
subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql
$pkgname-webif::noarch $pkgname-sqlite $pkgname-utils $pkgname-setup::noarch"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
zabbix-getloadavg.patch
automake.patch
musl-fix-includes.patch
zabbix-server.initd
zabbix-server.confd
zabbix-agentd.initd
zabbix-proxy.initd
zabbix-getloadavg.patch
automake.patch
musl-fix-includes.patch
zabbix_server.conf.patch
ZBX-11549.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -191,11 +194,12 @@ agent() {
}
sha512sums="48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844 zabbix-3.2.6.tar.gz
b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c zabbix-getloadavg.patch
9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee automake.patch
9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91 musl-fix-includes.patch
3a25bf9f428f55545dd735aea2855e0e4927e006ca01a2f918ec161ffe9b2ec66e46598bf34208e24535e1d04e33087f42eb8226b17eb4118abd6507bbb10ff5 zabbix-server.initd
a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80 zabbix-server.confd
7cc2672b717f1b47b12342fe225e9dc3838c61a0bf81d359d0a71efb0adc9b354fb8bc8b5bb64c9defa5700bcaf651b35778194a50b6b03b0a723dce76460092 zabbix-agentd.initd
e19490e724c6e4ecdadf7ee3898567b82f18ea2a894ef709bfc181c3076d50435b45429207dd4d537aacbec0242d83393240e48b434d9681ebb0d67a45643ed1 zabbix-proxy.initd
e0c9f937d39e15fa34e70e8ae9e6578b221b51c13dc0515e807675d153a85ab6370ed20ce2d06aa4457baaf3963edce525cd00e85fb105b36b58741798d13836 zabbix_server.conf.patch"
b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c zabbix-getloadavg.patch
9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee automake.patch
9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91 musl-fix-includes.patch
e0c9f937d39e15fa34e70e8ae9e6578b221b51c13dc0515e807675d153a85ab6370ed20ce2d06aa4457baaf3963edce525cd00e85fb105b36b58741798d13836 zabbix_server.conf.patch
58ccfc536f92025cfe6a8be55696bf94a48b77aae4fb334647ab7f9f947f0e16be1e3e77b6b22e5f65ee6cd0959701cacedf5addc14df4485c00d8ee3de64a1f ZBX-11549.patch"
--- a/frontends/php/include/func.inc.php
+++ b/frontends/php/include/func.inc.php
@@ -401,6 +401,7 @@
function str2mem($val) {
$val = trim($val);
$last = strtolower(substr($val, -1));
+ $val = (int) $val;
switch ($last) {
case 'g':
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment