From 769d7b5481d7a3d0e276ca485ed5fc86263a90fd Mon Sep 17 00:00:00 2001
From: zux <zux@pie-dabas.net>
Date: Fri, 15 Mar 2024 20:30:34 +0700
Subject: [PATCH] network/zabbix_server: Updated for version 6.4.11.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/zabbix_server/README.SLACKWARE        |  4 ++--
 network/zabbix_server/rc.zabbix_server        |  3 ---
 .../zabbix_server/zabbix_server.SlackBuild    | 19 +++++++++++--------
 network/zabbix_server/zabbix_server.info      |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/network/zabbix_server/README.SLACKWARE b/network/zabbix_server/README.SLACKWARE
index f37ff9c208..240f9b4269 100644
--- a/network/zabbix_server/README.SLACKWARE
+++ b/network/zabbix_server/README.SLACKWARE
@@ -4,7 +4,7 @@ README.Slackware
 This file contains some specific instructions to complete the
 installation of zabbix_server on Slackware.
 
-zabbix-java has been moved to a separate package - zabbix-java-gateway
+zabbix-java has been moved to a separate package - zabbix_java_gateway
 
 Frontend is now also in a seperate package - zabbix_frontend as it might be installed on a seperate machine
 
@@ -14,7 +14,7 @@ zabbix_server to run. MariaDB server does not have to be on the same box as
 zabbix_server, but they need to be able to communicate and you will need at
 least the MariaDB client on the box that will run zabbix_server.
 
-(*) zabbix can work with MySQL and its forks, Oracle and PostgreSQL 
+(*) zabbix can work with MySQL and its forks and PostgreSQL
 databases, but these instructions are for MariaDB, as it is included with
 Slackware.
 
diff --git a/network/zabbix_server/rc.zabbix_server b/network/zabbix_server/rc.zabbix_server
index 04011cca4f..01d0975ba5 100644
--- a/network/zabbix_server/rc.zabbix_server
+++ b/network/zabbix_server/rc.zabbix_server
@@ -74,6 +74,3 @@ case "$1" in
         echo "Usage: $(basename $0) {start|stop|restart }"
         RETVAL=1
 esac
-
-exit $RETVAL
-#EOF
diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild
index c1f9fdf342..1f573dab73 100644
--- a/network/zabbix_server/zabbix_server.SlackBuild
+++ b/network/zabbix_server/zabbix_server.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zabbix_server
-VERSION=${VERSION:-6.4.10}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -119,11 +119,15 @@ PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64
   --with-ssh \
   --with-ldap \
   --enable-ipv6 \
-  --with-libxml2=/usr/include/libxml2 \
+  --with-libxml2 \
   --with-openssl \
   --enable-ipv6 \
   --with-unixodbc \
   --with-libpcre2 \
+  --with-zlib \
+  --with-libpthread \
+  --with-libevent \
+  --with-iconv \
   --build=$ARCH-slackware-linux
 
 make
@@ -135,11 +139,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 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
 
-# Install "frontend" to $DOCROOT/zabbix
-#mkdir -p $PKG/$DOCROOT/$PRGSHORT
-#cp -a frontends/php/* $PKG/$DOCROOT/$PRGSHORT/
-#chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGSHORT
-
 # Database scripts
 mkdir -p $PKG/usr/share/$PRGNAM/database/mysql
 cp -a database/mysql $PKG/usr/share/$PRGNAM/database/
@@ -160,7 +159,11 @@ 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 -f $PKG/etc/$PRGSHORT/$PRGNAM.conf 
+rm -rf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d
+rm -rf $PKG/etc/$PRGSHORT/alertscripts/
+rm -rf $PKG/etc/$PRGSHORT/externalscripts/
+
 
 # Init script
 mkdir -p $PKG/etc/rc.d
diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info
index fe1577af38..c686cad35a 100644
--- a/network/zabbix_server/zabbix_server.info
+++ b/network/zabbix_server/zabbix_server.info
@@ -1,8 +1,8 @@
 PRGNAM="zabbix_server"
-VERSION="6.4.10"
+VERSION="6.4.11"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.10.tar.gz"
-MD5SUM="641cf6e5820dac44700963751042f900"
+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="unixODBC"