5 files changed, 52 insertions, 65 deletions
diff --git a/network/zabbix_server/README b/network/zabbix_server/README
index e5c11daa57..9c343bb231 100644
--- a/network/zabbix_server/README
+++ b/network/zabbix_server/README
@@ -1,9 +1,10 @@
-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_server 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_server 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_server/README.SLACKWARE b/network/zabbix_server/README.SLACKWARE
index 71d5cee738..240f9b4269 100644
--- a/network/zabbix_server/README.SLACKWARE
+++ b/network/zabbix_server/README.SLACKWARE
@@ -4,14 +4,17 @@ 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
+
 
 You will need to have a working installation of httpd and MariaDB (*) for
 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, PostgreSQL and IBM DB2
+(*) zabbix can work with MySQL and its forks and PostgreSQL
 databases, but these instructions are for MariaDB, as it is included with
 Slackware.
 
@@ -45,7 +48,7 @@ On your MariaDB server, connect with full privileges:
 
 Create the zabbix database & user:
 
-  mysql> create database zabbix character set utf8 collate utf8_bin;
+  mysql> create database zabbix character set utf8mb4 collate utf8mb4_bin;
   mysql> use mysql;
   mysql> grant all privileges on zabbix.* to zabbix@<your_zabbix_server> identified by '<your_password>';
   mysql> flush privileges;
@@ -62,37 +65,12 @@ On your zabbix server, connect to the new database:
 In MariaDB, create the schema & add initial data:
 
   mysql> source schema.sql;
-  mysql> source data.sql;
   mysql> source images.sql;
+  mysql> source data.sql;
   mysql> quit
 
-1.2) Configure PHP
-
-zabbix requires some parameters in /etc/php.ini to be altered:
-
-  - post_max_size = 16M         Default = 8M
-  - max_execution_time = 300    Default = 30
-  - max_input_time = 300        Default = 60
-  - date.timezone               Needs to be set (default = blank)
-  - always_populate_raw_post_data = -1
-
-After changing the php.ini file, you'll need to restart httpd for the
-changes to have effect:
-
-  # /etc/rc.d/rc.httpd restart
 
-1.3) Configure httpd
-
-zabbix requires php enabled in /etc/httpd/httpd.conf
-
-uncomment the line:
-        Include /etc/httpd/mod_php.conf
-
-add index.php to the DirectoryIndex parameter
-        Directory index.html index.php
-
-
-1.4) zabbix_server configuration file
+1.2) zabbix_server configuration file
 
 A standard configuration file is installed as /etc/zabbix/zabbix_server.conf
 
@@ -139,10 +117,3 @@ Now you are ready to start zabbix_server by calling the startup script:
 
   # /etc/rc.d/rc.zabbix_server start
 
-Once zabbix_server has started and configured correctly, you should be able
-to access it by pointing your browser at:
-
-  http://(ip-of-your-zabbix-server)/zabbix/
-
-From here on, you can follow the manual to start the initial configuration
-and set up all the items to monitor.
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 98c7743920..1f573dab73 100644
--- a/network/zabbix_server/zabbix_server.SlackBuild
+++ b/network/zabbix_server/zabbix_server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_server
 
@@ -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_server
-VERSION=${VERSION:-4.4.4}
+VERSION=${VERSION:-6.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,16 +40,23 @@ fi
 
 PRGSHORT=zabbix
 
-DOCROOT=${DOCROOT:-/var/www/htdocs}
-PHPUSER=${PHPUSER:-root}
-PHPGROUP=${PHPGROUP:-apache}
+#DOCROOT=${DOCROOT:-/var/www/htdocs}
+#PHPUSER=${PHPUSER:-root}
+#PHPGROUP=${PHPGROUP:-apache}
 
 ZABBIXUSER=${ZABBIXUSER:-zabbix}
 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}
@@ -93,6 +103,7 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc/zabbix \
@@ -105,10 +116,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql \
   --with-libcurl \
   --with-net-snmp \
-  --with-ssh2 \
+  --with-ssh \
   --with-ldap \
-  --with-ipv6 \
+  --enable-ipv6 \
   --with-libxml2 \
+  --with-openssl \
+  --enable-ipv6 \
+  --with-unixodbc \
+  --with-libpcre2 \
+  --with-zlib \
+  --with-libpthread \
+  --with-libevent \
+  --with-iconv \
   --build=$ARCH-slackware-linux
 
 make
@@ -120,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/
@@ -145,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
@@ -153,7 +171,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
 
@@ -163,4 +181,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_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info
index 32f6a11d6c..c686cad35a 100644
--- a/network/zabbix_server/zabbix_server.info
+++ b/network/zabbix_server/zabbix_server.info
@@ -1,10 +1,10 @@
 PRGNAM="zabbix_server"
-VERSION="4.4.4"
+VERSION="6.4.11"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.4/zabbix-4.4.4.tar.gz"
-MD5SUM="9ac0cd663f7d3162f9206ddcc7ca7d9f"
+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"
+REQUIRES="unixODBC"
 MAINTAINER="zux"
 EMAIL="zux@pie-dabas.net"