1 files changed, 24 insertions, 11 deletions
diff --git a/network/zabbix_agentd/zabbix_agentd.SlackBuild b/network/zabbix_agentd/zabbix_agentd.SlackBuild
index 2a68604788..c3597c05c7 100644
--- a/network/zabbix_agentd/zabbix_agentd.SlackBuild
+++ b/network/zabbix_agentd/zabbix_agentd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zabbix_agentd
 
@@ -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_agentd
-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
@@ -47,7 +50,14 @@ ZABBIXAGENTGROUP=${ZABBIXAGENTGROUP:-zabbixagent}
 ZABBIXAGENTUID=${ZABBIXAGENTUID:-266}
 ZABBIXAGENTGID=${ZABBIXAGENTGID:-266}
 
-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}
@@ -103,6 +113,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-libpcre2 \
+  --with-openssl \
+  --enable-ipv6 \
   --enable-agent \
   --build=$ARCH-slackware-linux
 
@@ -123,16 +136,16 @@ touch $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 chown $ZABBIXAGENTUSER:$ZABBIXUSER $PKG/var/log/$PRGSHORT/$PRGNAM.log.new
 
 # Dir for pid-file
-mkdir -p $PKG/var/run/$PRGSHORT
-chown -R $ZABBIXUSER:$ZABBIXGROUP $PKG/var/run/$PRGSHORT
-chmod g+w $PKG/var/run/$PRGSHORT
+mkdir -p $PKG/var/run/$PRGNAM
+chown -R $ZABBIXAGENTUSER:$ZABBIXGROUP $PKG/var/run/$PRGNAM
+chmod g+w $PKG/var/run/$PRGNAM
 
 # Configuration file
-sed -e "s,# PidFile=/tmp/,PidFile=/var/run/$PRGSHORT/," \
-    -e "s,LogFile=/tmp/,LogFile=/var/log/$PRGSHORT/," \
+sed -e "s,# PidFile=/tmp/zabbix_agentd.pid,PidFile=/var/run/$PRGNAM/$PRGNAM.pid," \
+    -e "s,LogFile=/tmp/zabbix_agentd.log,LogFile=/var/log/$PRGSHORT/$PRGNAM.log," \
     $PKG/etc/$PRGSHORT/$PRGNAM.conf > $PKG/etc/$PRGSHORT/$PRGNAM.conf.new
 rm -rf $PKG/etc/$PRGSHORT/zabbix_agent.conf.d $PKG/etc/$PRGSHORT/zabbix_agent.conf \
-  $PKG/etc/$PRGSHORT/$PRGNAM.conf
+  $PKG/etc/$PRGSHORT/$PRGNAM.conf $PKG/etc/$PRGSHORT/$PRGNAM.conf.d/
 
 # Init script
 mkdir -p $PKG/etc/rc.d
@@ -140,7 +153,7 @@ sed "s|@ZABBIXAGENTUSER@|$ZABBIXAGENTUSER|" $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$
 
 # 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
 
@@ -150,4 +163,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