network/zabbix_proxy: Updated for version 1.8.16.

This commit was backported from the 14.0 repo at the request
of the maintainer.  The rationale is that lots of people are
still using zabbix*-1.8.x, and since the 14.0 repo will soon
be updated for 2.x, this would give those people the latest
stable version with a minimum of hassle for them.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 19 insertions, 14 deletions

diff --git a/network/zabbix_proxy/README b/network/zabbix_proxy/README
index df4a145a96..f64508f175 100644
--- a/network/zabbix_proxy/README
+++ b/network/zabbix_proxy/README
@@ -19,3 +19,6 @@ ZABBIXUSER and ZABBIXGROUP variables when running the build script.
 
 For some important post-build and basic configuration instructions,
 see the included README.SLACKWARE file.
+
+This requires iksemel and libssh2.
+This conflicts with the zabbix_server package.
diff --git a/network/zabbix_proxy/slack-desc b/network/zabbix_proxy/slack-desc
index 7c99dc0b6f..d341ff382e 100644
--- a/network/zabbix_proxy/slack-desc
+++ b/network/zabbix_proxy/slack-desc
@@ -17,4 +17,3 @@ zabbix_proxy:
 zabbix_proxy: http://www.zabbix.com/
 zabbix_proxy:
 zabbix_proxy:
-
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index c14b0f81f6..95da798450 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for zabbix_proxy
 
 # Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2012 Michal Bialozor, Gdansk, POLAND
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Thanks to Michal Bialozor for the initial idea.
-# revision date 2011/12/30
-
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-1.8.10}
+VERSION=${VERSION:-1.8.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -102,7 +100,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-proxy \
   --with-mysql \
   --with-net-snmp \
+  --with-jabber \
   --with-libcurl \
+  --with-ssh2 \
+  --with-ldap \
   --build=$ARCH-slackware-linux
 
 make
@@ -115,7 +116,7 @@ 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,upgrades}
+mkdir -p $PKG/usr/share/$PRGNAM/create $PKG/usr/share/$PRGNAM/upgrades
 cp -a create/schema \
   $PKG/usr/share/$PRGNAM/create/
 cp -a upgrades/dbpatches \
@@ -123,7 +124,7 @@ cp -a upgrades/dbpatches \
 
 # Initial log file
 mkdir -p $PKG/var/log/$PRGSHORT
-touch $PKG/var/log/$PRGSHORT/${PRGNAM}.log.new
+touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/log/$PRGSHORT
 
 # Dir for pid-file
@@ -131,15 +132,17 @@ mkdir -p $PKG/var/run/$PRGSHORT
 chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT
 
 # Configuration file
-mkdir -p $PKG/etc/$PRGSHORT
+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
 
+# Init script
 mkdir -p $PKG/etc/rc.d
 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 \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index 6cb0f31376..557249d473 100644
--- a/network/zabbix_proxy/zabbix_proxy.info
+++ b/network/zabbix_proxy/zabbix_proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_proxy"
-VERSION="1.8.10"
+VERSION="1.8.16"
 HOMEPAGE="http://www.zabbix.com"
-DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz"
-MD5SUM="7e89f80c1822787c0831f7c0dbefcd7b"
+DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.16.tar.gz"
+MD5SUM="891b7a5c915f3060b66687a483dc0551"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
-APPROVED="Erik Hanson"
+MAINTAINER="Michal Bialozor"
+EMAIL="bialyy@o2.pl"
+APPROVED="rworkman"