I tried updating tomcat to see if it helped working with jdk11, no joy there yet, but seems worth updating them anyway, so here's a diff:
- update tomcat/v7 to 7.0.93 and tomcat/v8 to 8.5.39 - regen PLIST for tomcat/v6 with newer update-plist No notable changes listed in the migration pages for these versions https://tomcat.apache.org/migration-7.html#Upgrading_7.0.x https://tomcat.apache.org/migration-85.html#Upgrading_8.5.x ok? Index: Makefile.inc =================================================================== RCS file: /cvs/ports/www/tomcat/Makefile.inc,v retrieving revision 1.10 diff -u -p -r1.10 Makefile.inc --- Makefile.inc 30 Mar 2019 14:46:38 -0000 1.10 +++ Makefile.inc 30 Mar 2019 15:11:25 -0000 @@ -43,6 +43,8 @@ CONFDIR = ${SYSCONFDIR}/tomcat CATALINA_BASE = /var/tomcat SAMPLEDIR = ${PREFIX}/share/examples/tomcat SUBST_VARS += CONFDIR CATALINA_BASE +# conf/ is not world-readable +FIX_EXTRACT_PERMISSIONS = Yes post-extract: @rm -rf ${WRKDIST}/webapps/docs @@ -84,4 +86,4 @@ do-install: -name \*.bat -or \ -name \*.exe -or \ -name \*.dll \ - | xargs rm + -delete Index: v6/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v6/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- v6/Makefile 30 Mar 2019 14:46:38 -0000 1.44 +++ v6/Makefile 30 Mar 2019 15:11:25 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.44 2019/03/30 14:46:38 sthen Exp $ COMMENT-main = Java servlet 2.5 and Java server pages 2.1 server -REVISION-main = 4 +REVISION-main = 5 MAJ_VER = 6 MIN_VER = 0 Index: v6/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/www/tomcat/v6/pkg/PLIST-main,v retrieving revision 1.15 diff -u -p -r1.15 PLIST-main --- v6/pkg/PLIST-main 4 Sep 2018 12:46:27 -0000 1.15 +++ v6/pkg/PLIST-main 30 Mar 2019 15:11:25 -0000 @@ -3,67 +3,58 @@ @newgroup _tomcat:526 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin @extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/* -share/doc/pkg-readmes/${PKGSTEM} -share/examples/tomcat/ +@rcscript ${RCDIR}/tomcat @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/ +@sample ${CONFDIR}/ @owner @group +share/doc/pkg-readmes/${PKGSTEM} +share/examples/tomcat/ share/examples/tomcat/catalina.policy @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.policy +@sample ${CONFDIR}/catalina.policy @owner @group share/examples/tomcat/catalina.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.properties +@sample ${CONFDIR}/catalina.properties @owner @group share/examples/tomcat/context.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/context.xml +@sample ${CONFDIR}/context.xml @owner @group share/examples/tomcat/host-manager.xml share/examples/tomcat/logging.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/logging.properties +@sample ${CONFDIR}/logging.properties @owner @group share/examples/tomcat/manager.xml share/examples/tomcat/server.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/server.xml +@sample ${CONFDIR}/server.xml @owner @group share/examples/tomcat/tomcat-users.xml @mode 600 @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/tomcat-users.xml +@sample ${CONFDIR}/tomcat-users.xml @mode @owner @group share/examples/tomcat/web.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/web.xml -@sample ${CATALINA_BASE}/ -@sample ${CATALINA_BASE}/logs/ -@sample ${CATALINA_BASE}/shared/ -@sample ${CATALINA_BASE}/shared/classes/ -@sample ${CATALINA_BASE}/shared/lib/ -@sample ${CATALINA_BASE}/temp/ -@sample ${CATALINA_BASE}/webapps/ -@sample ${CATALINA_BASE}/work/ -@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi -@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi +@sample ${CONFDIR}/web.xml @owner @group tomcat/ @@ -147,4 +138,15 @@ tomcat/webapps/manager/images/void.gif tomcat/webapps/manager/index.jsp tomcat/webapps/manager/status.xsd tomcat/webapps/manager/xform.xsl -@rcscript ${RCDIR}/tomcat +@owner _tomcat +@group _tomcat +@sample ${CATALINA_BASE}/ +@sample ${CATALINA_BASE}/logs/ +@sample ${CATALINA_BASE}/shared/ +@sample ${CATALINA_BASE}/shared/classes/ +@sample ${CATALINA_BASE}/shared/lib/ +@sample ${CATALINA_BASE}/temp/ +@sample ${CATALINA_BASE}/webapps/ +@sample ${CATALINA_BASE}/work/ +@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi +@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi Index: v7/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v7/Makefile,v retrieving revision 1.56 diff -u -p -r1.56 Makefile --- v7/Makefile 30 Mar 2019 14:46:38 -0000 1.56 +++ v7/Makefile 30 Mar 2019 15:11:25 -0000 @@ -1,10 +1,9 @@ # $OpenBSD: Makefile,v 1.56 2019/03/30 14:46:38 sthen Exp $ COMMENT-main = Java servlet 3.0 and Java server pages 2.2 server -REVISION-main = 4 MAJ_VER = 7 MIN_VER = 0 -MICRO_VER = 81 +MICRO_VER = 93 .include <bsd.port.mk> Index: v7/distinfo =================================================================== RCS file: /cvs/ports/www/tomcat/v7/distinfo,v retrieving revision 1.41 diff -u -p -r1.41 distinfo --- v7/distinfo 22 Aug 2017 14:58:57 -0000 1.41 +++ v7/distinfo 30 Mar 2019 15:11:25 -0000 @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-7.0.81-fulldocs.tar.gz) = DhpvRq+cDEUeYy/FQa8FF8MTT0+qVosWj9fVcVcGh6I= -SHA256 (apache-tomcat-7.0.81.tar.gz) = OJdmwwEGuzDx7YaCx5WexTzdrgrpJglYxmbiHxUbmVU= -SIZE (apache-tomcat-7.0.81-fulldocs.tar.gz) = 5512147 -SIZE (apache-tomcat-7.0.81.tar.gz) = 8989099 +SHA256 (apache-tomcat-7.0.93-fulldocs.tar.gz) = WoizKDjKG33cK2PEKKWxHAzta7CIF1WfaHCDsNoxByU= +SHA256 (apache-tomcat-7.0.93.tar.gz) = cgJrYvm/j4NBOz4SdWRuTMXm/FWfzkxWN1V8HZpHFUw= +SIZE (apache-tomcat-7.0.93-fulldocs.tar.gz) = 5205756 +SIZE (apache-tomcat-7.0.93.tar.gz) = 9138957 Index: v7/pkg/PLIST-examples =================================================================== RCS file: /cvs/ports/www/tomcat/v7/pkg/PLIST-examples,v retrieving revision 1.39 diff -u -p -r1.39 PLIST-examples --- v7/pkg/PLIST-examples 22 Aug 2017 14:58:57 -0000 1.39 +++ v7/pkg/PLIST-examples 30 Mar 2019 15:11:25 -0000 @@ -23,6 +23,7 @@ webapps/docs/ webapps/docs/BUILDING.txt webapps/docs/LICENSE webapps/docs/NOTICE +webapps/docs/README.md webapps/docs/RELEASE-NOTES.txt webapps/docs/RUNNING.txt webapps/docs/WEB-INF/ @@ -188,6 +189,7 @@ webapps/docs/api/org/apache/catalina/cor webapps/docs/api/org/apache/catalina/core/ContainerBase.html webapps/docs/api/org/apache/catalina/core/DefaultInstanceManager.html webapps/docs/api/org/apache/catalina/core/JasperListener.html +webapps/docs/api/org/apache/catalina/core/JniLifecycleListener.html webapps/docs/api/org/apache/catalina/core/JreMemoryLeakPreventionListener.html webapps/docs/api/org/apache/catalina/core/NamingContextListener.html webapps/docs/api/org/apache/catalina/core/StandardContext.html @@ -261,12 +263,14 @@ webapps/docs/api/org/apache/catalina/fil webapps/docs/api/org/apache/catalina/filters/FilterBase.html webapps/docs/api/org/apache/catalina/filters/HttpHeaderSecurityFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteAddrFilter.html +webapps/docs/api/org/apache/catalina/filters/RemoteCIDRFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteHostFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteIpFilter.XForwardedRequest.html webapps/docs/api/org/apache/catalina/filters/RemoteIpFilter.html webapps/docs/api/org/apache/catalina/filters/RequestDumperFilter.html webapps/docs/api/org/apache/catalina/filters/RequestFilter.html webapps/docs/api/org/apache/catalina/filters/RestCsrfPreventionFilter.html +webapps/docs/api/org/apache/catalina/filters/SessionInitializerFilter.html webapps/docs/api/org/apache/catalina/filters/SetCharacterEncodingFilter.html webapps/docs/api/org/apache/catalina/filters/WebdavFixFilter.html webapps/docs/api/org/apache/catalina/filters/package-frame.html @@ -755,6 +759,7 @@ webapps/docs/api/org/apache/catalina/uti webapps/docs/api/org/apache/catalina/util/LifecycleSupport.html webapps/docs/api/org/apache/catalina/util/MIME2Java.html webapps/docs/api/org/apache/catalina/util/ManifestResource.html +webapps/docs/api/org/apache/catalina/util/NetMask.html webapps/docs/api/org/apache/catalina/util/ParameterMap.html webapps/docs/api/org/apache/catalina/util/RequestUtil.html webapps/docs/api/org/apache/catalina/util/ResourceSet.html @@ -821,6 +826,7 @@ webapps/docs/api/org/apache/catalina/val webapps/docs/api/org/apache/catalina/valves/JDBCAccessLogValve.html webapps/docs/api/org/apache/catalina/valves/PersistentValve.html webapps/docs/api/org/apache/catalina/valves/RemoteAddrValve.html +webapps/docs/api/org/apache/catalina/valves/RemoteCIDRValve.html webapps/docs/api/org/apache/catalina/valves/RemoteHostValve.html webapps/docs/api/org/apache/catalina/valves/RemoteIpValve.html webapps/docs/api/org/apache/catalina/valves/RequestFilterValve.html @@ -1236,12 +1242,14 @@ webapps/docs/api/org/apache/juli/package webapps/docs/api/org/apache/juli/package-summary.html webapps/docs/api/org/apache/juli/package-tree.html webapps/docs/api/org/apache/naming/ +webapps/docs/api/org/apache/naming/AbstractRef.html webapps/docs/api/org/apache/naming/Constants.html webapps/docs/api/org/apache/naming/ContextAccessController.html webapps/docs/api/org/apache/naming/ContextBindings.html webapps/docs/api/org/apache/naming/EjbRef.html webapps/docs/api/org/apache/naming/HandlerRef.html webapps/docs/api/org/apache/naming/JndiPermission.html +webapps/docs/api/org/apache/naming/LookupRef.html webapps/docs/api/org/apache/naming/NameParserImpl.html webapps/docs/api/org/apache/naming/NamingContext.html webapps/docs/api/org/apache/naming/NamingContextBindingsEnumeration.html @@ -1260,6 +1268,7 @@ webapps/docs/api/org/apache/naming/facto webapps/docs/api/org/apache/naming/factory/DataSourceLinkFactory.DataSourceHandler.html webapps/docs/api/org/apache/naming/factory/DataSourceLinkFactory.html webapps/docs/api/org/apache/naming/factory/EjbFactory.html +webapps/docs/api/org/apache/naming/factory/LookupFactory.html webapps/docs/api/org/apache/naming/factory/MailSessionFactory.html webapps/docs/api/org/apache/naming/factory/OpenEjbFactory.html webapps/docs/api/org/apache/naming/factory/ResourceEnvFactory.html @@ -1298,6 +1307,7 @@ webapps/docs/api/org/apache/naming/resou webapps/docs/api/org/apache/naming/resources/FileDirContext.FileResourceAttributes.html webapps/docs/api/org/apache/naming/resources/FileDirContext.html webapps/docs/api/org/apache/naming/resources/ImmutableNameNotFoundException.html +webapps/docs/api/org/apache/naming/resources/JrePlatform.html webapps/docs/api/org/apache/naming/resources/ProxyDirContext.html webapps/docs/api/org/apache/naming/resources/RecyclableNamingEnumeration.html webapps/docs/api/org/apache/naming/resources/Resource.html @@ -1441,6 +1451,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.AttributeHolder.html webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.PropertySource.html webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.html +webapps/docs/api/org/apache/tomcat/util/MultiThrowable.html webapps/docs/api/org/apache/tomcat/util/MutableInteger.html webapps/docs/api/org/apache/tomcat/util/bcel/ webapps/docs/api/org/apache/tomcat/util/bcel/Const.html @@ -1472,6 +1483,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/bcel/package-summary.html webapps/docs/api/org/apache/tomcat/util/bcel/package-tree.html webapps/docs/api/org/apache/tomcat/util/buf/ +webapps/docs/api/org/apache/tomcat/util/buf/AbstractChunk.html webapps/docs/api/org/apache/tomcat/util/buf/Ascii.html webapps/docs/api/org/apache/tomcat/util/buf/B2CConverter.html webapps/docs/api/org/apache/tomcat/util/buf/ByteChunk.ByteInputChannel.html @@ -1523,6 +1535,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/compat/ webapps/docs/api/org/apache/tomcat/util/compat/JreCompat.html webapps/docs/api/org/apache/tomcat/util/compat/JreVendor.html +webapps/docs/api/org/apache/tomcat/util/compat/TLS.html webapps/docs/api/org/apache/tomcat/util/compat/package-frame.html webapps/docs/api/org/apache/tomcat/util/compat/package-summary.html webapps/docs/api/org/apache/tomcat/util/compat/package-tree.html @@ -1660,9 +1673,11 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/http/package-summary.html webapps/docs/api/org/apache/tomcat/util/http/package-tree.html webapps/docs/api/org/apache/tomcat/util/http/parser/ +webapps/docs/api/org/apache/tomcat/util/http/parser/Host.html webapps/docs/api/org/apache/tomcat/util/http/parser/HttpParser.html webapps/docs/api/org/apache/tomcat/util/http/parser/MediaType.html webapps/docs/api/org/apache/tomcat/util/http/parser/MediaTypeCache.html +webapps/docs/api/org/apache/tomcat/util/http/parser/Vary.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-frame.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-summary.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-tree.html @@ -1812,11 +1827,16 @@ webapps/docs/api/org/apache/tomcat/webso webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapper.html webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.html webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.html +webapps/docs/api/org/apache/tomcat/websocket/AuthenticationException.html +webapps/docs/api/org/apache/tomcat/websocket/Authenticator.html +webapps/docs/api/org/apache/tomcat/websocket/AuthenticatorFactory.html webapps/docs/api/org/apache/tomcat/websocket/BackgroundProcess.html webapps/docs/api/org/apache/tomcat/websocket/BackgroundProcessManager.html +webapps/docs/api/org/apache/tomcat/websocket/BasicAuthenticator.html webapps/docs/api/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.html webapps/docs/api/org/apache/tomcat/websocket/Constants.html webapps/docs/api/org/apache/tomcat/websocket/DecoderEntry.html +webapps/docs/api/org/apache/tomcat/websocket/DigestAuthenticator.html webapps/docs/api/org/apache/tomcat/websocket/MessageHandlerResult.html webapps/docs/api/org/apache/tomcat/websocket/MessageHandlerResultType.html webapps/docs/api/org/apache/tomcat/websocket/PerMessageDeflate.html @@ -2030,6 +2050,8 @@ webapps/docs/funcspecs/fs-jndi-realm.htm webapps/docs/funcspecs/fs-memory-realm.html webapps/docs/funcspecs/index.html webapps/docs/funcspecs/mbean-names.html +webapps/docs/host-manager-howto.html +webapps/docs/html-host-manager-howto.html webapps/docs/html-manager-howto.html webapps/docs/images/ webapps/docs/images/add.gif @@ -2139,6 +2161,7 @@ webapps/docs/logging.html webapps/docs/manager-howto.html webapps/docs/maven-jars.html webapps/docs/mbeans-descriptors-howto.html +webapps/docs/mbeans-descriptors.dtd webapps/docs/monitoring.html webapps/docs/proxy-howto.html webapps/docs/realm-howto.html @@ -2380,6 +2403,8 @@ webapps/examples/WEB-INF/classes/async/A webapps/examples/WEB-INF/classes/async/Async2.java webapps/examples/WEB-INF/classes/async/Async3.class webapps/examples/WEB-INF/classes/async/Async3.java +webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.class +webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.java webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class @@ -2429,8 +2454,6 @@ webapps/examples/WEB-INF/classes/example webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java webapps/examples/WEB-INF/classes/examples/LogTag.class webapps/examples/WEB-INF/classes/examples/LogTag.java -webapps/examples/WEB-INF/classes/examples/ShowSource.class -webapps/examples/WEB-INF/classes/examples/ShowSource.java webapps/examples/WEB-INF/classes/examples/ValuesTag.class webapps/examples/WEB-INF/classes/examples/ValuesTag.java webapps/examples/WEB-INF/classes/filters/ @@ -2763,8 +2786,6 @@ webapps/examples/jsp/snp/ webapps/examples/jsp/snp/snoop.html webapps/examples/jsp/snp/snoop.jsp webapps/examples/jsp/snp/snoop.jsp.html -webapps/examples/jsp/source.jsp -webapps/examples/jsp/source.jsp.html webapps/examples/jsp/tagplugin/ webapps/examples/jsp/tagplugin/choose.html webapps/examples/jsp/tagplugin/choose.jsp Index: v7/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/www/tomcat/v7/pkg/PLIST-main,v retrieving revision 1.16 diff -u -p -r1.16 PLIST-main --- v7/pkg/PLIST-main 4 Sep 2018 12:46:27 -0000 1.16 +++ v7/pkg/PLIST-main 30 Mar 2019 15:11:25 -0000 @@ -3,72 +3,66 @@ @newgroup _tomcat:526 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin @extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/* -share/doc/pkg-readmes/${PKGSTEM} -share/examples/tomcat/ +@rcscript ${RCDIR}/tomcat @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/ +@sample ${CONFDIR}/ @owner @group +share/doc/pkg-readmes/${PKGSTEM} +share/examples/tomcat/ share/examples/tomcat/catalina.policy @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.policy +@sample ${CONFDIR}/catalina.policy @owner @group share/examples/tomcat/catalina.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.properties +@sample ${CONFDIR}/catalina.properties @owner @group share/examples/tomcat/context.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/context.xml +@sample ${CONFDIR}/context.xml @owner @group share/examples/tomcat/host-manager.xml share/examples/tomcat/logging.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/logging.properties +@sample ${CONFDIR}/logging.properties @owner @group share/examples/tomcat/manager.xml share/examples/tomcat/server.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/server.xml +@sample ${CONFDIR}/server.xml @owner @group share/examples/tomcat/tomcat-users.xml @mode 600 @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/tomcat-users.xml +@sample ${CONFDIR}/tomcat-users.xml @mode @owner @group share/examples/tomcat/web.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/web.xml -@sample ${CATALINA_BASE}/ -@sample ${CATALINA_BASE}/logs/ -@sample ${CATALINA_BASE}/shared/ -@sample ${CATALINA_BASE}/shared/classes/ -@sample ${CATALINA_BASE}/shared/lib/ -@sample ${CATALINA_BASE}/temp/ -@sample ${CATALINA_BASE}/webapps/ -@sample ${CATALINA_BASE}/work/ -@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi -@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi +@sample ${CONFDIR}/web.xml @owner @group tomcat/ +tomcat/BUILDING.txt +tomcat/CONTRIBUTING.md tomcat/LICENSE tomcat/NOTICE +tomcat/README.md tomcat/RELEASE-NOTES tomcat/RUNNING.txt tomcat/bin/ @@ -105,6 +99,7 @@ tomcat/lib/tomcat-dbcp.jar tomcat/lib/tomcat-i18n-es.jar tomcat/lib/tomcat-i18n-fr.jar tomcat/lib/tomcat-i18n-ja.jar +tomcat/lib/tomcat-i18n-ru.jar tomcat/lib/tomcat-jdbc.jar tomcat/lib/tomcat-util.jar tomcat/lib/tomcat7-websocket.jar @@ -155,4 +150,15 @@ tomcat/webapps/manager/images/void.gif tomcat/webapps/manager/index.jsp tomcat/webapps/manager/status.xsd tomcat/webapps/manager/xform.xsl -@rcscript ${RCDIR}/tomcat +@owner _tomcat +@group _tomcat +@sample ${CATALINA_BASE}/ +@sample ${CATALINA_BASE}/logs/ +@sample ${CATALINA_BASE}/shared/ +@sample ${CATALINA_BASE}/shared/classes/ +@sample ${CATALINA_BASE}/shared/lib/ +@sample ${CATALINA_BASE}/temp/ +@sample ${CATALINA_BASE}/webapps/ +@sample ${CATALINA_BASE}/work/ +@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi +@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi Index: v8/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v8/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- v8/Makefile 30 Mar 2019 14:46:38 -0000 1.33 +++ v8/Makefile 30 Mar 2019 15:11:25 -0000 @@ -1,10 +1,9 @@ # $OpenBSD: Makefile,v 1.33 2019/03/30 14:46:38 sthen Exp $ COMMENT-main = Java servlet 3.1 and Java server pages 2.3 server -REVISION-main = 4 MAJ_VER = 8 MIN_VER = 5 -MICRO_VER = 20 +MICRO_VER = 39 .include <bsd.port.mk> Index: v8/distinfo =================================================================== RCS file: /cvs/ports/www/tomcat/v8/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- v8/distinfo 11 Aug 2017 09:26:26 -0000 1.25 +++ v8/distinfo 30 Mar 2019 15:11:25 -0000 @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-8.5.20-fulldocs.tar.gz) = sJPT6KxfwMAaJP7CFqC/vKjNjHghaxEmVI7YzozL/gU= -SHA256 (apache-tomcat-8.5.20.tar.gz) = Cl2zcUe0h043hBdihRRmLRbyPx95ZZKXs1JrpX5/rNA= -SIZE (apache-tomcat-8.5.20-fulldocs.tar.gz) = 5827144 -SIZE (apache-tomcat-8.5.20.tar.gz) = 9433364 +SHA256 (apache-tomcat-8.5.39-fulldocs.tar.gz) = bv686IVuJSGYj3Qpi1q3VBUuc3OABQI2ug5Esy1TY0I= +SHA256 (apache-tomcat-8.5.39.tar.gz) = GPiyZGg4kgLq9a0PQLFqzhrd6jEr7b0qCbclWNiq1pY= +SIZE (apache-tomcat-8.5.39-fulldocs.tar.gz) = 5594749 +SIZE (apache-tomcat-8.5.39.tar.gz) = 9672485 Index: v8/pkg/PLIST-examples =================================================================== RCS file: /cvs/ports/www/tomcat/v8/pkg/PLIST-examples,v retrieving revision 1.26 diff -u -p -r1.26 PLIST-examples --- v8/pkg/PLIST-examples 11 Aug 2017 09:26:26 -0000 1.26 +++ v8/pkg/PLIST-examples 30 Mar 2019 15:11:25 -0000 @@ -23,6 +23,7 @@ webapps/docs/ webapps/docs/BUILDING.txt webapps/docs/LICENSE webapps/docs/NOTICE +webapps/docs/README.md webapps/docs/RELEASE-NOTES.txt webapps/docs/RUNNING.txt webapps/docs/WEB-INF/ @@ -199,6 +200,7 @@ webapps/docs/api/org/apache/catalina/cor webapps/docs/api/org/apache/catalina/core/ContainerBase.PrivilegedAddChild.html webapps/docs/api/org/apache/catalina/core/ContainerBase.html webapps/docs/api/org/apache/catalina/core/DefaultInstanceManager.html +webapps/docs/api/org/apache/catalina/core/JniLifecycleListener.html webapps/docs/api/org/apache/catalina/core/JreMemoryLeakPreventionListener.html webapps/docs/api/org/apache/catalina/core/NamingContextListener.html webapps/docs/api/org/apache/catalina/core/StandardContext.html @@ -243,12 +245,14 @@ webapps/docs/api/org/apache/catalina/fil webapps/docs/api/org/apache/catalina/filters/FilterBase.html webapps/docs/api/org/apache/catalina/filters/HttpHeaderSecurityFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteAddrFilter.html +webapps/docs/api/org/apache/catalina/filters/RemoteCIDRFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteHostFilter.html webapps/docs/api/org/apache/catalina/filters/RemoteIpFilter.XForwardedRequest.html webapps/docs/api/org/apache/catalina/filters/RemoteIpFilter.html webapps/docs/api/org/apache/catalina/filters/RequestDumperFilter.html webapps/docs/api/org/apache/catalina/filters/RequestFilter.html webapps/docs/api/org/apache/catalina/filters/RestCsrfPreventionFilter.html +webapps/docs/api/org/apache/catalina/filters/SessionInitializerFilter.html webapps/docs/api/org/apache/catalina/filters/SetCharacterEncodingFilter.html webapps/docs/api/org/apache/catalina/filters/WebdavFixFilter.html webapps/docs/api/org/apache/catalina/filters/package-frame.html @@ -332,6 +336,7 @@ webapps/docs/api/org/apache/catalina/loa webapps/docs/api/org/apache/catalina/loader/WebappClassLoader.html webapps/docs/api/org/apache/catalina/loader/WebappClassLoaderBase.PrivilegedFindClassByName.html webapps/docs/api/org/apache/catalina/loader/WebappClassLoaderBase.PrivilegedGetClassLoader.html +webapps/docs/api/org/apache/catalina/loader/WebappClassLoaderBase.PrivilegedJavaseGetResource.html webapps/docs/api/org/apache/catalina/loader/WebappClassLoaderBase.html webapps/docs/api/org/apache/catalina/loader/WebappLoader.html webapps/docs/api/org/apache/catalina/loader/package-frame.html @@ -378,6 +383,7 @@ webapps/docs/api/org/apache/catalina/map webapps/docs/api/org/apache/catalina/mapper/package-summary.html webapps/docs/api/org/apache/catalina/mapper/package-tree.html webapps/docs/api/org/apache/catalina/mbeans/ +webapps/docs/api/org/apache/catalina/mbeans/BaseCatalinaMBean.html webapps/docs/api/org/apache/catalina/mbeans/ClassNameMBean.html webapps/docs/api/org/apache/catalina/mbeans/ConnectorMBean.html webapps/docs/api/org/apache/catalina/mbeans/ContainerMBean.html @@ -563,6 +569,7 @@ webapps/docs/api/org/apache/catalina/sta webapps/docs/api/org/apache/catalina/startup/package-tree.html webapps/docs/api/org/apache/catalina/storeconfig/ webapps/docs/api/org/apache/catalina/storeconfig/CatalinaClusterSF.html +webapps/docs/api/org/apache/catalina/storeconfig/CertificateStoreAppender.html webapps/docs/api/org/apache/catalina/storeconfig/ChannelSF.html webapps/docs/api/org/apache/catalina/storeconfig/ConnectorSF.html webapps/docs/api/org/apache/catalina/storeconfig/ConnectorStoreAppender.html @@ -576,6 +583,7 @@ webapps/docs/api/org/apache/catalina/sto webapps/docs/api/org/apache/catalina/storeconfig/LoaderSF.html webapps/docs/api/org/apache/catalina/storeconfig/ManagerSF.html webapps/docs/api/org/apache/catalina/storeconfig/NamingResourcesSF.html +webapps/docs/api/org/apache/catalina/storeconfig/OpenSSLConfSF.html webapps/docs/api/org/apache/catalina/storeconfig/PersistentManagerSF.html webapps/docs/api/org/apache/catalina/storeconfig/RealmSF.html webapps/docs/api/org/apache/catalina/storeconfig/SSLHostConfigSF.html @@ -644,9 +652,12 @@ webapps/docs/api/org/apache/catalina/tri webapps/docs/api/org/apache/catalina/tribes/group/interceptors/ webapps/docs/api/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptorMBean.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/EncryptInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.FragCollection.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.FragKey.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.html @@ -785,6 +796,7 @@ webapps/docs/api/org/apache/catalina/uti webapps/docs/api/org/apache/catalina/util/ContextName.html webapps/docs/api/org/apache/catalina/util/CustomObjectInputStream.html webapps/docs/api/org/apache/catalina/util/DOMWriter.html +webapps/docs/api/org/apache/catalina/util/ErrorPageSupport.html webapps/docs/api/org/apache/catalina/util/Extension.html webapps/docs/api/org/apache/catalina/util/ExtensionValidator.html webapps/docs/api/org/apache/catalina/util/IOTools.html @@ -793,6 +805,7 @@ webapps/docs/api/org/apache/catalina/uti webapps/docs/api/org/apache/catalina/util/LifecycleMBeanBase.html webapps/docs/api/org/apache/catalina/util/MIME2Java.html webapps/docs/api/org/apache/catalina/util/ManifestResource.html +webapps/docs/api/org/apache/catalina/util/NetMask.html webapps/docs/api/org/apache/catalina/util/ParameterMap.html webapps/docs/api/org/apache/catalina/util/RequestUtil.html webapps/docs/api/org/apache/catalina/util/ResourceSet.html @@ -858,8 +871,10 @@ webapps/docs/api/org/apache/catalina/val webapps/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.TimeElement.html webapps/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.html webapps/docs/api/org/apache/catalina/valves/JDBCAccessLogValve.html +webapps/docs/api/org/apache/catalina/valves/LoadBalancerDrainingValve.html webapps/docs/api/org/apache/catalina/valves/PersistentValve.html webapps/docs/api/org/apache/catalina/valves/RemoteAddrValve.html +webapps/docs/api/org/apache/catalina/valves/RemoteCIDRValve.html webapps/docs/api/org/apache/catalina/valves/RemoteHostValve.html webapps/docs/api/org/apache/catalina/valves/RemoteIpValve.html webapps/docs/api/org/apache/catalina/valves/RequestFilterValve.html @@ -909,6 +924,7 @@ webapps/docs/api/org/apache/catalina/web webapps/docs/api/org/apache/catalina/webresources/DirResourceSet.html webapps/docs/api/org/apache/catalina/webresources/EmptyResource.html webapps/docs/api/org/apache/catalina/webresources/EmptyResourceSet.html +webapps/docs/api/org/apache/catalina/webresources/ExtractingRoot.html webapps/docs/api/org/apache/catalina/webresources/FileResource.html webapps/docs/api/org/apache/catalina/webresources/FileResourceSet.html webapps/docs/api/org/apache/catalina/webresources/JarResource.html @@ -917,6 +933,7 @@ webapps/docs/api/org/apache/catalina/web webapps/docs/api/org/apache/catalina/webresources/JarWarResource.html webapps/docs/api/org/apache/catalina/webresources/JarWarResourceSet.html webapps/docs/api/org/apache/catalina/webresources/StandardRoot.html +webapps/docs/api/org/apache/catalina/webresources/TomcatJarInputStream.html webapps/docs/api/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.html webapps/docs/api/org/apache/catalina/webresources/VirtualResource.html webapps/docs/api/org/apache/catalina/webresources/WarResource.html @@ -943,6 +960,7 @@ webapps/docs/api/org/apache/coyote/Adapt webapps/docs/api/org/apache/coyote/AsyncContextCallback.html webapps/docs/api/org/apache/coyote/AsyncStateMachine.html webapps/docs/api/org/apache/coyote/CloseNowException.html +webapps/docs/api/org/apache/coyote/CompressionConfig.html webapps/docs/api/org/apache/coyote/Constants.html webapps/docs/api/org/apache/coyote/ContainerThreadMarker.html webapps/docs/api/org/apache/coyote/ErrorState.html @@ -984,6 +1002,7 @@ webapps/docs/api/org/apache/coyote/http1 webapps/docs/api/org/apache/coyote/http11/Http11OutputBuffer.html webapps/docs/api/org/apache/coyote/http11/Http11Processor.html webapps/docs/api/org/apache/coyote/http11/Http11Protocol.html +webapps/docs/api/org/apache/coyote/http11/HttpOutputBuffer.html webapps/docs/api/org/apache/coyote/http11/InputFilter.html webapps/docs/api/org/apache/coyote/http11/OutputFilter.html webapps/docs/api/org/apache/coyote/http11/filters/ @@ -1032,6 +1051,7 @@ webapps/docs/api/org/apache/coyote/http2 webapps/docs/api/org/apache/coyote/http2/HpackException.html webapps/docs/api/org/apache/coyote/http2/Http2Error.html webapps/docs/api/org/apache/coyote/http2/Http2Exception.html +webapps/docs/api/org/apache/coyote/http2/Http2OutputBuffer.html webapps/docs/api/org/apache/coyote/http2/Http2Protocol.html webapps/docs/api/org/apache/coyote/http2/Http2UpgradeHandler.html webapps/docs/api/org/apache/coyote/http2/Setting.html @@ -1261,11 +1281,13 @@ webapps/docs/api/org/apache/juli/package webapps/docs/api/org/apache/juli/package-summary.html webapps/docs/api/org/apache/juli/package-tree.html webapps/docs/api/org/apache/naming/ +webapps/docs/api/org/apache/naming/AbstractRef.html webapps/docs/api/org/apache/naming/Constants.html webapps/docs/api/org/apache/naming/ContextAccessController.html webapps/docs/api/org/apache/naming/ContextBindings.html webapps/docs/api/org/apache/naming/EjbRef.html webapps/docs/api/org/apache/naming/HandlerRef.html +webapps/docs/api/org/apache/naming/LookupRef.html webapps/docs/api/org/apache/naming/NameParserImpl.html webapps/docs/api/org/apache/naming/NamingContext.html webapps/docs/api/org/apache/naming/NamingContextBindingsEnumeration.html @@ -1285,6 +1307,7 @@ webapps/docs/api/org/apache/naming/facto webapps/docs/api/org/apache/naming/factory/DataSourceLinkFactory.html webapps/docs/api/org/apache/naming/factory/EjbFactory.html webapps/docs/api/org/apache/naming/factory/FactoryBase.html +webapps/docs/api/org/apache/naming/factory/LookupFactory.html webapps/docs/api/org/apache/naming/factory/MailSessionFactory.html webapps/docs/api/org/apache/naming/factory/OpenEjbFactory.html webapps/docs/api/org/apache/naming/factory/ResourceEnvFactory.html @@ -1345,6 +1368,7 @@ webapps/docs/api/org/apache/tomcat/dbcp/ webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.html webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.html webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.html +webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/ListException.html webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/PStmtKey.html webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.html webapps/docs/api/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.html @@ -1394,6 +1418,8 @@ webapps/docs/api/org/apache/tomcat/dbcp/ webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.html +webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/CallStack.html +webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/CallStackUtils.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfo.html @@ -1406,8 +1432,11 @@ webapps/docs/api/org/apache/tomcat/dbcp/ webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolConfig.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.html +webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/NoOpCallStack.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/PooledSoftReference.html +webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/SecurityManagerCallStack.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.html +webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/package-frame.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/package-summary.html webapps/docs/api/org/apache/tomcat/dbcp/pool2/impl/package-tree.html @@ -1445,6 +1474,7 @@ webapps/docs/api/org/apache/tomcat/jdbc/ webapps/docs/api/org/apache/tomcat/jdbc/pool/PoolProperties.html webapps/docs/api/org/apache/tomcat/jdbc/pool/PoolUtilities.html webapps/docs/api/org/apache/tomcat/jdbc/pool/PooledConnection.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/PooledConnectionMBean.html webapps/docs/api/org/apache/tomcat/jdbc/pool/ProxyConnection.html webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.StatementProxy.html webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.html @@ -1458,12 +1488,15 @@ webapps/docs/api/org/apache/tomcat/jdbc/ webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimerMBean.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.QueryStats.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.QueryStatsComparator.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.CachedStatement.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementCacheMBean.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.ResultSetProxy.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.StatementProxy.html webapps/docs/api/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.html @@ -1475,6 +1508,7 @@ webapps/docs/api/org/apache/tomcat/jdbc/ webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/ webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.html webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/JmxUtil.html webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/package-frame.html webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/package-summary.html webapps/docs/api/org/apache/tomcat/jdbc/pool/jmx/package-tree.html @@ -1507,6 +1541,7 @@ webapps/docs/api/org/apache/tomcat/jni/P webapps/docs/api/org/apache/tomcat/jni/Procattr.html webapps/docs/api/org/apache/tomcat/jni/Registry.html webapps/docs/api/org/apache/tomcat/jni/SSL.html +webapps/docs/api/org/apache/tomcat/jni/SSLConf.html webapps/docs/api/org/apache/tomcat/jni/SSLContext.SNICallBack.html webapps/docs/api/org/apache/tomcat/jni/SSLContext.html webapps/docs/api/org/apache/tomcat/jni/SSLSocket.html @@ -1529,6 +1564,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/ExceptionUtils.html webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.PropertySource.html webapps/docs/api/org/apache/tomcat/util/IntrospectionUtils.html +webapps/docs/api/org/apache/tomcat/util/MultiThrowable.html webapps/docs/api/org/apache/tomcat/util/bcel/ webapps/docs/api/org/apache/tomcat/util/bcel/Const.html webapps/docs/api/org/apache/tomcat/util/bcel/classfile/ @@ -1559,6 +1595,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/bcel/package-summary.html webapps/docs/api/org/apache/tomcat/util/bcel/package-tree.html webapps/docs/api/org/apache/tomcat/util/buf/ +webapps/docs/api/org/apache/tomcat/util/buf/AbstractChunk.html webapps/docs/api/org/apache/tomcat/util/buf/Ascii.html webapps/docs/api/org/apache/tomcat/util/buf/B2CConverter.html webapps/docs/api/org/apache/tomcat/util/buf/ByteBufferHolder.html @@ -1613,7 +1650,9 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/collections/package-tree.html webapps/docs/api/org/apache/tomcat/util/compat/ webapps/docs/api/org/apache/tomcat/util/compat/JreCompat.html +webapps/docs/api/org/apache/tomcat/util/compat/JrePlatform.html webapps/docs/api/org/apache/tomcat/util/compat/JreVendor.html +webapps/docs/api/org/apache/tomcat/util/compat/TLS.html webapps/docs/api/org/apache/tomcat/util/compat/package-frame.html webapps/docs/api/org/apache/tomcat/util/compat/package-summary.html webapps/docs/api/org/apache/tomcat/util/compat/package-tree.html @@ -1724,6 +1763,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/http/Parameters.FailReason.html webapps/docs/api/org/apache/tomcat/util/http/Parameters.html webapps/docs/api/org/apache/tomcat/util/http/RequestUtil.html +webapps/docs/api/org/apache/tomcat/util/http/ResponseUtil.html webapps/docs/api/org/apache/tomcat/util/http/Rfc6265CookieProcessor.html webapps/docs/api/org/apache/tomcat/util/http/ServerCookie.html webapps/docs/api/org/apache/tomcat/util/http/ServerCookies.html @@ -1794,9 +1834,11 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/http/parser/AcceptLanguage.html webapps/docs/api/org/apache/tomcat/util/http/parser/Authorization.html webapps/docs/api/org/apache/tomcat/util/http/parser/Cookie.html +webapps/docs/api/org/apache/tomcat/util/http/parser/Host.html webapps/docs/api/org/apache/tomcat/util/http/parser/HttpParser.html webapps/docs/api/org/apache/tomcat/util/http/parser/MediaType.html webapps/docs/api/org/apache/tomcat/util/http/parser/MediaTypeCache.html +webapps/docs/api/org/apache/tomcat/util/http/parser/Vary.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-frame.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-summary.html webapps/docs/api/org/apache/tomcat/util/http/parser/package-tree.html @@ -1852,6 +1894,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/net/AprEndpoint.html webapps/docs/api/org/apache/tomcat/util/net/AprSSLSupport.html webapps/docs/api/org/apache/tomcat/util/net/Constants.html +webapps/docs/api/org/apache/tomcat/util/net/ContainerThreadMarker.html webapps/docs/api/org/apache/tomcat/util/net/DispatchType.html webapps/docs/api/org/apache/tomcat/util/net/Nio2Channel.html webapps/docs/api/org/apache/tomcat/util/net/Nio2Endpoint.Acceptor.html @@ -1859,6 +1902,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/net/Nio2Endpoint.SendfileData.html webapps/docs/api/org/apache/tomcat/util/net/Nio2Endpoint.SocketProcessor.html webapps/docs/api/org/apache/tomcat/util/net/Nio2Endpoint.html +webapps/docs/api/org/apache/tomcat/util/net/NioBlockingSelector.BlockPoller.RunnableCancel.html webapps/docs/api/org/apache/tomcat/util/net/NioBlockingSelector.BlockPoller.html webapps/docs/api/org/apache/tomcat/util/net/NioBlockingSelector.KeyReference.html webapps/docs/api/org/apache/tomcat/util/net/NioBlockingSelector.html @@ -1892,25 +1936,30 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/net/SocketEvent.html webapps/docs/api/org/apache/tomcat/util/net/SocketProcessorBase.html webapps/docs/api/org/apache/tomcat/util/net/SocketProperties.html +webapps/docs/api/org/apache/tomcat/util/net/SocketWrapperBase.BlockingMode.html webapps/docs/api/org/apache/tomcat/util/net/SocketWrapperBase.CompletionCheck.html webapps/docs/api/org/apache/tomcat/util/net/SocketWrapperBase.CompletionHandlerCall.html webapps/docs/api/org/apache/tomcat/util/net/SocketWrapperBase.CompletionState.html webapps/docs/api/org/apache/tomcat/util/net/SocketWrapperBase.html webapps/docs/api/org/apache/tomcat/util/net/TLSClientHelloExtractor.ExtractorResult.html webapps/docs/api/org/apache/tomcat/util/net/TLSClientHelloExtractor.html +webapps/docs/api/org/apache/tomcat/util/net/WriteBuffer.Sink.html +webapps/docs/api/org/apache/tomcat/util/net/WriteBuffer.html webapps/docs/api/org/apache/tomcat/util/net/jsse/ webapps/docs/api/org/apache/tomcat/util/net/jsse/JSSEImplementation.html webapps/docs/api/org/apache/tomcat/util/net/jsse/JSSEKeyManager.html webapps/docs/api/org/apache/tomcat/util/net/jsse/JSSESupport.html webapps/docs/api/org/apache/tomcat/util/net/jsse/JSSEUtil.html +webapps/docs/api/org/apache/tomcat/util/net/jsse/PEMFile.html webapps/docs/api/org/apache/tomcat/util/net/jsse/package-frame.html webapps/docs/api/org/apache/tomcat/util/net/jsse/package-summary.html webapps/docs/api/org/apache/tomcat/util/net/jsse/package-tree.html webapps/docs/api/org/apache/tomcat/util/net/openssl/ +webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLConf.html +webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLConfCmd.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLContext.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLEngine.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.html -webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLProtocols.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLSessionContext.html webapps/docs/api/org/apache/tomcat/util/net/openssl/OpenSSLSessionStats.html @@ -1943,6 +1992,7 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/scan/JarFileUrlJar.html webapps/docs/api/org/apache/tomcat/util/scan/JarFileUrlNestedJar.html webapps/docs/api/org/apache/tomcat/util/scan/NonClosingJarInputStream.html +webapps/docs/api/org/apache/tomcat/util/scan/ReferenceCountedJar.html webapps/docs/api/org/apache/tomcat/util/scan/StandardJarScanFilter.html webapps/docs/api/org/apache/tomcat/util/scan/StandardJarScanner.html webapps/docs/api/org/apache/tomcat/util/scan/UrlJar.html @@ -1951,6 +2001,8 @@ webapps/docs/api/org/apache/tomcat/util/ webapps/docs/api/org/apache/tomcat/util/scan/package-tree.html webapps/docs/api/org/apache/tomcat/util/security/ webapps/docs/api/org/apache/tomcat/util/security/ConcurrentMessageDigest.html +webapps/docs/api/org/apache/tomcat/util/security/Escape.html +webapps/docs/api/org/apache/tomcat/util/security/KeyStoreUtil.html webapps/docs/api/org/apache/tomcat/util/security/MD5Encoder.html webapps/docs/api/org/apache/tomcat/util/security/PermissionCheck.html webapps/docs/api/org/apache/tomcat/util/security/PrivilegedGetTccl.html @@ -1975,10 +2027,15 @@ webapps/docs/api/org/apache/tomcat/webso webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapper.html webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapperNonSecure.html webapps/docs/api/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.html +webapps/docs/api/org/apache/tomcat/websocket/AuthenticationException.html +webapps/docs/api/org/apache/tomcat/websocket/Authenticator.html +webapps/docs/api/org/apache/tomcat/websocket/AuthenticatorFactory.html webapps/docs/api/org/apache/tomcat/websocket/BackgroundProcess.html webapps/docs/api/org/apache/tomcat/websocket/BackgroundProcessManager.html +webapps/docs/api/org/apache/tomcat/websocket/BasicAuthenticator.html webapps/docs/api/org/apache/tomcat/websocket/Constants.html webapps/docs/api/org/apache/tomcat/websocket/DecoderEntry.html +webapps/docs/api/org/apache/tomcat/websocket/DigestAuthenticator.html webapps/docs/api/org/apache/tomcat/websocket/MessageHandlerResult.html webapps/docs/api/org/apache/tomcat/websocket/MessageHandlerResultType.html webapps/docs/api/org/apache/tomcat/websocket/PerMessageDeflate.html @@ -2206,6 +2263,8 @@ webapps/docs/funcspecs/fs-jndi-realm.htm webapps/docs/funcspecs/fs-memory-realm.html webapps/docs/funcspecs/index.html webapps/docs/funcspecs/mbean-names.html +webapps/docs/host-manager-howto.html +webapps/docs/html-host-manager-howto.html webapps/docs/html-manager-howto.html webapps/docs/images/ webapps/docs/images/add.gif @@ -2324,6 +2383,7 @@ webapps/docs/logging.html webapps/docs/manager-howto.html webapps/docs/maven-jars.html webapps/docs/mbeans-descriptors-howto.html +webapps/docs/mbeans-descriptors.dtd webapps/docs/monitoring.html webapps/docs/proxy-howto.html webapps/docs/realm-howto.html @@ -2571,6 +2631,8 @@ webapps/examples/WEB-INF/classes/async/A webapps/examples/WEB-INF/classes/async/Async2.java webapps/examples/WEB-INF/classes/async/Async3.class webapps/examples/WEB-INF/classes/async/Async3.java +webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.class +webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.java webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class @@ -2616,16 +2678,11 @@ webapps/examples/WEB-INF/classes/example webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java webapps/examples/WEB-INF/classes/examples/LogTag.class webapps/examples/WEB-INF/classes/examples/LogTag.java -webapps/examples/WEB-INF/classes/examples/ShowSource.class -webapps/examples/WEB-INF/classes/examples/ShowSource.java webapps/examples/WEB-INF/classes/examples/ValuesTag.class webapps/examples/WEB-INF/classes/examples/ValuesTag.java webapps/examples/WEB-INF/classes/filters/ webapps/examples/WEB-INF/classes/filters/ExampleFilter.class webapps/examples/WEB-INF/classes/filters/ExampleFilter.java -webapps/examples/WEB-INF/classes/http2/ -webapps/examples/WEB-INF/classes/http2/SimpleImagePush.class -webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java webapps/examples/WEB-INF/classes/jsp2/ webapps/examples/WEB-INF/classes/jsp2/examples/ webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class @@ -2941,8 +2998,6 @@ webapps/examples/jsp/snp/ webapps/examples/jsp/snp/snoop.html webapps/examples/jsp/snp/snoop.jsp webapps/examples/jsp/snp/snoop.jsp.html -webapps/examples/jsp/source.jsp -webapps/examples/jsp/source.jsp.html webapps/examples/jsp/tagplugin/ webapps/examples/jsp/tagplugin/choose.html webapps/examples/jsp/tagplugin/choose.jsp Index: v8/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/www/tomcat/v8/pkg/PLIST-main,v retrieving revision 1.12 diff -u -p -r1.12 PLIST-main --- v8/pkg/PLIST-main 4 Sep 2018 12:46:27 -0000 1.12 +++ v8/pkg/PLIST-main 30 Mar 2019 15:11:25 -0000 @@ -3,57 +3,58 @@ @newgroup _tomcat:526 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin @extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/* -share/doc/pkg-readmes/${PKGSTEM} -share/examples/tomcat/ +@rcscript ${RCDIR}/tomcat @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/ +@sample ${CONFDIR}/ @owner @group +share/doc/pkg-readmes/${PKGSTEM} +share/examples/tomcat/ share/examples/tomcat/catalina.policy @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.policy +@sample ${CONFDIR}/catalina.policy @owner @group share/examples/tomcat/catalina.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/catalina.properties +@sample ${CONFDIR}/catalina.properties @owner @group share/examples/tomcat/context.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/context.xml +@sample ${CONFDIR}/context.xml @owner @group share/examples/tomcat/host-manager.xml share/examples/tomcat/jaspic-providers.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/jaspic-providers.xml +@sample ${CONFDIR}/jaspic-providers.xml @owner @group share/examples/tomcat/jaspic-providers.xsd share/examples/tomcat/logging.properties @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/logging.properties +@sample ${CONFDIR}/logging.properties @owner @group share/examples/tomcat/manager.xml share/examples/tomcat/server.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/server.xml +@sample ${CONFDIR}/server.xml @owner @group share/examples/tomcat/tomcat-users.xml @mode 600 @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/tomcat-users.xml +@sample ${CONFDIR}/tomcat-users.xml @mode @owner @group @@ -61,22 +62,15 @@ share/examples/tomcat/tomcat-users.xsd share/examples/tomcat/web.xml @owner _tomcat @group _tomcat -@sample ${SYSCONFDIR}/tomcat/web.xml -@sample ${CATALINA_BASE}/ -@sample ${CATALINA_BASE}/logs/ -@sample ${CATALINA_BASE}/shared/ -@sample ${CATALINA_BASE}/shared/classes/ -@sample ${CATALINA_BASE}/shared/lib/ -@sample ${CATALINA_BASE}/temp/ -@sample ${CATALINA_BASE}/webapps/ -@sample ${CATALINA_BASE}/work/ -@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi -@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi +@sample ${CONFDIR}/web.xml @owner @group tomcat/ +tomcat/BUILDING.txt +tomcat/CONTRIBUTING.md tomcat/LICENSE tomcat/NOTICE +tomcat/README.md tomcat/RELEASE-NOTES tomcat/RUNNING.txt tomcat/bin/ @@ -115,6 +109,7 @@ tomcat/lib/tomcat-dbcp.jar tomcat/lib/tomcat-i18n-es.jar tomcat/lib/tomcat-i18n-fr.jar tomcat/lib/tomcat-i18n-ja.jar +tomcat/lib/tomcat-i18n-ru.jar tomcat/lib/tomcat-jdbc.jar tomcat/lib/tomcat-jni.jar tomcat/lib/tomcat-util-scan.jar @@ -151,7 +146,9 @@ tomcat/webapps/manager/WEB-INF/jsp/ tomcat/webapps/manager/WEB-INF/jsp/401.jsp tomcat/webapps/manager/WEB-INF/jsp/403.jsp tomcat/webapps/manager/WEB-INF/jsp/404.jsp +tomcat/webapps/manager/WEB-INF/jsp/connectorCerts.jsp tomcat/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp +tomcat/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp tomcat/webapps/manager/WEB-INF/web.xml @@ -168,4 +165,15 @@ tomcat/webapps/manager/images/void.gif tomcat/webapps/manager/index.jsp tomcat/webapps/manager/status.xsd tomcat/webapps/manager/xform.xsl -@rcscript ${RCDIR}/tomcat +@owner _tomcat +@group _tomcat +@sample ${CATALINA_BASE}/ +@sample ${CATALINA_BASE}/logs/ +@sample ${CATALINA_BASE}/shared/ +@sample ${CATALINA_BASE}/shared/classes/ +@sample ${CATALINA_BASE}/shared/lib/ +@sample ${CATALINA_BASE}/temp/ +@sample ${CATALINA_BASE}/webapps/ +@sample ${CATALINA_BASE}/work/ +@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi +@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi
