diff options
Diffstat (limited to 'www/tomcat9/files')
| -rw-r--r-- | www/tomcat9/files/patch-bin__daemon.sh | 6 | ||||
| -rw-r--r-- | www/tomcat9/files/tomcat9.in | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/www/tomcat9/files/patch-bin__daemon.sh b/www/tomcat9/files/patch-bin__daemon.sh index d43ad7ef1eb6..fd81ac439ba9 100644 --- a/www/tomcat9/files/patch-bin__daemon.sh +++ b/www/tomcat9/files/patch-bin__daemon.sh @@ -1,6 +1,6 @@ ---- bin/daemon.sh.orig +--- bin/daemon.sh.orig 2025-07-31 18:19:48 UTC +++ bin/daemon.sh -@@ -115,12 +115,9 @@ +@@ -114,12 +114,9 @@ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap @@ -15,7 +15,7 @@ fi # Set the default service-start wait time if necessary test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 -@@ -137,7 +134,7 @@ +@@ -136,7 +133,7 @@ test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" # Add on extra jar files to CLASSPATH test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in index 21f4624e41e4..e807618d5c48 100644 --- a/www/tomcat9/files/tomcat9.in +++ b/www/tomcat9/files/tomcat9.in @@ -109,18 +109,24 @@ required_dirs="${_tomcat_catalina_tmpdir}" extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` +_tomcat_java9_opts="\ + --add-opens=java.base/java.lang=ALL-UNNAMED \ + --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \ + --add-opens=java.base/java.lang.reflect=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" +_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED" case "${_tomcat_java_version}" in - 9* | [1-2][0-9]* ) + 1[7-9]* | [2-9][0-9]* ) _tomcat_endorsed_dirs_option= - export JAVA_TOOL_OPTIONS="\ - --add-opens=java.base/java.lang=ALL-UNNAMED \ - --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \ - --add-opens=java.base/java.lang.reflect=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" + _tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}" + ;; + 9* | 1[0-6]* ) + _tomcat_endorsed_dirs_option= + _tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}" ;; *) _tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'" |