1 files changed, 14 insertions, 10 deletions
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index 4314f90c96..39a79ac5a0 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for zabbix_proxy
 
-# Copyright 2012 Michal Bialozor, Gdansk, POLAND
+# Copyright 2013 Michal Bialozor, Gdansk, Pomorskie, POLAND
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-1.8.16}
+VERSION=${VERSION:-2.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -91,16 +91,17 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
+  --sysconfdir=/etc/zabbix \
+  --datadir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-proxy \
   --with-mysql \
-  --with-net-snmp \
   --with-jabber \
   --with-libcurl \
+  --with-net-snmp \
   --with-ssh2 \
   --with-ldap \
   --build=$ARCH-slackware-linux
@@ -115,9 +116,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Database scripts
-mkdir -p $PKG/usr/share/$PRGNAM/create $PKG/usr/share/$PRGNAM/upgrades
-cp -a create/schema \
-  $PKG/usr/share/$PRGNAM/create/
+mkdir -p $PKG/usr/share/$PRGNAM/database/mysql
+cp -a database/mysql/schema.sql \
+  $PKG/usr/share/$PRGNAM/database/mysql/
 cp -a upgrades/dbpatches \
   $PKG/usr/share/$PRGNAM/upgrades/
 
@@ -125,17 +126,19 @@ cp -a upgrades/dbpatches \
 mkdir -p $PKG/var/log/$PRGSHORT
 touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/log/$PRGSHORT
+chmod g+w $PKG/var/log/$PRGSHORT
 
 # Dir for pid-file
 mkdir -p $PKG/var/run/$PRGSHORT
 chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT
+chmod g+w $PKG/var/run/$PRGSHORT
 
 # Configuration file
-mkdir -p $PKG/etc/$PRGSHORT/externalscripts $PKG/etc/$PRGSHORT/zabbix_proxy.conf.d
 sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \
     -e "s,# DBSocket=/tmp/,DBSocket=/var/run/mysql/," \
     -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \
-    misc/conf/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
+    $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
+rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -143,11 +146,12 @@ cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog CREDITS INSTALL NEWS README \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+# Installation scripts
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh