4 files changed, 47 insertions, 34 deletions
diff --git a/network/zabbix_proxy/README b/network/zabbix_proxy/README
index 3b65e3cf39..df4a145a96 100644
--- a/network/zabbix_proxy/README
+++ b/network/zabbix_proxy/README
@@ -1,11 +1,11 @@
-Zabbix Proxies may greatly simplify maintenance of Zabbix environment 
+Zabbix Proxies may greatly simplify maintenance of Zabbix environment
 and increase performance of the central Zabbix server.
 
-Also, use of Zabbix Proxies is the easiest way of implementing centralized 
-and distributed monitoring, when all Agents and Proxies report to one 
+Also, use of Zabbix Proxies is the easiest way of implementing centralized
+and distributed monitoring, when all Agents and Proxies report to one
 Zabbix server and all data is collected centrally.
 
-Zabbix offers advanced monitoring, alerting and visualization features, 
+Zabbix offers advanced monitoring, alerting and visualization features,
 including distributed monitoring, auto-discovery, notifications, etcetera.
 
 zabbix_proxy needs to run under its own user/group. This has been assigned
@@ -17,5 +17,5 @@ system for consistency with local assignments.
 You can pass alternate values for the user and group using
 ZABBIXUSER and ZABBIXGROUP variables when running the build script.
 
-For some important post-build and basic configuration instructions, 
+For some important post-build and basic configuration instructions,
 see the included README.SLACKWARE file.
diff --git a/network/zabbix_proxy/doinst.sh b/network/zabbix_proxy/doinst.sh
index ee8cda05b7..6216aa17c2 100644
--- a/network/zabbix_proxy/doinst.sh
+++ b/network/zabbix_proxy/doinst.sh
@@ -10,14 +10,18 @@ config() {
     # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.zabbix_proxy.new:
-if [ -e etc/rc.d/rc.zabbix_proxy ]; then
-  cp -a etc/rc.d/rc.zabbix_proxy etc/rc.d/rc.zabbix_proxy.new.incoming
-  cat etc/rc.d/rc.zabbix_proxy.new > etc/rc.d/rc.zabbix_proxy.new.incoming
-  mv etc/rc.d/rc.zabbix_proxy.new.incoming etc/rc.d/rc.zabbix_proxy.new
-fi
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
 
-config etc/rc.d/rc.zabbix_proxy.new
+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/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index f8852d2abe..c3320744e0 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -1,12 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for zabbix_proxy
-# (with help from Michal Bialozor)
-# maintained by Niels Horn <niels.horn@gmail.com>
-# revision date 2011/02/13
+
+# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# 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/08/06
 
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-1.8.4}
+VERSION=${VERSION:-1.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,12 +55,9 @@ set -e
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned zabbix uid/gid are 228/228
 # See http://slackbuilds.org/uid_gid.txt
-if ! grep ^$ZABBIXGROUP: /etc/group 2>&1 > /dev/null; then
-    echo "  You must have a \"$ZABBIXGROUP\" group to run this script."
+if [ "$(grep ^$ZABBIXUSER: /etc/passwd)" = "" -o "$(grep ^$ZABBIXGROUP: /etc/group)" = "" ] ; then
+    echo "  You must have a \"$ZABBIXGROUP\" group and user to run this script."
     echo "    # groupadd -g $ZABBIXGID $ZABBIXGROUP"
-    exit 1
-elif ! grep ^$ZABBIXUSER: /etc/passwd 2>&1 > /dev/null; then
-    echo "  You must have a \"$ZABBIXUSER\" user to run this script."
     echo "    # useradd -u $ZABBIXUID -g $ZABBIXGROUP -d /dev/null -s /bin/false $ZABBIXUSER"
     exit 1
 fi
@@ -48,23 +65,15 @@ fi
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 elif [ "$ARCH" = "x86_64" ]; then
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
-    ARCHQUADLET=""
-elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv4t"
-    LIBDIRSUFFIX=""
-    ARCHQUADLET="-gnueabi"
 else
     SLKCFLAGS="-O2"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 fi
 
 rm -rf $PKG
@@ -94,7 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql \
   --with-net-snmp \
   --with-libcurl \
-  --build=$ARCH-slackware-linux$ARCHQUADLET
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index 40753d8fe1..7b1291e3c1 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.4"
+VERSION="1.8.6"
 HOMEPAGE="http://www.zabbix.com"
-DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.4.tar.gz"
-MD5SUM="969ce09317c98b205bc96157e16f5c8c"
+DOWNLOAD="http://downloads.sourceforge.net/zabbix/zabbix-1.8.6.tar.gz"
+MD5SUM="4642fd263167211a73a02fe7f3bcd998"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"