diff options
Diffstat (limited to 'www/tomcat110')
| -rw-r--r-- | www/tomcat110/Makefile | 33 | ||||
| -rw-r--r-- | www/tomcat110/distinfo | 6 | ||||
| -rw-r--r-- | www/tomcat110/files/patch-bin__daemon.sh | 6 | ||||
| -rw-r--r-- | www/tomcat110/files/tomcat110.in | 10 | ||||
| -rw-r--r-- | www/tomcat110/pkg-plist | 14 |
5 files changed, 41 insertions, 28 deletions
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile index fd6db53a3cb3..d94198c607bd 100644 --- a/www/tomcat110/Makefile +++ b/www/tomcat110/Makefile @@ -1,6 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 11.0.6 -PORTREVISION= 1 +DISTVERSION= 11.0.10 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= 110 @@ -19,6 +18,12 @@ CPE_VENDOR= apache JAVA_VERSION= 17+ 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} \ @@ -42,27 +47,27 @@ 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 - @${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME} + ${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs + (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 <bsd.port.mk> diff --git a/www/tomcat110/distinfo b/www/tomcat110/distinfo index e344328ff6a6..6b753d5b9214 100644 --- a/www/tomcat110/distinfo +++ b/www/tomcat110/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744195573 -SHA256 (apache-tomcat-11.0.6.tar.gz) = 864458f646bf938d3feb5773456199819b91d52670e4d724b9866ccfd4761cef -SIZE (apache-tomcat-11.0.6.tar.gz) = 13878198 +TIMESTAMP = 1754520000 +SHA256 (apache-tomcat-11.0.10.tar.gz) = eb0e326c979df62ca2aaad228146a56a06323fd3a4ae8cfc34ff0d2de58a30d6 +SIZE (apache-tomcat-11.0.10.tar.gz) = 14130534 diff --git a/www/tomcat110/files/patch-bin__daemon.sh b/www/tomcat110/files/patch-bin__daemon.sh index d43ad7ef1eb6..9b5aae66e4d6 100644 --- a/www/tomcat110/files/patch-bin__daemon.sh +++ b/www/tomcat110/files/patch-bin__daemon.sh @@ -1,6 +1,6 @@ ---- bin/daemon.sh.orig +--- bin/daemon.sh.orig 2025-07-31 16:29:14 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/tomcat110/files/tomcat110.in b/www/tomcat110/files/tomcat110.in index b375c9a2d0ff..20ddc6672db2 100644 --- a/www/tomcat110/files/tomcat110.in +++ b/www/tomcat110/files/tomcat110.in @@ -108,16 +108,16 @@ required_dirs="${_tomcat_catalina_tmpdir}" extra_commands="reload" -_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` - -export JAVA_TOOL_OPTIONS="\ +#_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'` +_tomcat_java9_opts="\ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.util=ALL-UNNAMED \ --add-opens=java.base/java.util.concurrent=ALL-UNNAMED \ - --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \ - --enable-native-access=ALL-UNNAMED" + --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" +_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED" +_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}" command="%%LOCALBASE%%/bin/jsvc" command_args="-java-home '${_tomcat_java_home}' \ diff --git a/www/tomcat110/pkg-plist b/www/tomcat110/pkg-plist index 28bd1cee81f1..279e486cfa2e 100644 --- a/www/tomcat110/pkg-plist +++ b/www/tomcat110/pkg-plist @@ -27,7 +27,7 @@ %%T%%/lib/catalina-storeconfig.jar %%T%%/lib/catalina-tribes.jar %%T%%/lib/catalina.jar -%%T%%/lib/ecj-4.35.jar +%%T%%/lib/ecj-4.36.jar %%T%%/lib/el-api.jar %%T%%/lib/jakartaee-migration-1.0.9-shaded.jar %%T%%/lib/jasper-el.jar @@ -103,8 +103,14 @@ %%DOCS%%%%T%%/webapps/docs/architecture/index.html %%DOCS%%%%T%%/webapps/docs/architecture/overview.html %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html -%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png -%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml +%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png %%DOCS%%%%T%%/webapps/docs/architecture/startup.html %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml %%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png @@ -594,6 +600,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 @@ -608,6 +615,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 |