network/zabbix_proxy: Updated for version 1.8.15, cleanups.

Noted incompatibility with zabbix_server
(small bash related cleanups  --ponce)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

5 files changed, 27 insertions, 25 deletions

diff --git a/network/zabbix_proxy/README b/network/zabbix_proxy/README
index df4a145a9666e..b5eb9aa9dda34 100644
--- a/network/zabbix_proxy/README
+++ b/network/zabbix_proxy/README
@@ -19,3 +19,5 @@ 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 conflicts with zabbix_server package.
diff --git a/network/zabbix_proxy/doinst.sh b/network/zabbix_proxy/doinst.sh
index 6216aa17c20f9..03b761522767b 100644
--- a/network/zabbix_proxy/doinst.sh
+++ b/network/zabbix_proxy/doinst.sh
@@ -1,13 +1,13 @@
 config() {
-    NEW="$1"
-    OLD="$(dirname $NEW)/$(basename $NEW .new)"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r $OLD ]; then
-        mv $NEW $OLD
-    elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
-        rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 preserve_perms() {
@@ -25,4 +25,3 @@ preserve_perms etc/rc.d/rc.zabbix_proxy.new
 config etc/zabbix/zabbix_proxy.conf.new
 config var/log/zabbix/zabbix_proxy.log.new
 rm -f var/log/zabbix/zabbix_proxy.log.new
-
diff --git a/network/zabbix_proxy/slack-desc b/network/zabbix_proxy/slack-desc
index 7c99dc0b6f2af..d341ff382eed2 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 c14b0f81f67de..350f43f9da71d 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 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 +22,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.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -102,7 +99,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 +115,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 +123,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 +131,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 28aea9b120cd3..b9f56364daef8 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.15"
 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.15.tar.gz"
+MD5SUM="bb1951b20c61c0f576c824d06f8318a6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="iksemel libssh2"
+MAINTAINER="Michal Bialozor"
+EMAIL="bialyy@o2.pl"