Date: Sun, 1 Aug 2021 16:08:45 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 0fb3c1b3f8c4 - 2021Q3 - www/tomcat-devel: Update to 10.1.0-M2 Message-ID: <202108011608.171G8jX6030343@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=0fb3c1b3f8c41d41f633bc6fae0353793c3ada0e commit 0fb3c1b3f8c41d41f633bc6fae0353793c3ada0e Author: VVD <vvd@unislabs.com> AuthorDate: 2021-08-01 15:51:28 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-08-01 16:08:22 +0000 www/tomcat-devel: Update to 10.1.0-M2 PR: 257153 Security: CVE-2021-30639 CVE-2021-30640 CVE-2021-33037 (cherry picked from commit 839de580f358e61f5c00e87457f75cc6d8f263b6) --- www/tomcat-devel/Makefile | 8 ++++---- www/tomcat-devel/distinfo | 6 +++--- www/tomcat-devel/pkg-descr | 8 ++++---- www/tomcat-devel/pkg-plist | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile index 3b961e10b26b..c6557269d7e3 100644 --- a/www/tomcat-devel/Makefile +++ b/www/tomcat-devel/Makefile @@ -1,14 +1,14 @@ # Created by: Alex Dupre <ale@FreeBSD.org> PORTNAME= tomcat -PORTVERSION= 10.0.4 +DISTVERSION= 10.1.0-M2 CATEGORIES= www java -MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9]+)(.*)/\1/}/v${PORTVERSION}/bin +MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= -devel -DISTNAME= apache-${PORTNAME}-${PORTVERSION} +DISTNAME= apache-${PORTNAME}-${DISTVERSION} MAINTAINER= vvd@unislabs.com -COMMENT= Open-source Java web server by Apache, 10.0.x branch +COMMENT= Open-source Java web server by Apache, 10.1.x branch LICENSE= APACHE20 diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo index 6100ebedd1ab..67c634084599 100644 --- a/www/tomcat-devel/distinfo +++ b/www/tomcat-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615491644 -SHA256 (apache-tomcat-10.0.4.tar.gz) = 99fca1a99e93f8fbae417ada4840314ce8ac9b1c6fb14121abf8f39a48b1e244 -SIZE (apache-tomcat-10.0.4.tar.gz) = 11811329 +TIMESTAMP = 1626175586 +SHA256 (apache-tomcat-10.1.0-M2.tar.gz) = dfebb2cebf4dd6fdde5b16224ddafb86b2199bea29b9ad3412f811264da67fc4 +SIZE (apache-tomcat-10.1.0-M2.tar.gz) = 11825772 diff --git a/www/tomcat-devel/pkg-descr b/www/tomcat-devel/pkg-descr index ff63447f006f..a94570a0ba69 100644 --- a/www/tomcat-devel/pkg-descr +++ b/www/tomcat-devel/pkg-descr @@ -1,8 +1,8 @@ Apache Tomcat is a web server written in 100% Pure Java. -Apache Tomcat 10.x is the current focus of development. It builds on -Tomcat 9.0.x and implements the Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0 -and Authentication 2.0 specifications (the versions required by Jakarta EE 9 +Apache Tomcat 10.1.x is the current focus of development. It builds on +Tomcat 10.0.x and implements the Servlet 5.1, JSP TBD, EL TBD, WebSocket TBD +and Authentication TBD specifications (the versions required by Jakarta EE 10 platform). -WWW: http://tomcat.apache.org/ +WWW: https://tomcat.apache.org/ diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist index b1bbc7c84602..a873bd120bee 100644 --- 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.18.jar +%%T%%/lib/ecj-4.20.jar %%T%%/lib/el-api.jar -%%T%%/lib/jakartaee-migration-0.2.0-shaded.jar +%%T%%/lib/jakartaee-migration-1.0.0-shaded.jar %%T%%/lib/jasper-el.jar %%T%%/lib/jasper.jar %%T%%/lib/jaspic-api.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108011608.171G8jX6030343>