git: 21db1fc3c2f1 - 2023Q4 - www/tomcat-devel: update to 11.0.0-M13

The branch 2023Q4 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=21db1fc3c2f1941bd4f009a23b1828aedabdd5dd

commit 21db1fc3c2f1941bd4f009a23b1828aedabdd5dd
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-10-24 10:17:01 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2023-10-24 10:32:37 +0000

    www/tomcat-devel: update to 11.0.0-M13
    
    Changelog:
    https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M13_(markt)
    - CVEs fixed: CVE-2023-41080 CVE-2023-42795 CVE-2023-44487 CVE-2023-45648
    - Removed "endorsed" feature - Java since 9 doesn't support it and Tomcat 11
      required Java 21+ since 11.0.0-M7.
    
    Approved by:    arrowd (mentor, implicit)
    MFH:            2023Q4
    
    (cherry picked from commit b45e850487cb97982e578a3bf145eb958dff105a)
---
 www/tomcat-devel/Makefile              |  5 ++---
 www/tomcat-devel/distinfo              |  6 +++---
 www/tomcat-devel/files/tomcat_devel.in | 10 ----------
 www/tomcat-devel/pkg-plist             |  5 +----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 8af6d4ea3831..78078d8888cf 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.0-M6
+DISTVERSION=	11.0.0-M13
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
@@ -16,7 +16,7 @@ RUN_DEPENDS=	jsvc:devel/apache-commons-daemon
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
-JAVA_VERSION=	17+
+JAVA_VERSION=	21+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
@@ -48,7 +48,6 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
-	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index cbfaee8c8a3e..177444e93027 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683667476
-SHA256 (apache-tomcat-11.0.0-M6.tar.gz) = b1c5c748c033d1de9328db8d7cfb2ce2def3dc8c3a188b557b8c291c459b4a95
-SIZE (apache-tomcat-11.0.0-M6.tar.gz) = 12014444
+TIMESTAMP = 1698052604
+SHA256 (apache-tomcat-11.0.0-M13.tar.gz) = f594204d0dfa95d1daadfebe43ee948959ce524be6bbb3ea928297498b88dc39
+SIZE (apache-tomcat-11.0.0-M13.tar.gz) = 12327470
diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in
index 258520266226..ba526b0f60b5 100644
--- a/www/tomcat-devel/files/tomcat_devel.in
+++ b/www/tomcat-devel/files/tomcat_devel.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[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/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index b4c582707e8e..d6ad54295e4d 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -27,7 +27,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.27.jar
+%%T%%/lib/ecj-4.29.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jakartaee-migration-1.0.7-shaded.jar
 %%T%%/lib/jasper-el.jar
@@ -54,7 +54,6 @@
 %%T%%/lib/tomcat-websocket.jar
 %%T%%/lib/websocket-api.jar
 %%T%%/lib/websocket-client-api.jar
-@dir %%T%%/endorsed
 @postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
@@ -296,8 +295,6 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.class
-%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class