From nobody Thu Aug 07 00:50:01 2025 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 4by7qF56zRz64RrK; Thu, 07 Aug 2025 00:50:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4by7qF4G8fz3vmY; Thu, 07 Aug 2025 00:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754527801; 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=vBgQxPnU9DIjw/Az5B872Dh7HP2Nv0Uq5F2pSx9g76E=; b=MmIzZ4okUHuRbM1vf7FdFqnc7xrv3envaj7rpkW9Wq9yPLPVAVDC0oiK4XKP8pcJUi0+UN 62alO7XXO88TLwJBqK1Pcyfmm5mDHJQyFXrtXBEdgVCXkYFdnnKBOfg5rrQL2Hp6tMPWbN HXtnJ9Z1lz21WQarKpZib9jYW9YP5RJL3Ir9obxA5SG3MhhlnwrZxutghmsDMCmJuyVLRM XBK6fDTnxkhvDcwBaqSLabjMs1V2v+mMInuE9RX+WcvJcTkfEItyWTzZPk7IFOFSpRlGWP Q4z4TxUw5zpybQq2CpquHpa17qbkPzHJ/gFnOcUCXP9A97HhVF1gxqmT0c3z0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754527801; 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=vBgQxPnU9DIjw/Az5B872Dh7HP2Nv0Uq5F2pSx9g76E=; b=voJugUtwScY6La980cOJMtuArarJrXx/BMbLjs31XB2Qn/eJRwgBl0WpnRAE8rTrCBfFZ5 Km82fm42Djrw8OigWz8LXyHnmhL8qZaOuFNG6eerN6M5O0qzqswPI0evJljL4hlCfjQrOK vri984CaFMpexOw/2Ban4mkZIkjHZpOF6bGhGVtn58aT1vb7N+WGo4j7zFdQGElIae5SkQ pl0dxAg2mfpuA4PsGjPDf8Y5K4BhccBzR8SbwTIPO6NVq0aZn2BgoqufKozwU4KICTa41V /vL2AkLTJm3E8VwBPFDDvP4a9zKPezyS8HJsudme7Yk4SqIWZ8UjlHkxRf8QkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754527801; a=rsa-sha256; cv=none; b=w1F/RTuYwVLhhYlpUAzGO4n+aKrgrNNDp8JDzMPXR3CMnyxO9WhFQI6qAixk1PcrcK0glf VVMW58szhYv4tH5+nZskTDkwtdt45T7vq+pxb/mdq1VwJ6rYNQqkAiV5XYbbRXnqDdyUVn 9HKS1SA6KGrubeEbO1+menx/qh+iA5NUH2EsJD8+WtzySbqstVINpR0YX/GCDAkWWFiIVc YkDViZvNOl0AfgX9TdcxpITs4hUeMaThKnmYdQJ1VE+Hizt+B5htbE81mNe8XblPx2OSPk 0ARSC4kPx+zZm3ciBjQsrDf7yp9u1bR7y6qALlbqqCNM9UazIiC1Gt2IIju59w== 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 4by7qF3ppnzkyN; Thu, 07 Aug 2025 00:50:01 +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 5770o1bN092599; Thu, 7 Aug 2025 00:50:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5770o1Q3092594; Thu, 7 Aug 2025 00:50:01 GMT (envelope-from git) Date: Thu, 7 Aug 2025 00:50:01 GMT Message-Id: <202508070050.5770o1Q3092594@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: 55be7095a43d - 2025Q3 - www/tomcat9: Update 9.0.107 => 9.0.108 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/2025Q3 X-Git-Reftype: branch X-Git-Commit: 55be7095a43d135a612093db7ea8c70627b8fb01 Auto-Submitted: auto-generated The branch 2025Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=55be7095a43d135a612093db7ea8c70627b8fb01 commit 55be7095a43d135a612093db7ea8c70627b8fb01 Author: Vladimir Druzenko AuthorDate: 2025-08-07 00:00:20 +0000 Commit: Vladimir Druzenko CommitDate: 2025-08-07 00:49:56 +0000 www/tomcat9: Update 9.0.107 => 9.0.108 Changelog: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.108_(remm) Improve port. Refresh patch. MFH: 2025Q3 (cherry picked from commit bae35af04ef237195e67229cbde42e88c9222f37) --- www/tomcat9/Makefile | 34 ++++++++++++++++++++-------------- www/tomcat9/distinfo | 6 +++--- www/tomcat9/files/patch-bin__daemon.sh | 6 +++--- www/tomcat9/pkg-plist | 2 ++ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile index 8eed8b293c57..b29754b71693 100644 --- a/www/tomcat9/Makefile +++ b/www/tomcat9/Makefile @@ -1,5 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 9.0.107 +DISTVERSION= 9.0.108 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= 9 @@ -17,6 +17,12 @@ USES= cpe java CPE_VENDOR= apache USE_RC_SUBR= ${PKGBASE:C/-/_/} +EXTRACT_AFTER_ARGS= --exclude commons-daemon-native.tar.gz \ + --exclude commons-daemon.jar \ + --exclude tomcat-native.tar.gz \ + --exclude *.bat \ + --no-same-owner --no-same-permissions + NO_ARCH= yes NO_BUILD= yes SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \ @@ -40,28 +46,28 @@ TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} post-patch: - @${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh - @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \ + ${WRKSRC}/bin/daemon.sh + ${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete do-install: - @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs - @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed - @${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME} + ${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs \ + ${STAGEDIR}${TOMCAT_HOME}/endorsed + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${TOMCAT_HOME} "! -name *\.sh" && \ + ${COPYTREE_BIN} bin ${STAGEDIR}${TOMCAT_HOME} "-name *\.sh") post-install: - @${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat - @(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\ - for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done) + ${FIND} ${STAGEDIR}${TOMCAT_HOME}/conf -type f -not -name '*.xsd' -exec ${MV} {} {}.sample \; post-install-HOST_MANAGER-on: - @(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \ + (cd ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager && \ + for f in META-INF/context.xml WEB-INF/manager.xml WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) post-install-MANAGER-on: - @(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \ + (cd ${STAGEDIR}${TOMCAT_HOME}/webapps/manager && \ + for f in META-INF/context.xml WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) .include diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo index 80be723701b1..e0aaf4bfa890 100644 --- a/www/tomcat9/distinfo +++ b/www/tomcat9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751700000 -SHA256 (apache-tomcat-9.0.107.tar.gz) = d3caa0ad0a65b4931a7d3aeca24e5541cf743ba5fa9e51abda5b3a31d0b4857d -SIZE (apache-tomcat-9.0.107.tar.gz) = 13009294 +TIMESTAMP = 1754520000 +SHA256 (apache-tomcat-9.0.108.tar.gz) = aa9127cc738f532aa34e347b306a82157fb5b499bfc028b4ffaf79db5956d28d +SIZE (apache-tomcat-9.0.108.tar.gz) = 13028093 diff --git a/www/tomcat9/files/patch-bin__daemon.sh b/www/tomcat9/files/patch-bin__daemon.sh index d43ad7ef1eb6..fd81ac439ba9 100644 --- a/www/tomcat9/files/patch-bin__daemon.sh +++ b/www/tomcat9/files/patch-bin__daemon.sh @@ -1,6 +1,6 @@ ---- bin/daemon.sh.orig +--- bin/daemon.sh.orig 2025-07-31 18:19:48 UTC +++ bin/daemon.sh -@@ -115,12 +115,9 @@ +@@ -114,12 +114,9 @@ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap @@ -15,7 +15,7 @@ fi # Set the default service-start wait time if necessary test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 -@@ -137,7 +134,7 @@ +@@ -136,7 +133,7 @@ test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" # Add on extra jar files to CLASSPATH test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" diff --git a/www/tomcat9/pkg-plist b/www/tomcat9/pkg-plist index 7a480526a68d..2b1b63aa4d58 100644 --- a/www/tomcat9/pkg-plist +++ b/www/tomcat9/pkg-plist @@ -608,6 +608,7 @@ %%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/css/manager.css %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg +%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/favicon.ico %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.svg %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp %%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample @@ -622,6 +623,7 @@ %%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample %%MANAGER%%%%T%%/webapps/manager/css/manager.css %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg +%%MANAGER%%%%T%%/webapps/manager/images/favicon.ico %%MANAGER%%%%T%%/webapps/manager/images/tomcat.svg %%MANAGER%%%%T%%/webapps/manager/index.jsp %%MANAGER%%%%T%%/webapps/manager/status.xsd