3 files changed, 28 insertions, 26 deletions
diff --git a/network/zabbix_proxy/README.SLACKWARE b/network/zabbix_proxy/README.SLACKWARE
index 7257f04e44..2c4104ecae 100644
--- a/network/zabbix_proxy/README.SLACKWARE
+++ b/network/zabbix_proxy/README.SLACKWARE
@@ -4,9 +4,9 @@ README.Slackware
 This file contains some specific instructions to complete the
 installation of zabbix_proxy on Slackware.
 
-You will need to have a working installation of MySQL (*) for zabbix_proxy 
+You will need to have a working installation of MySQL (*) for zabbix_proxy
 to run. MySQL server does not have to be on the same box as your
-zabbix_proxy, but they need to be able to communicate and you will need at 
+zabbix_proxy, but they need to be able to communicate and you will need at
 least the MySQL client on the box that will run zabbix_proxy.
 
 (*) zabbix can work with MySQL, Oracle, PostgreSQL and SQLite databases,
@@ -33,29 +33,31 @@ running:
 
 1.1) Create initial database
 
+Never use the same DB, as the zabbix server uses. That will defenetly break it.
+
 On your MySQL server, connect with full privileges:
 
   # mysql -u <your_user> -p<your_password>
 
 Create the zabbix database & user:
 
-  mysql> create database zabbix character set utf8;
+  mysql> create database zabbix_proxy character set utf8;
   mysql> use mysql;
-  mysql> grant all on zabbix.* to zabbix@<your_zabbix_proxy> identified by '<your_password>';
+  mysql> grant all on zabbix_proxy.* to zabbix_proxy@<your_zabbix_proxy> identified by '<your_password>';
   mysql> flush privileges;
   mysql> quit
 
-(note: if your MySQL server and zabbix server are the same, use "localhost"
+(note: if your MySQL server and zabbix proxy are the same, use "localhost"
  for <your_zabbix_proxy>)
 
-On your zabbix server, connect to the new database:
+On your zabbix proxy, connect to the new database:
 
-  # cd /usr/share/zabbix_proxy/create
-  # mysql -h <your_mysql_server> -u zabbix -p<your_password> zabbix
+  # cd /usr/share/zabbix_proxy/database/mysql
+  # mysql -h <your_mysql_server> -u zabbix_proxy -p<your_password> zabbix_proxy
 
 In MySQL, create the schema & add initial data:
 
-  mysql> source schema/mysql.sql;
+  mysql> source schema.sql;
   mysql> quit
 
 1.2) zabbix_proxy configuration file
@@ -67,11 +69,12 @@ You will need to change at least the following lines:
   Server=<ip_of_your_zabbix_proxy>
   Hostname=<hostname_of_your_zabbix_proxy>
 
-  DBHost=<your_mysql_server>		(Change if MySQL is not on localhost)
-  DBUser=zabbix				("root" doesn't sound like a good idea)
-  DBPassword=<your_password>		(Change as defined above)
+  DBHost=<your_mysql_server>            (Change if MySQL is not on localhost)
+  DBName=zabbix_proxy
+  DBUser=zabbix_proxy                   ("root" doesn't sound like a good idea)
+  DBPassword=<your_password>            (Change as defined above)
 
-2) Start & Stop scripts for zabbix server
+2) Start & Stop scripts for zabbix proxy
 -----------------------------------------
 
 2.1) Automatic startup and shutdown
@@ -85,7 +88,7 @@ your /etc/rc.d/rc.local:
     /etc/rc.d/rc.zabbix_proxy start
   fi
 
-To guarantee a clean shutdown of zabbix_proxy, include this in 
+To guarantee a clean shutdown of zabbix_proxy, include this in
 /etc/rc.d/rc.local_shutdown:
 
   # Stop zabbix_proxy
@@ -96,7 +99,7 @@ To guarantee a clean shutdown of zabbix_proxy, include this in
 
 2.2) Make /etc/rc.d/rc.zabbix_proxy executable
 
-Additionally, you'll have to set the rc script to be executable just like 
+Additionally, you'll have to set the rc script to be executable just like
 any other Slackware rc script:
 
   # chmod +x /etc/rc.d/rc.zabbix_proxy
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index c780d28d7e..c03f1218ff 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-2.4.3}
+VERSION=${VERSION:-3.4.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -59,8 +59,8 @@ if [ "$(grep ^$ZABBIXUSER: /etc/passwd)" = "" -o "$(grep ^$ZABBIXGROUP: /etc/gro
     exit 1
 fi
 
-if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
     LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,7 +98,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-proxy \
-  --enable-java \
   --with-mysql \
   --with-jabber \
   --with-libcurl \
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index d5b173f259..28596da5c6 100644
--- a/network/zabbix_proxy/zabbix_proxy.info
+++ b/network/zabbix_proxy/zabbix_proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_proxy"
-VERSION="2.4.3"
+VERSION="3.4.14"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-2.4.3.tar.gz"
-MD5SUM="e8a0699c4e49999a15c63650a2280600"
+DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-3.4.14.tar.gz"
+MD5SUM="16cdacf7198538c0456523d75bb149c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
-MAINTAINER="Michal Bialozor"
-EMAIL="bialyy@o2.pl"
+REQUIRES="iksemel"
+MAINTAINER="zux"
+EMAIL="zux@pie-dabas.net"