Upgrade to zabbix-1.8.3

Upgraded to latest zabbix, fixed some permissions, use postgresql instead of sqlite

ref #251

1 files changed, 12 insertions, 12 deletions

diff --git a/testing/zabbix/APKBUILD b/testing/zabbix/APKBUILD
index f59787948b..c8e0b3503f 100644
--- a/testing/zabbix/APKBUILD
+++ b/testing/zabbix/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail> 
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=zabbix
-pkgver=1.8.2
-pkgrel=3
+pkgver=1.8.3
+pkgrel=0
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="www.zabbix.com"
 license="GPL"
-depends="php php-sqlite3 php-gd fping"
-makedepends="sqlite-dev libiconv-dev"
+depends="php php-pgsql php-gd php-curl php-bcmath php-sockets php-iconv fping"
+makedepends="postgresql-dev curl-dev libiconv-dev"
 install="$pkgname.pre-install"
 pkgusers="zabbix"
 pkggroups="zabbix"
@@ -47,7 +47,9 @@ build() {
                 --enable-agent \
                 --enable-proxy \
                 --enable-ipv6 \
-                --with-sqlite3
+                --with-pgsql \
+                --with-net-snmp \
+                --with-libcurl
         make || return 1
 }
 
@@ -56,19 +58,17 @@ package() {
         cd "$_builddir"
         make DESTDIR="$pkgdir" install
 
-        mkdir -p "$pkgdir"/usr/share/webapps/zabbix
-
         install -d -m0750 -o zabbix -g zabbix \
                 "$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix
 
         install -d "$pkgdir"/etc/zabbix 
         install -d "$pkgdir"/usr/share/zabbix/dbms/create/data
         install -d -m0755 "$_wwwdir"
-        install -D -m0640 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
-        install -D -m0640 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
+        install -D -m0644 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
+        install -D -m0644 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
         install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/data.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/data.sql
-        install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_mysql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_mysql.sql
-        install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/mysql.sql "$pkgdir"/usr/share/zabbix/dbms/create/mysql.sql
+        install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_pgsql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_pgsql.sql
+        install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/postgresql.sql "$pkgdir"/usr/share/zabbix/dbms/create/postgresql.sql
         cp -r "$srcdir"/zabbix-$pkgver/frontends/php/* "$_wwwdir"
         
         for i in server proxy agentd; do
@@ -78,7 +78,7 @@ package() {
   
 }
 
-md5sums="fa4be4fa7ac20a33cc0aa5c27b827746  zabbix-1.8.2.tar.gz
+md5sums="575c31880d73f6fe41e730874ebfc633  zabbix-1.8.3.tar.gz
 26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf