Date: Wed, 9 Oct 2024 18:21:07 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 62c8de14730a - 2024Q4 - www/tomcat101: Update 10.1.30 =?utf-8?Q?=E2=86=92?= 10.1.31 Message-ID: <202410091821.499IL7Or047160@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=62c8de14730aa71575aaf7fa0340db2de2411afc commit 62c8de14730aa71575aaf7fa0340db2de2411afc Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-10-09 17:48:40 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-10-09 18:20:44 +0000 www/tomcat101: Update 10.1.30 → 10.1.31 Changelog: https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.31_(schultz) MFH: 2024Q4 (cherry picked from commit 3cdd43cf464ad1470d33d0a956081cdf4fc973d4) --- www/tomcat101/Makefile | 2 +- www/tomcat101/distinfo | 6 +++--- www/tomcat101/files/tomcat101.in | 10 ---------- www/tomcat101/pkg-plist | 2 -- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile index c63a194bc657..1fc5456d60dc 100644 --- a/www/tomcat101/Makefile +++ b/www/tomcat101/Makefile @@ -1,5 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 10.1.30 +DISTVERSION= 10.1.31 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 3839ddfe1665..e04e2b3d28d9 100644 --- a/www/tomcat101/distinfo +++ b/www/tomcat101/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726574517 -SHA256 (apache-tomcat-10.1.30.tar.gz) = 8de5a808f3dc762ace67948cd90d1327b116816622044dc8750f04207df90a2e -SIZE (apache-tomcat-10.1.30.tar.gz) = 13651200 +TIMESTAMP = 1728494207 +SHA256 (apache-tomcat-10.1.31.tar.gz) = 06f6e2e11ef5afb435a4b27e1e264ebcdbafd95389f5ee37e425dc135ed325d4 +SIZE (apache-tomcat-10.1.31.tar.gz) = 13644713 diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in index e83791d09bcd..23b76fa45595 100644 --- a/www/tomcat101/files/tomcat101.in +++ b/www/tomcat101/files/tomcat101.in @@ -110,15 +110,6 @@ extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` -case "${_tomcat_java_version}" in - 9* | [1-2][0-9]* ) - _tomcat_endorsed_dirs_option= - ;; - *) - _tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'" - ;; -esac - command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ -server \ @@ -132,7 +123,6 @@ command_args="-java-home '${_tomcat_java_home}' \ -Djava.util.logging.manager=${_tomcat_logging_manager} \ -Djava.util.logging.config.file='${_tomcat_logging_config}' \ ${_tomcat_java_opts} \ - ${_tomcat_endorsed_dirs_option} \ -Dcatalina.home='${_tomcat_catalina_home}' \ -Dcatalina.base='${_tomcat_catalina_base}' \ -Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist index 091647ec945d..7caf8f6ffb92 100644 --- a/www/tomcat101/pkg-plist +++ b/www/tomcat101/pkg-plist @@ -122,8 +122,6 @@ %%DOCS%%%%T%%/webapps/docs/architecture/startup/6_catalina_host_config.png %%DOCS%%%%T%%/webapps/docs/architecture/startup/7_catalina_context_config.plantuml %%DOCS%%%%T%%/webapps/docs/architecture/startup/7_catalina_context_config.png -%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.pdf -%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.txt %%DOCS%%%%T%%/webapps/docs/balancer-howto.html %%DOCS%%%%T%%/webapps/docs/building.html %%DOCS%%%%T%%/webapps/docs/cdi.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410091821.499IL7Or047160>