git: 3a6348bb2881 - main - www/tomcat{9,10,-devel}: Update to 9.0.67, 10.0.26, 10.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Fri, 30 Sep 2022 12:44:02 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3a6348bb2881389f1a8496298203e96ade55106b

commit 3a6348bb2881389f1a8496298203e96ade55106b
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2022-09-30 12:29:43 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-30 12:43:38 +0000

    www/tomcat{9,10,-devel}: Update to 9.0.67, 10.0.26, 10.1.0
    
    ChangeLog:
    https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.67_(remm)
    https://tomcat.apache.org/tomcat-10.0-doc/changelog.html#Tomcat_10.0.26_(markt)
    https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.0_(markt)
    
    PR:             266639
---
 www/tomcat-devel/Makefile  | 4 ++--
 www/tomcat-devel/distinfo  | 6 +++---
 www/tomcat-devel/pkg-descr | 4 ++--
 www/tomcat-devel/pkg-plist | 2 +-
 www/tomcat10/Makefile      | 2 +-
 www/tomcat10/distinfo      | 6 +++---
 www/tomcat10/pkg-plist     | 2 +-
 www/tomcat9/Makefile       | 2 +-
 www/tomcat9/distinfo       | 6 +++---
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index e8cf498326f5..f7e4cf46f937 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	10.1.0-M17
+DISTVERSION=	10.1.0
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
@@ -38,7 +38,7 @@ HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
-TOMCAT_SUBDIR?=	${DISTNAME:R}
+TOMCAT_SUBDIR?=	${DISTNAME:R}${PKGNAMESUFFIX}
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index 5b948877b5cd..78f49c297dbe 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660419637
-SHA256 (apache-tomcat-10.1.0-M17.tar.gz) = 8d3ada5a826aa35074289469f4f1d4e02dfd8c344ee8e018d9bea5b262e2f785
-SIZE (apache-tomcat-10.1.0-M17.tar.gz) = 11848876
+TIMESTAMP = 1664240304
+SHA256 (apache-tomcat-10.1.0.tar.gz) = 5b3436c8f4dd09b928bcaf4ca8a60d2c62ee9e422818b134be941f8f4ac736ba
+SIZE (apache-tomcat-10.1.0.tar.gz) = 11857217
diff --git a/www/tomcat-devel/pkg-descr b/www/tomcat-devel/pkg-descr
index da4e82fb7b78..15a66f08fd07 100644
--- a/www/tomcat-devel/pkg-descr
+++ b/www/tomcat-devel/pkg-descr
@@ -1,6 +1,6 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
 Apache Tomcat 10.1.x is the current focus of development. It builds on
-Tomcat 10.0.x and implements the Servlet 6.0, JSP TBD, EL TBD, WebSocket TBD
-and Authentication TBD specifications (the versions required by Jakarta EE 10
+Tomcat 10.0.x and implements the Servlet 6.0, JSP 3.1, EL 5.0, WebSocket 2.1
+and Authentication 3.0 specifications (the versions required by Jakarta EE 10
 platform).
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index 8d5d7ce57928..8a1064beac2c 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -29,7 +29,7 @@
 %%T%%/lib/catalina.jar
 %%T%%/lib/ecj-4.23.jar
 %%T%%/lib/el-api.jar
-%%T%%/lib/jakartaee-migration-1.0.1-shaded.jar
+%%T%%/lib/jakartaee-migration-1.0.4-shaded.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
 %%T%%/lib/jaspic-api.jar
diff --git a/www/tomcat10/Makefile b/www/tomcat10/Makefile
index 0c6cd153f6b3..8b0fa283b0ba 100644
--- a/www/tomcat10/Makefile
+++ b/www/tomcat10/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	10.0.23
+PORTVERSION=	10.0.26
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9]+)(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	10
diff --git a/www/tomcat10/distinfo b/www/tomcat10/distinfo
index 22adf7ed2695..13238a3f4465 100644
--- a/www/tomcat10/distinfo
+++ b/www/tomcat10/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660419694
-SHA256 (apache-tomcat-10.0.23.tar.gz) = 575c99a2aeed61e26b2f379bd0f8c9e44a4ecc9509760aa81c20bb7126b7fd3d
-SIZE (apache-tomcat-10.0.23.tar.gz) = 11972768
+TIMESTAMP = 1664322087
+SHA256 (apache-tomcat-10.0.26.tar.gz) = a06d080a1d611b05e4abc20318d9bd7fefbee12d44209f8b107f8a741b5a3596
+SIZE (apache-tomcat-10.0.26.tar.gz) = 11983290
diff --git a/www/tomcat10/pkg-plist b/www/tomcat10/pkg-plist
index fa819ef43d86..8047a75c7d73 100644
--- a/www/tomcat10/pkg-plist
+++ b/www/tomcat10/pkg-plist
@@ -29,7 +29,7 @@
 %%T%%/lib/catalina.jar
 %%T%%/lib/ecj-4.20.jar
 %%T%%/lib/el-api.jar
-%%T%%/lib/jakartaee-migration-1.0.1-shaded.jar
+%%T%%/lib/jakartaee-migration-1.0.4-shaded.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
 %%T%%/lib/jaspic-api.jar
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 3dc26abfc6a9..2393a9b56137 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	9.0.65
+PORTVERSION=	9.0.67
 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
index a140b1d3764c..b3f3b37ace96 100644
--- a/www/tomcat9/distinfo
+++ b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660419765
-SHA256 (apache-tomcat-9.0.65.tar.gz) = e92330e6b0103eb0a5af1ec42f8c0aaaf0da712b7449b962e181a191e8f2264b
-SIZE (apache-tomcat-9.0.65.tar.gz) = 11593900
+TIMESTAMP = 1664240954
+SHA256 (apache-tomcat-9.0.67.tar.gz) = 58851e171bb8ded7e5311e5a8f325d1f6419f3203e8c970bf7f1acbbb6f41f96
+SIZE (apache-tomcat-9.0.67.tar.gz) = 11596906