network/zabbix_java_gateway: Updated for version 6.0.6.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 107 insertions, 6 deletions

diff --git a/network/zabbix_java_gateway/java-gateway.patch b/network/zabbix_java_gateway/java-gateway.patch
new file mode 100644
index 0000000000..5ee278e272
--- /dev/null
+++ b/network/zabbix_java_gateway/java-gateway.patch
@@ -0,0 +1,79 @@
+diff -urN 5.4.orig/src/zabbix_java/lib/logback.xml 5.4/src/zabbix_java/lib/logback.xml
+--- 5.4.orig/src/zabbix_java/lib/logback.xml	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/lib/logback.xml	2021-02-03 16:08:48.139648517 +0200
+@@ -2,10 +2,10 @@
+ 
+ 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ 
+-		<file>/tmp/zabbix_java.log</file>
++		<file>/var/log/zabbix/zabbix_java_gateway.log</file>
+ 
+ 		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+-			<fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
++			<fileNamePattern>/var/log/zabbix/zabbix_java_gateway.log.%i</fileNamePattern>
+ 			<minIndex>1</minIndex>
+ 			<maxIndex>3</maxIndex>
+ 		</rollingPolicy>
+diff -urN 5.4.orig/src/zabbix_java/settings.sh 5.4/src/zabbix_java/settings.sh
+--- 5.4.orig/src/zabbix_java/settings.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/settings.sh	2021-02-03 17:30:37.637881653 +0200
+@@ -24,7 +24,7 @@
+ # Default:
+ # PID_FILE=
+ 
+-PID_FILE="/tmp/zabbix_java.pid"
++PID_FILE="/var/run/zabbix/zabbix_java_gateway.pid"
+ 
+ ### Option: zabbix.startPollers
+ #	Number of worker threads to start.
+diff -urN 5.4.orig/src/zabbix_java/shutdown.sh 5.4/src/zabbix_java/shutdown.sh
+--- 5.4.orig/src/zabbix_java/shutdown.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/shutdown.sh	2021-02-03 14:54:19.090352858 +0200
+@@ -1,7 +1,14 @@
+ #!/bin/sh
+ 
+-cd `dirname $0`
+-. ./settings.sh
++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then
++	. /etc/zabbix/zabbix_java_gateway.conf
++fi
++
++if [ -z $GATEWAY_HOME ]; then
++	GATEWAY_HOME="/usr/share/zabbix_java_gateway"
++fi
++
++cd $GATEWAY_HOME
+ 
+ if [ -n "$PID_FILE" ]; then
+ 	if [ -f "$PID_FILE" ]; then
+diff -urN 5.4.orig/src/zabbix_java/startup.sh 5.4/src/zabbix_java/startup.sh
+--- 5.4.orig/src/zabbix_java/startup.sh	2021-02-03 14:46:36.510530149 +0200
++++ 5.4/src/zabbix_java/startup.sh	2021-02-03 15:51:17.466224873 +0200
+@@ -1,7 +1,12 @@
+ #!/bin/sh
+ 
+-cd `dirname $0`
+-. ./settings.sh
++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then
++	. /etc/zabbix/zabbix_java_gateway.conf
++fi
++
++if [ -z $GATEWAY_HOME ]; then
++	GATEWAY_HOME="/usr/share/zabbix_java_gateway"
++fi
+ 
+ if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then
+ 	PID=`cat "$PID_FILE"`
+@@ -15,9 +20,9 @@
+ JAVA=${JAVA:-java}
+ 
+ JAVA_OPTIONS="$JAVA_OPTIONS -server"
+-if [ -z "$PID_FILE" ]; then
+-	JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=logback-console.xml"
+-fi
++JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=/etc/zabbix/zabbix_java_gateway_logback.xml"
++
++cd $GATEWAY_HOME
+ 
+ CLASSPATH="lib"
+ for jar in lib/*.jar bin/*.jar; do
diff --git a/network/zabbix_java_gateway/rc.zabbix_java_gateway b/network/zabbix_java_gateway/rc.zabbix_java_gateway
index ac65aad421..56798a5cea 100644
--- a/network/zabbix_java_gateway/rc.zabbix_java_gateway
+++ b/network/zabbix_java_gateway/rc.zabbix_java_gateway
@@ -18,7 +18,7 @@ prg_start() {
         fi
     fi
     mkdir -p ${PIDDIR}
-    ${PRGDIR}${PRGNAM} >> ${LOGDIR}${PRGNAM}.log 2>&1
+    ${PRGDIR}${PRGNAM}_startup >> ${LOGDIR}${PRGNAM}.log 2>&1
     RETVAL=$?
 
     if [ $RETVAL -eq 0 ]; then
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
index 78a18bb1a2..ac9e0c3a04 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zabbix_java_gateway
-VERSION=${VERSION:-6.0.3}
+VERSION=${VERSION:-6.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -113,6 +113,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-java \
   --build=$ARCH-slackware-linux
 
+patch -p1 < $CWD/java-gateway.patch
+
+
+
 make
 make install DESTDIR=$PKG
 
@@ -137,14 +141,32 @@ sed -e "s,PID_FILE=\"/tmp/zabbix_java.pid\",PID_FILE=/var/run/$PRGSHORT/$PRGNAM.
 cp $CWD/zabbix_java_gateway_logback.xml $PKG/etc/$PRGSHORT/
 rm -f $PKG/usr/sbin/zabbix_java/settings.sh
 
+# Binaries
+mkdir -p $PKG/usr/sbin
+sed -e "s,GATEWAY_HOME=\"/usr/sbin/zabbix_java\",GATEWAY_HOME=\"/usr/share/zabbix_java_gateway\"," \
+	$PKG/usr/sbin/zabbix_java/startup.sh > $PKG/usr/sbin/$PRGNAM\_startup
+chmod 755 $PKG/usr/sbin/$PRGNAM\_startup
+rm $PKG/usr/sbin/zabbix_java/startup.sh
+
+sed -e "s,GATEWAY_HOME=\"/usr/sbin/zabbix_java\",GATEWAY_HOME=\"/usr/share/zabbix_java_gateway\"," \
+	$PKG/usr/sbin/zabbix_java/shutdown.sh > $PKG/usr/sbin/$PRGNAM\_shutdown
+chmod 755 $PKG/usr/sbin/$PRGNAM\_shutdown
+rm $PKG/usr/sbin/zabbix_java/shutdown.sh
+
+#mkdir -p $PKG/usr/share/zabbix_java_gateway
+mkdir -p $PKG/usr/share/
+mv $PKG/usr/sbin/zabbix_java $PKG/usr/share/zabbix_java_gateway
+#rm $PKG/usr/sbin/zabbix_java/
+
 # Init script
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
 cp $CWD/$PRGNAM $PKG/usr/sbin/$PRGNAM
+chmod 755  $PKG/usr/sbin/$PRGNAM
 
 # 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
 
diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.info b/network/zabbix_java_gateway/zabbix_java_gateway.info
index 7a97f140da..08bfdfeb6b 100644
--- a/network/zabbix_java_gateway/zabbix_java_gateway.info
+++ b/network/zabbix_java_gateway/zabbix_java_gateway.info
@@ -1,8 +1,8 @@
 PRGNAM="zabbix_java_gateway"
-VERSION="6.0.3"
+VERSION="6.0.6"
 HOMEPAGE="https://www.zabbix.com"
-DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.3.tar.gz"
-MD5SUM="9b2bf6fd0996fe5593d8be63f8a548a1"
+DOWNLOAD="https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.6.tar.gz"
+MD5SUM="3aff89b2cadf21339be7d5cc381feb15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zulu-openjdk8"