diff options
Diffstat (limited to 'www/tomcat101')
| -rw-r--r-- | www/tomcat101/Makefile | 3 | ||||
| -rw-r--r-- | www/tomcat101/distinfo | 6 | ||||
| -rw-r--r-- | www/tomcat101/files/tomcat101.in | 13 | ||||
| -rw-r--r-- | www/tomcat101/pkg-plist | 10 |
4 files changed, 23 insertions, 9 deletions
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile index 5f3401c6b053..6977459192aa 100644 --- a/www/tomcat101/Makefile +++ b/www/tomcat101/Makefile @@ -1,6 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 10.1.40 -PORTREVISION= 1 +DISTVERSION= 10.1.41 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= 101 diff --git a/www/tomcat101/distinfo b/www/tomcat101/distinfo index d2c548eb367e..cb885000965a 100644 --- a/www/tomcat101/distinfo +++ b/www/tomcat101/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744198379 -SHA256 (apache-tomcat-10.1.40.tar.gz) = 25f1e607f17ee2fa99e329eec23b6393ab9e1390929c6cdcb31f749576b94d8e -SIZE (apache-tomcat-10.1.40.tar.gz) = 13867286 +TIMESTAMP = 1747074614 +SHA256 (apache-tomcat-10.1.41.tar.gz) = 1f7cc8cce2d5f4acd35491d0fa2abafa6ddd9bb0425b57b277310fde5ff2fcb3 +SIZE (apache-tomcat-10.1.41.tar.gz) = 14079449 diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in index ac405c2fc815..a60d0f5f3a18 100644 --- a/www/tomcat101/files/tomcat101.in +++ b/www/tomcat101/files/tomcat101.in @@ -109,14 +109,23 @@ 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}'` - -export JAVA_TOOL_OPTIONS="\ +_tomcat_java9_opts="\ --add-opens=java.base/java.lang=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" +_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}" + +case "${_tomcat_java_version}" in + 1[7-9]* | [2-9][0-9]* ) + _tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java17_opts}" + ;; + *) + ;; +esac command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist index dac61a4c57df..1fae71f972e4 100644 --- a/www/tomcat101/pkg-plist +++ b/www/tomcat101/pkg-plist @@ -105,8 +105,14 @@ %%DOCS%%%%T%%/webapps/docs/architecture/index.html %%DOCS%%%%T%%/webapps/docs/architecture/overview.html %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html -%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png -%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png %%DOCS%%%%T%%/webapps/docs/architecture/startup.html %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png |