From nobody Wed Oct 09 18:21:07 2024 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 4XP1RS1N1Qz5YqlW; Wed, 09 Oct 2024 18:21:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP1RS0bMhz4Ff6; Wed, 9 Oct 2024 18:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728498068; 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=FLzXUEji9Zx/94y6m+TfLLzgD12/y4r9w+tCGk3Uclc=; b=b+7JWCV9+zVXje/PCsNAmgYR/n58hA3CkWzJG7SVBeYJbN3p+nsoF3mX7MHeZxCmxsUvT9 ubDza3nIyKoXNRyMmKqNDxXFmLDbNGRFcb8gLbcVpRgSbkVuY2+THllh2bvcnCi3XnuIwi +5utNXd/ZFo2If4JJVlmdGVr5ElaeBqtSpKaRAzEy17OfpNpU0iZaNjB9lCHQZJFF6rwut nevbh/x6EbjDzRNQpK8FSekLUbZ/BVHLOy8FL0uhb6BBhzG3WmR/sL8KTZuh/twTOigucC Xvat/bMNimEKIvVxC3V52d1CUUPbGHFclcBhQwne6+DZMc9qE+P+0p0f/Ug5+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728498068; 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=FLzXUEji9Zx/94y6m+TfLLzgD12/y4r9w+tCGk3Uclc=; b=YPd6ggEcOhSe6hDI7ki+D3XLyvErPpqVrcrvHRh33qzeQi89Qi2CAbY/qWEzoJljRqbnza aKCTU2j6cRkKuPyPvsvrlrJLJJLcVHseZpKDMWZEXCdiFuXYvFBHOlwy64b9cYhpbKdjDV mehNOmINmfcbwnudbLjzLvSuE7Rogny9ZfjsbeDxeWrVld0Kobm702JH6kroSUhZ+xv117 +MmlqrJ3S4lPXjtJA+VZDLB4pcuLWwvglXuACXE31bHDdZt7hEhrCWClwc1/4W5Tzm9FM4 m+QQQDKOqM3SpVNFdtLQ/esL27yWVSoa28ZD4Khtvz3qgD8/27nb3AQjEwIyzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728498068; a=rsa-sha256; cv=none; b=DTzt+00Yf70YPWo2wk6Mb8I8NxO/ovqCrBV3Rwz0O1UaTLBjj+fwSCToinOPA7vAhG9+v9 yWVppMVc+Bv6BovOUa7YKjOLNDEdyCT2qDC9og45N+gaIIdXzDkP1s48USBZCHAcr8QfCo mST2fEGZevZDOX0U3HNvbNGLU7baVz+pQsNFZ6BveVFLZZPxMydrSpt2/sJBwzVnrMEGhU oV9EkNlJHDVxvJofeuFnRwT+QEhlrj6RnkJYPrBsoGXLjJqdbjH+eFZokxzsBAo78zym+Y M6weUcd7Muf/XuixWi3N7k844+HIA1AJRuZuj4/xwx9n5oPum/bCN1YPYNpBXQ== 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 4XP1RS04NtzPdc; Wed, 9 Oct 2024 18:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499IL7rY047163; Wed, 9 Oct 2024 18:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499IL7Or047160; Wed, 9 Oct 2024 18:21:07 GMT (envelope-from git) Date: Wed, 9 Oct 2024 18:21:07 GMT Message-Id: <202410091821.499IL7Or047160@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: 62c8de14730a - 2024Q4 - www/tomcat101: Update 10.1.30 =?utf-8?Q?=E2=86=92?= 10.1.31 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 62c8de14730aa71575aaf7fa0340db2de2411afc Auto-Submitted: auto-generated The branch 2024Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=62c8de14730aa71575aaf7fa0340db2de2411afc commit 62c8de14730aa71575aaf7fa0340db2de2411afc Author: Vladimir Druzenko AuthorDate: 2024-10-09 17:48:40 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-09 18:20:44 +0000 www/tomcat101: Update 10.1.30 → 10.1.31 Changelog: https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.31_(schultz) MFH: 2024Q4 (cherry picked from commit 3cdd43cf464ad1470d33d0a956081cdf4fc973d4) --- www/tomcat101/Makefile | 2 +- www/tomcat101/distinfo | 6 +++--- www/tomcat101/files/tomcat101.in | 10 ---------- www/tomcat101/pkg-plist | 2 -- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile index c63a194bc657..1fc5456d60dc 100644 --- a/www/tomcat101/Makefile +++ b/www/tomcat101/Makefile @@ -1,5 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 10.1.30 +DISTVERSION= 10.1.31 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 3839ddfe1665..e04e2b3d28d9 100644 --- a/www/tomcat101/distinfo +++ b/www/tomcat101/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726574517 -SHA256 (apache-tomcat-10.1.30.tar.gz) = 8de5a808f3dc762ace67948cd90d1327b116816622044dc8750f04207df90a2e -SIZE (apache-tomcat-10.1.30.tar.gz) = 13651200 +TIMESTAMP = 1728494207 +SHA256 (apache-tomcat-10.1.31.tar.gz) = 06f6e2e11ef5afb435a4b27e1e264ebcdbafd95389f5ee37e425dc135ed325d4 +SIZE (apache-tomcat-10.1.31.tar.gz) = 13644713 diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in index e83791d09bcd..23b76fa45595 100644 --- a/www/tomcat101/files/tomcat101.in +++ b/www/tomcat101/files/tomcat101.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-2][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/tomcat101/pkg-plist b/www/tomcat101/pkg-plist index 091647ec945d..7caf8f6ffb92 100644 --- a/www/tomcat101/pkg-plist +++ b/www/tomcat101/pkg-plist @@ -122,8 +122,6 @@ %%DOCS%%%%T%%/webapps/docs/architecture/startup/6_catalina_host_config.png %%DOCS%%%%T%%/webapps/docs/architecture/startup/7_catalina_context_config.plantuml %%DOCS%%%%T%%/webapps/docs/architecture/startup/7_catalina_context_config.png -%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.pdf -%%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.txt %%DOCS%%%%T%%/webapps/docs/balancer-howto.html %%DOCS%%%%T%%/webapps/docs/building.html %%DOCS%%%%T%%/webapps/docs/cdi.html