[packages/tomcat/TOMCAT_9] Rel 5; fix init script

[arekm]

commit dd0001e335d2b2f43550bec496b6b5bf367a99fd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat May 16 02:47:01 2026 +0200

    Rel 5; fix init script

 apache-tomcat.init | 20 +++++++++++++-------
 tomcat.spec        |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index aa07c38..0597e22 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -17,7 +17,7 @@ Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		%{orgname}9
 Version:	9.0.115
-Release:	4
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
 Source0:	https://archive.apache.org/dist/tomcat/tomcat-9/v%{version}/src/apache-%{orgname}-%{version}-src.tar.gz
diff --git a/apache-tomcat.init b/apache-tomcat.init
index 7c98a4a..44e37fc 100755
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -26,14 +26,20 @@ fi
 set_jvm
 
 # Set default options
-# --add-opens flags per Tomcat 9 setup docs for jsvc usage:
+CATALINA_OPTS="-Xmx384M"
+
+# --add-opens flags for Java 9+ reflective access per Tomcat 9 setup docs.
+# Java 8 lacks these options and aborts with "Unrecognized option"; detect
+# a modular JDK (Java 9+) by the presence of lib/modules (jimage).
 # https://tomcat.apache.org/tomcat-9.0-doc/setup.html
-CATALINA_OPTS="-Xmx384M \
-	--add-opens=java.base/java.lang=ALL-UNNAMED \
-	--add-opens=java.base/java.io=ALL-UNNAMED \
-	--add-opens=java.base/java.util=ALL-UNNAMED \
-	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+if [ -e "$JAVA_HOME/lib/modules" ]; then
+	CATALINA_OPTS="$CATALINA_OPTS \
+		--add-opens=java.base/java.lang=ALL-UNNAMED \
+		--add-opens=java.base/java.io=ALL-UNNAMED \
+		--add-opens=java.base/java.util=ALL-UNNAMED \
+		--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+		--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+fi
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/dd0001e335d2b2f43550bec496b6b5bf367a99fd