From nobody Tue May 2 11:39:35 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q9dQw0FRNz48tLm; Tue, 2 May 2023 11:39:36 +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 4Q9dQv6hjVz3ps9; Tue, 2 May 2023 11:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683027575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZRR5GGeiGhp3S9t/pPsU3nVJVGIBec90Dwh7FuKgqsU=; b=kg3nb87XNYtxNo6hzbsvSvBEFQRjiapRXFLRM1IWz2vqyi3TuN1lO/G8zPO3moH17NjNw2 SYWD2Af8lBGMbS7qmDSAu5lAiyK/HmSIUR686NeWGJQJJWq8Eg/aYBdOaRNTtkZ0Jeahjx gAS1XgQTD+yBZI6/dShv5r4h/FHB9C31sfd4hUubqcUrpjkPDEXkO/U9TZxos4H9awsUW+ P0LmOL1oacGh5Nc6srzRohwEQh2G/5UPtnSgxgY2jhBfn5NGhLujc5GwcufOFiZ0mLfdJf 1GDEteBpZVyVn7nVEmEKz2rlrMzsgX56zR+YG2Xmn4+S5Cee9BIDo5mOGraKRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683027575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZRR5GGeiGhp3S9t/pPsU3nVJVGIBec90Dwh7FuKgqsU=; b=ALcx/EFDbm9nV9zdHYprhwnV6lbZvwR9kOGaiTVKsrOrcOAKr+fr3sChUCALhlnvG0SUPY yY9LxSoVmqnt53kH74pztizk+oIEUW1LCi0rc0mZSX8LrHJawmxBCu5UKDFKYkWUI/RnV0 2b1e1HzXnWCGUxVyVkDZpFZ6zhdmLNZoQR6bTEGIiRs7fbiHRRA5j7uKwXIzy6Ho5cgZji UG4h1I47EugU0QYv/Url6kkCE9S3rJkpS+mrRBeSHh4odhe15NFyWl+IdVgpvbMdMWn/ji 6MQ3NgobDRtV+6a0+UoszSz9yVS2C6qIlQrLnG5/DOW11xALyh9Fr/z2YfwA5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683027575; a=rsa-sha256; cv=none; b=T3HXepn4AsoG6iGNraRsFf57gvT+fRP3+Fk8wpbbK+JHHTuQjUdTocUV4/zWwY0AGX82w8 duPiPykUT6E7f0sOOU2HGxQM4Eiv6u0QYKLR7mc7ldVxzBj0GVCB9F7V5LqjqZv60KqEUU CuY+mhjAqu8fuuPr+rJXBsn3/XZrkJjmiVajiIDVhW17OhtSrtFgPY1Qd0kYxWNaH+Sk8f 8zGfO90aYZLa5yeytLNQ100iPHbIyM+rbBXCPLS/dskN+TKKnUIP74iEt52QtawPHfyIRt UgUutnWJRBOuMgfmkdJArR42p/wUPtofeN2iPyjrkSv+vqAtyx49BgRg+adQ8g== 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 4Q9dQv5TMQzmRl; Tue, 2 May 2023 11:39:35 +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 342BdZCi092112; Tue, 2 May 2023 11:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342BdZB9092111; Tue, 2 May 2023 11:39:35 GMT (envelope-from git) Date: Tue, 2 May 2023 11:39:35 GMT Message-Id: <202305021139.342BdZB9092111@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: fb1d87b6ba28 - 2023Q2 - www/tomcat{85,9,101,-devel}: Update to 8.5.88, 9.0.74, 10.1.8, 11.0.0-M5 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: fb1d87b6ba281eab5db043ccee0165b1f0c4fe75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb1d87b6ba281eab5db043ccee0165b1f0c4fe75 commit fb1d87b6ba281eab5db043ccee0165b1f0c4fe75 Author: Vladimir Druzenko AuthorDate: 2023-05-01 12:26:29 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-02 11:38:52 +0000 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 Approved by: arrowd (mentor) (cherry picked from commit 0932776313063a4af1dc76e54b9cb6da9bedc954) --- www/tomcat-devel/Makefile | 4 ++-- www/tomcat-devel/distinfo | 6 +++--- www/tomcat-devel/pkg-plist | 10 ++++++---- www/tomcat101/Makefile | 2 +- www/tomcat101/distinfo | 6 +++--- www/tomcat101/pkg-plist | 6 +++++- www/tomcat85/Makefile | 2 +- www/tomcat85/distinfo | 6 +++--- www/tomcat85/pkg-plist | 4 ++++ www/tomcat9/Makefile | 2 +- www/tomcat9/distinfo | 6 +++--- www/tomcat9/pkg-plist | 4 ++++ 12 files changed, 36 insertions(+), 22 deletions(-) diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile index dc35824847e2..40e612113275 100644 --- 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 index 9f35b3cb4ac1..df5b7b04d410 100644 --- 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 index e146ddc7133f..faf5a315567f 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.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 index e7b742b47bfd..a7916aa27c00 100644 --- 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 index d6f09fff8087..9484df4773fd 100644 --- 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 index 3f963ce76507..113532675135 100644 --- 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 index 7517a691872d..c433e852c7f1 100644 --- 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 index 76f6bb7cca31..481ed2426183 100644 --- 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 index 9fe6a824a7ae..07013096e20d 100644 --- 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 index 05c91ff873de..1877b26412d3 100644 --- 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 index 751d7e2e88dd..3f3954bf4e5d 100644 --- 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 index d84a8fafab51..0724dd998dc6 100644 --- 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