system/apache-tomcat: Updated for version 10.0.13

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

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

3 files changed, 28 insertions, 22 deletions

diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild
index 7f55169d53..303fe7555b 100644
--- a/system/apache-tomcat/apache-tomcat.SlackBuild
+++ b/system/apache-tomcat/apache-tomcat.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for apache-tomcat
 
-# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2010  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
 # All rights reserved.
 #
@@ -12,21 +12,21 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  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=apache-tomcat
-VERSION=${VERSION:-7.0.103}
+VERSION=${VERSION:-10.0.13}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -74,12 +74,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \
-  $PKG/var/{run,lib,log,tmp,spool}/tomcat
-
- # required, otherwise, permissions on /var/tmp will be
- # (re)set to 755 when package is installed.
- #
-chmod 1777 $PKG/var/tmp
+  $PKG/var/{lib,log,spool}/tomcat
 
 rm -f bin/*.exe bin/*.bat bin/*.tar.gz bin/commons-daemon.jar
 cp -rf bin lib $PKG/usr/share/tomcat/
@@ -95,7 +90,7 @@ ln -s /var/tmp/tomcat ${PKG}${TOMCAT_HOME}/temp
 ln -s /var/run/tomcat ${PKG}${TOMCAT_HOME}/work
 ln -s /etc/tomcat ${PKG}${TOMCAT_HOME}/conf
 
-for i in tmp run spool; do
+for i in spool; do
     chown -R tomcat:tomcat ${PKG}/var/${i}/tomcat
     chmod -R 755 ${PKG}/var/${i}/tomcat
 done
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info
index 24d1c28ccb..e658d1a5ab 100644
--- a/system/apache-tomcat/apache-tomcat.info
+++ b/system/apache-tomcat/apache-tomcat.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-tomcat"
-VERSION="7.0.103"
+VERSION="10.0.13"
 HOMEPAGE="https://tomcat.apache.org/"
-DOWNLOAD="https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz"
-MD5SUM="8dd9df51900023107e0c24f4ed105b01"
+DOWNLOAD="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.13/bin/apache-tomcat-10.0.13.tar.gz"
+MD5SUM="ae54989ab07f37e84a39637a1888dfa3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk commons-daemon"
diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat
index 75c083b679..3e2c307bf7 100644
--- a/system/apache-tomcat/rc.tomcat
+++ b/system/apache-tomcat/rc.tomcat
@@ -38,6 +38,17 @@ TOMCAT_CMD="-user $USER -cp $CLASSPATH \
 
 tomcat_start() {
   echo -n "Starting Apache Tomcat ... "
+  if ! [ -e /var/run/tomcat ]; then
+    mkdir /var/run/tomcat
+    chown tomcat:tomcat /var/run/tomcat
+    chmod 755 /var/run/tomcat
+  fi
+  if ! [ -e /var/tmp/tomcat ]; then
+    mkdir /var/tmp/tomcat
+    chown tomcat:tomcat /var/tmp/tomcat
+    chmod 755 /var/tmp/tomcat
+  fi
+
   if [ -e "$PIDFILE" ]; then
     echo "already running!"
   else