From nobody Tue Oct 24 10:33:53 2023 X-Original-To: dev-commits-ports-all@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 4SF7hK4TP4z4xrsv; Tue, 24 Oct 2023 10:33:53 +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 4SF7hK3n4nz4GfY; Tue, 24 Oct 2023 10:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698143633; 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=gsedug9egcKhZzT1ikMixVFBv0FTXeKqF2WMIJWjc5A=; b=pcJPnryylyH3OmvfZhlZZPXzYhBTRZ4gNOpUfQJ6cMrt4PNnAbYGnXHCecKxUWJnqLBawR uSlGYjR2E/U4qST1zNtDELR12zipGCVARXhiUMN3rSnPG4zNImA0HUSV5GU5QgB3eAIpkt TbZvZeWIbB5yjMBA0LfiHVNB9+vtuAHd956RN58Rwv19fPsZiKkBQeb9rnirhRniHk3XgF VvwGjoBsacsjhzZTgsVJROr3DnPglsAw4tZ7u6B1HMB/ZgPVXLs9B62NDxHu57neobmhLW ZBYmd7hCDYAWGL7QjCN2nwPUz2rCfmc6fiYxwfvaHFsfGp9mibndWqgZuswT6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698143633; a=rsa-sha256; cv=none; b=UAwy/6M2eBQCNiYpFNmUTmbjC/rDKWlC7D/NLl6CjyLkJFsupOKk4Yi1xa8xLGVNymtKd0 iaZTQfJIr/bjvIPUBdDxrR5b1aZYZxO9Z7nSKkMgw7pDIqx4L5JNgtZoP4EvVKNK3+bKzz 38oHgqqniyY3wR3K+bQwZrLzPvuT8YsCa2hTVX4DJ7c5xmxdWwmtnlZ2TTiJfojy6/sgA7 L/C0OUB/ARzAVuiCaywSpCtSPuF+dT+lmb1C2TfxN4zlkutxtdKTD+crRd2LRIp0Tz38tD o6Pp7okPP6+zfQLoSTyG7rFs3l/Ta6PDD3GhZsjuJ1a3kYBm7TwvDbj6chNTCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698143633; 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=gsedug9egcKhZzT1ikMixVFBv0FTXeKqF2WMIJWjc5A=; b=sQUUPDiLBpxgyMuzwkM2sUV85i+NtCMWpwe4hnEne3+4m54TYKHzjGktuhEEN0Yyjuxamz UJtIuwnVpPlShZW/bRVzQGG77fOBBNL/Tywze3xVCTVBBvn+HhllHNFUS3fyi0e1GEa3S0 AIJjaHaXGsPLRsCaoRPZWyiZiCGfKBMqCHOiUSK71ltr62B+Qk46OMdbfWOl/l9BXdoc/S 2n8rerNEGIw5jk0N23UEbtcriuljAPp1lvIFFyj5FTsSC+PAAWVU5002MIPFNAxZNVZvnQ SlF8saHml9DRlnm3Sna/7z66ZUYPTNB5ZpIbjg2Dh1lKTRORtEZZ6Roa4ERKhg== 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 4SF7hK2sW5z48S; Tue, 24 Oct 2023 10:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OAXr56087337; Tue, 24 Oct 2023 10:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OAXrF6087334; Tue, 24 Oct 2023 10:33:53 GMT (envelope-from git) Date: Tue, 24 Oct 2023 10:33:53 GMT Message-Id: <202310241033.39OAXrF6087334@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: 21db1fc3c2f1 - 2023Q4 - www/tomcat-devel: update to 11.0.0-M13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 21db1fc3c2f1941bd4f009a23b1828aedabdd5dd Auto-Submitted: auto-generated The branch 2023Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=21db1fc3c2f1941bd4f009a23b1828aedabdd5dd commit 21db1fc3c2f1941bd4f009a23b1828aedabdd5dd Author: Vladimir Druzenko AuthorDate: 2023-10-24 10:17:01 +0000 Commit: Vladimir Druzenko CommitDate: 2023-10-24 10:32:37 +0000 www/tomcat-devel: update to 11.0.0-M13 Changelog: https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M13_(markt) - CVEs fixed: CVE-2023-41080 CVE-2023-42795 CVE-2023-44487 CVE-2023-45648 - Removed "endorsed" feature - Java since 9 doesn't support it and Tomcat 11 required Java 21+ since 11.0.0-M7. Approved by: arrowd (mentor, implicit) MFH: 2023Q4 (cherry picked from commit b45e850487cb97982e578a3bf145eb958dff105a) --- www/tomcat-devel/Makefile | 5 ++--- www/tomcat-devel/distinfo | 6 +++--- www/tomcat-devel/files/tomcat_devel.in | 10 ---------- www/tomcat-devel/pkg-plist | 5 +---- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile index 8af6d4ea3831..78078d8888cf 100644 --- a/www/tomcat-devel/Makefile +++ b/www/tomcat-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 11.0.0-M6 +DISTVERSION= 11.0.0-M13 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= 17+ +JAVA_VERSION= 21+ USE_RC_SUBR= ${PKGBASE:C/-/_/} NO_ARCH= yes @@ -48,7 +48,6 @@ post-patch: do-install: @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs - @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed @${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME} post-install: diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo index cbfaee8c8a3e..177444e93027 100644 --- a/www/tomcat-devel/distinfo +++ b/www/tomcat-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683667476 -SHA256 (apache-tomcat-11.0.0-M6.tar.gz) = b1c5c748c033d1de9328db8d7cfb2ce2def3dc8c3a188b557b8c291c459b4a95 -SIZE (apache-tomcat-11.0.0-M6.tar.gz) = 12014444 +TIMESTAMP = 1698052604 +SHA256 (apache-tomcat-11.0.0-M13.tar.gz) = f594204d0dfa95d1daadfebe43ee948959ce524be6bbb3ea928297498b88dc39 +SIZE (apache-tomcat-11.0.0-M13.tar.gz) = 12327470 diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in index 258520266226..ba526b0f60b5 100644 --- a/www/tomcat-devel/files/tomcat_devel.in +++ b/www/tomcat-devel/files/tomcat_devel.in @@ -110,15 +110,6 @@ extra_commands="reload" _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` -case "${_tomcat_java_version}" in - 9* | 1[0-9]* ) - _tomcat_endorsed_dirs_option= - ;; - *) - _tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'" - ;; -esac - command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ -server \ @@ -132,7 +123,6 @@ command_args="-java-home '${_tomcat_java_home}' \ -Djava.util.logging.manager=${_tomcat_logging_manager} \ -Djava.util.logging.config.file='${_tomcat_logging_config}' \ ${_tomcat_java_opts} \ - ${_tomcat_endorsed_dirs_option} \ -Dcatalina.home='${_tomcat_catalina_home}' \ -Dcatalina.base='${_tomcat_catalina_base}' \ -Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist index b4c582707e8e..d6ad54295e4d 100644 --- a/www/tomcat-devel/pkg-plist +++ b/www/tomcat-devel/pkg-plist @@ -27,7 +27,7 @@ %%T%%/lib/catalina-storeconfig.jar %%T%%/lib/catalina-tribes.jar %%T%%/lib/catalina.jar -%%T%%/lib/ecj-4.27.jar +%%T%%/lib/ecj-4.29.jar %%T%%/lib/el-api.jar %%T%%/lib/jakartaee-migration-1.0.7-shaded.jar %%T%%/lib/jasper-el.jar @@ -54,7 +54,6 @@ %%T%%/lib/tomcat-websocket.jar %%T%%/lib/websocket-api.jar %%T%%/lib/websocket-client-api.jar -@dir %%T%%/endorsed @postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually @owner %%WWWOWN%% @group %%WWWGRP%% @@ -296,8 +295,6 @@ %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/examples/ValuesTag.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java -%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.class -%%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class