www/tomcat{85,9,101,-devel}: Update to 8.5.88, 9.0.74, 10.1.8, 11.0.0-M5

CVE-2023-24998 FileUpload DoS with excessive parts ChangeLog: https://tomcat.apache.org/tomcat-8.5-doc/changelog.html#Tomcat_8.5.88_(schultz) https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.74_(remm) https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.8_(schultz) https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M5_(markt) PR: 269652 Reported by: Vladimir Druzenko <vvd@FreeBSD.org> Approved by: arrowd (mentor)
freebsd · May 1, 2023 · 0932776 · 0932776
1 parent 1fb33f0
commit 0932776
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 22 deletions.
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.0-M1
+DISTVERSION=	11.0.0-M5
 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=	11+
+JAVA_VERSION=	17+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes

diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670264590
-SHA256 (apache-tomcat-11.0.0-M1.tar.gz) = ab252ed0495e4f7e85b987afbbec37834ab9718f2428026e7fd2f8be90f1932e
-SIZE (apache-tomcat-11.0.0-M1.tar.gz) = 12064343
+TIMESTAMP = 1681898630
+SHA256 (apache-tomcat-11.0.0-M5.tar.gz) = 3f37ad7e8ad3bbba66316548377b23d16e4ada273c08d56c55e1b67c2b54de32
+SIZE (apache-tomcat-11.0.0-M5.tar.gz) = 11995338
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
@@ -27,9 +27,9 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.25.jar
+%%T%%/lib/ecj-4.27.jar
 %%T%%/lib/el-api.jar
-%%T%%/lib/jakartaee-migration-1.0.5-shaded.jar
+%%T%%/lib/jakartaee-migration-1.0.6-shaded.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
 %%T%%/lib/jaspic-api.jar
@@ -63,7 +63,6 @@
 @dir %%T%%/temp
 @dir %%T%%/webapps
 @dir %%T%%/work
-@sample %%T%%/conf/catalina.policy.sample
 @sample %%T%%/conf/catalina.properties.sample
 @sample %%T%%/conf/context.xml.sample
 @sample %%T%%/conf/jaspic-providers.xml.sample
@@ -75,8 +74,10 @@
 @sample %%T%%/conf/web.xml.sample
 %%T%%/temp/safeToDelete.tmp
 %%DOCS%%%%T%%/webapps/docs/BUILDING.txt
+%%DOCS%%%%T%%/webapps/docs/META-INF/context.xml
 %%DOCS%%%%T%%/webapps/docs/RELEASE-NOTES.txt
 %%DOCS%%%%T%%/webapps/docs/RUNNING.txt
+%%DOCS%%%%T%%/webapps/docs/WEB-INF/jsp/403.jsp
 %%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
 %%DOCS%%%%T%%/webapps/docs/aio.html
 %%DOCS%%%%T%%/webapps/docs/api/index.html
@@ -197,7 +198,6 @@
 %%DOCS%%%%T%%/webapps/docs/realm-howto.html
 %%DOCS%%%%T%%/webapps/docs/rewrite.html
 %%DOCS%%%%T%%/webapps/docs/security-howto.html
-%%DOCS%%%%T%%/webapps/docs/security-manager-howto.html
 %%DOCS%%%%T%%/webapps/docs/servletapi/index.html
 %%DOCS%%%%T%%/webapps/docs/setup.html
 %%DOCS%%%%T%%/webapps/docs/ssi-howto.html
@@ -398,6 +398,8 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp.html
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld

diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	10.1.4
+DISTVERSION=	10.1.8
 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
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670597201
-SHA256 (apache-tomcat-10.1.4.tar.gz) = 95e68c8663187aa62de9b3e6869b2835a61975a38b64949d7c06bd64aef7f17f
-SIZE (apache-tomcat-10.1.4.tar.gz) = 12119820
+TIMESTAMP = 1681981640
+SHA256 (apache-tomcat-10.1.8.tar.gz) = 97a9cafe80af89ccf1a1f4ecd9c658ceca5fd6ac428365e8b45f614d15b5bda6
+SIZE (apache-tomcat-10.1.8.tar.gz) = 12088035
diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist
@@ -27,7 +27,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.25.jar
+%%T%%/lib/ecj-4.27.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jakartaee-migration-1.0.6-shaded.jar
 %%T%%/lib/jasper-el.jar
