5 files changed, 42 insertions, 23 deletions
diff --git a/network/zabbix_proxy/README b/network/zabbix_proxy/README
index b5eb9aa9dd..d040bc15bc 100644
--- a/network/zabbix_proxy/README
+++ b/network/zabbix_proxy/README
@@ -1,16 +1,17 @@
 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
-Zabbix server and all data is collected centrally.
+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,
-including distributed monitoring, auto-discovery, notifications, etcetera.
+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
-to the following by SlackBuilds.org, but feel free to change it on your
-system for consistency with local assignments.
+zabbix_proxy needs to run under its own user/group. This has been
+assigned to the following by SlackBuilds.org, but feel free to change
+it on your system for consistency with local assignments.
   User:   zabbix            UID: 228        GID: 228
   group:  zabbix                            GID: 228
 
diff --git a/network/zabbix_proxy/README.SLACKWARE b/network/zabbix_proxy/README.SLACKWARE
index d9ccd5e4ad..8294fd8ad0 100644
--- a/network/zabbix_proxy/README.SLACKWARE
+++ b/network/zabbix_proxy/README.SLACKWARE
@@ -42,7 +42,7 @@ On your MariaDB server, connect with full privileges:
 
 Create the zabbix database & user:
 
-  mysql> create database zabbix_proxy character set utf8;
+  mysql> create database zabbix_proxy character set utf8mb4 collate utf8mb4_bin;
   mysql> use mysql;
   mysql> grant all on zabbix_proxy.* to zabbix_proxy@<your_zabbix_proxy> identified by '<your_password>';
   mysql> flush privileges;
@@ -67,7 +67,7 @@ A standard configuration file is installed as /etc/zabbix/zabbix_proxy.conf
 
 You will need to change at least the following lines:
 
-  Server=<ip_of_your_zabbix_proxy>
+  Server=<ip_of_your_zabbix_server>
   Hostname=<hostname_of_your_zabbix_proxy>
 
   DBHost=<your_mysql_server>            (Change if MariaDB is not on localhost)
diff --git a/network/zabbix_proxy/rc.zabbix_proxy b/network/zabbix_proxy/rc.zabbix_proxy
index ff169bc023..ed118f9d35 100644
--- a/network/zabbix_proxy/rc.zabbix_proxy
+++ b/network/zabbix_proxy/rc.zabbix_proxy
@@ -75,5 +75,5 @@ case "$1" in
         RETVAL=1
 esac
 
-exit $RETVAL
+#exit $RETVAL
 #EOF
diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index 4393bb7bc4..c8842f45ca 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_proxy
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-4.0.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +45,14 @@ ZABBIXGROUP=${ZABBIXGROUP:-zabbix}
 ZABBIXUID=${ZABBIXUID:-228}
 ZABBIXGID=${ZABBIXGID:-228}
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -99,11 +109,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-proxy \
   --with-mysql \
-  --with-jabber \
   --with-libcurl \
   --with-net-snmp \
-  --with-ssh2 \
+  --with-libxml2 \
+  --with-ssh \
   --with-ldap \
+  --with-libpcre2 \
+  --with-openssl \
+  --enable-ipv6 \
+  --with-unixodbc \
+  --with-zlib \
+  --with-libpthread \
+  --with-libevent \
+  --with-iconv \
   --build=$ARCH-slackware-linux
 
 make
@@ -136,7 +154,7 @@ 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/," \
     $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
-rm -f $PKG/etc/$PRGSHORT/$PRGNAM.conf
+rm -rf $PKG/etc/$PRGSHORT/$PRGNAM.conf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -144,7 +162,7 @@ cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 
 # Documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog 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
 
@@ -154,4 +172,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info
index 4704e28f2e..b56fd5d9a7 100644
--- a/network/zabbix_proxy/zabbix_proxy.info
+++ b/network/zabbix_proxy/zabbix_proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_proxy"
-VERSION="4.0.4"
+VERSION="6.4.11"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz"
-MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.11.tar.gz"
+MD5SUM="c1bac67a0d6b9d0d4376ca8176f327a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="iksemel jdk"
+REQUIRES="unixODBC"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"