diff options
Diffstat (limited to 'www/tomcat9')
| -rw-r--r-- | www/tomcat9/Makefile | 2 | ||||
| -rw-r--r-- | www/tomcat9/files/tomcat9.in | 24 |
2 files changed, 16 insertions, 10 deletions
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile index 8b4efd75b3ea..6f5598aa5350 100644 --- a/www/tomcat9/Makefile +++ b/www/tomcat9/Makefile @@ -1,6 +1,6 @@ PORTNAME= tomcat DISTVERSION= 9.0.104 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= 9 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'" |