@@ -77,6 +77,8 @@
 %%DOCS%%%%T%%/webapps/docs/BUILDING.txt
 %%DOCS%%%%T%%/webapps/docs/RELEASE-NOTES.txt
 %%DOCS%%%%T%%/webapps/docs/RUNNING.txt
+%%DOCS%%%%T%%/webapps/docs/META-INF/context.xml
+%%DOCS%%%%T%%/webapps/docs/WEB-INF/jsp/403.jsp
 %%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
 %%DOCS%%%%T%%/webapps/docs/aio.html
 %%DOCS%%%%T%%/webapps/docs/api/index.html
@@ -398,6 +400,8 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp.html
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld

diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	8.5.84
+PORTVERSION=	8.5.88
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85

diff --git a/www/tomcat85/distinfo b/www/tomcat85/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669349015
-SHA256 (apache-tomcat-8.5.84.tar.gz) = d7123ddee6f66d34e6fb33b669bdd6ebc77832bf123516474c299f3cdee3efdf
-SIZE (apache-tomcat-8.5.84.tar.gz) = 10626063
+TIMESTAMP = 1681981549
+SHA256 (apache-tomcat-8.5.88.tar.gz) = fd030eb0120aad3493f7354a57b2ee11a4d77d07ec48de2b8ab090046f0ed2a2
+SIZE (apache-tomcat-8.5.88.tar.gz) = 10663778
diff --git a/www/tomcat85/pkg-plist b/www/tomcat85/pkg-plist
@@ -68,8 +68,10 @@
 @sample %%T%%/conf/web.xml.sample
 %%T%%/temp/safeToDelete.tmp
 %%DOCS%%%%T%%/webapps/docs/BUILDING.txt
+%%DOCS%%%%T%%/webapps/docs/META-INF/context.xml
 %%DOCS%%%%T%%/webapps/docs/RELEASE-NOTES.txt
 %%DOCS%%%%T%%/webapps/docs/RUNNING.txt
+%%DOCS%%%%T%%/webapps/docs/WEB-INF/jsp/403.jsp
 %%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
 %%DOCS%%%%T%%/webapps/docs/aio.html
 %%DOCS%%%%T%%/webapps/docs/annotationapi/index.html
@@ -387,6 +389,8 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp.html
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld

diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	9.0.70
+PORTVERSION=	9.0.74
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9

diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670260173
-SHA256 (apache-tomcat-9.0.70.tar.gz) = 38bc58342dccc3b0b2c238f55ff4f579a0a550758be940492e47e3fa622fb3a4
-SIZE (apache-tomcat-9.0.70.tar.gz) = 11613418
+TIMESTAMP = 1681809044
+SHA256 (apache-tomcat-9.0.74.tar.gz) = f177b68bb99f6ed86e08f92696ebc61358cdfb3803c0e5f01df95e4ac6227cd2
+SIZE (apache-tomcat-9.0.74.tar.gz) = 11642299
diff --git a/www/tomcat9/pkg-plist b/www/tomcat9/pkg-plist
@@ -72,8 +72,10 @@
 @sample %%T%%/conf/web.xml.sample
 %%T%%/temp/safeToDelete.tmp
 %%DOCS%%%%T%%/webapps/docs/BUILDING.txt
+%%DOCS%%%%T%%/webapps/docs/META-INF/context.xml
 %%DOCS%%%%T%%/webapps/docs/RELEASE-NOTES.txt
 %%DOCS%%%%T%%/webapps/docs/RUNNING.txt
+%%DOCS%%%%T%%/webapps/docs/WEB-INF/jsp/403.jsp
 %%DOCS%%%%T%%/webapps/docs/WEB-INF/web.xml
 %%DOCS%%%%T%%/webapps/docs/aio.html
 %%DOCS%%%%T%%/webapps/docs/api/index.html
@@ -400,6 +402,8 @@
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp
+%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/403.jsp.html
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld