From owner-dev-commits-ports-all@freebsd.org Sun Aug 1 15:53:11 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 52E06661926; Sun, 1 Aug 2021 15:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gd5JR1bqsz4g55; Sun, 1 Aug 2021 15:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E9FD7091; Sun, 1 Aug 2021 15:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 171FrBR0015687; Sun, 1 Aug 2021 15:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 171FrB9k015686; Sun, 1 Aug 2021 15:53:11 GMT (envelope-from git) Date: Sun, 1 Aug 2021 15:53:11 GMT Message-Id: <202108011553.171FrB9k015686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 839de580f358 - main - www/tomcat-devel: Update to 10.1.0-M2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 839de580f358e61f5c00e87457f75cc6d8f263b6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Aug 2021 15:53:11 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=839de580f358e61f5c00e87457f75cc6d8f263b6 commit 839de580f358e61f5c00e87457f75cc6d8f263b6 Author: VVD AuthorDate: 2021-08-01 15:51:28 +0000 Commit: Kevin Bowling CommitDate: 2021-08-01 15:51:28 +0000 www/tomcat-devel: Update to 10.1.0-M2 PR: 257153 Security: CVE-2021-30639 CVE-2021-30640 CVE-2021-33037 --- 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 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