diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile index 34a192a3200..bcdea7e75c7 100644 --- a/www/tomcat/v6/Makefile +++ b/www/tomcat/v6/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2017/04/21 13:27:47 kurt Exp $ +# $OpenBSD: Makefile,v 1.39 2017/07/10 16:52:03 dcoppa Exp $ COMMENT-main = Java servlet 2.5 and Java server pages 2.1 server MAJ_VER = 6 MIN_VER = 0 -MICRO_VER = 51 -REVISION-main = 0 +MICRO_VER = 53 RUN_DEPENDS-examples =www/tomcat/v${MAJ_VER},-main>=${MAJ_VER},<7 diff --git a/www/tomcat/v6/distinfo b/www/tomcat/v6/distinfo index c04922e6166..e954d334faf 100644 --- a/www/tomcat/v6/distinfo +++ b/www/tomcat/v6/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-6.0.51-fulldocs.tar.gz) = 5V5w0X8KZIwmivuDeH8PhxSqvzgAwitMgVd3SgijfUQ= -SHA256 (apache-tomcat-6.0.51.tar.gz) = j+iGIroJkRCl9rhYVq8mKlX3njFwBSX+DS6WFDOzprk= -SIZE (apache-tomcat-6.0.51-fulldocs.tar.gz) = 3712355 -SIZE (apache-tomcat-6.0.51.tar.gz) = 7105938 +SHA256 (apache-tomcat-6.0.53-fulldocs.tar.gz) = NGXbQPi28EjgczREZo5KQOmBSFXlESdi87sU5F65cko= +SHA256 (apache-tomcat-6.0.53.tar.gz) = NSSaS0D0H7X2AvVgIULVn6qpbcFWffgH0QjU0rlC4vA= +SIZE (apache-tomcat-6.0.53-fulldocs.tar.gz) = 3713297 +SIZE (apache-tomcat-6.0.53.tar.gz) = 7110610 diff --git a/www/tomcat/v6/pkg/PLIST-examples b/www/tomcat/v6/pkg/PLIST-examples index 40e47d8f15c..3ae576a071f 100644 --- a/www/tomcat/v6/pkg/PLIST-examples +++ b/www/tomcat/v6/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.17 2017/03/23 18:35:30 dcoppa Exp $ +@comment $OpenBSD: PLIST-examples,v 1.18 2017/07/10 16:52:03 dcoppa Exp $ @option is-branch @owner _tomcat @group _tomcat @@ -1490,6 +1490,7 @@ webapps/docs/api/org/apache/tomcat/util/net/SSLSupport.CipherData.html webapps/docs/api/org/apache/tomcat/util/net/SSLSupport.html webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.ApplicationBufferHandler.html webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.html +webapps/docs/api/org/apache/tomcat/util/net/SendfileKeepAliveState.html webapps/docs/api/org/apache/tomcat/util/net/SendfileState.html webapps/docs/api/org/apache/tomcat/util/net/ServerSocketFactory.html webapps/docs/api/org/apache/tomcat/util/net/SocketProperties.html diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile index 7896bda10aa..a0256ff1c5d 100644 --- a/www/tomcat/v7/Makefile +++ b/www/tomcat/v7/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.49 2017/04/21 13:27:47 kurt Exp $ +# $OpenBSD: Makefile,v 1.50 2017/07/10 16:52:03 dcoppa Exp $ COMMENT-main = Java servlet 3.0 and Java server pages 2.2 server MAJ_VER = 7 MIN_VER = 0 -MICRO_VER = 76 -REVISION-main = 0 +MICRO_VER = 79 .include diff --git a/www/tomcat/v7/distinfo b/www/tomcat/v7/distinfo index 25b6d3864ef..624b6741eb8 100644 --- a/www/tomcat/v7/distinfo +++ b/www/tomcat/v7/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-7.0.76-fulldocs.tar.gz) = /DXsHtDrF9qcxAD5eCE8OLEoPI0E3zIRDlxB62ZLeU8= -SHA256 (apache-tomcat-7.0.76.tar.gz) = Y8y7CtNwd6AeH80rfP1I2UAHdZGU3LzS++EN7oW8Rr4= -SIZE (apache-tomcat-7.0.76-fulldocs.tar.gz) = 5486077 -SIZE (apache-tomcat-7.0.76.tar.gz) = 8957288 +SHA256 (apache-tomcat-7.0.79-fulldocs.tar.gz) = 17E0UFg+GZZUuwE4orO4sawXSMpWqaZ8K5PTdiPLB9c= +SHA256 (apache-tomcat-7.0.79.tar.gz) = bNkaMN6T2qZdNcdDDLLGlRBw6cofBDtNkbUcjOTTUcM= +SIZE (apache-tomcat-7.0.79-fulldocs.tar.gz) = 5501805 +SIZE (apache-tomcat-7.0.79.tar.gz) = 8975395 diff --git a/www/tomcat/v7/pkg/PLIST-examples b/www/tomcat/v7/pkg/PLIST-examples index 8f02cb9e67e..92b4c3f6254 100644 --- a/www/tomcat/v7/pkg/PLIST-examples +++ b/www/tomcat/v7/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.37 2017/03/23 18:35:30 dcoppa Exp $ +@comment $OpenBSD: PLIST-examples,v 1.38 2017/07/10 16:52:03 dcoppa Exp $ @option is-branch @owner _tomcat @group _tomcat @@ -454,6 +454,7 @@ webapps/docs/api/org/apache/catalina/realm/package-summary.html webapps/docs/api/org/apache/catalina/realm/package-tree.html webapps/docs/api/org/apache/catalina/security/ webapps/docs/api/org/apache/catalina/security/Constants.html +webapps/docs/api/org/apache/catalina/security/DeployXmlPermission.html webapps/docs/api/org/apache/catalina/security/SecurityClassLoad.html webapps/docs/api/org/apache/catalina/security/SecurityConfig.html webapps/docs/api/org/apache/catalina/security/SecurityListener.html @@ -1355,6 +1356,8 @@ 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/ProxyConnection.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.StatementProxy.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.html webapps/docs/api/org/apache/tomcat/jdbc/pool/TrapException.html webapps/docs/api/org/apache/tomcat/jdbc/pool/Validator.html webapps/docs/api/org/apache/tomcat/jdbc/pool/XADataSource.html @@ -1743,6 +1746,7 @@ webapps/docs/api/org/apache/tomcat/util/net/SSLSupport.html webapps/docs/api/org/apache/tomcat/util/net/SSLUtil.html webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.ApplicationBufferHandler.html webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.html +webapps/docs/api/org/apache/tomcat/util/net/SendfileKeepAliveState.html webapps/docs/api/org/apache/tomcat/util/net/SendfileState.html webapps/docs/api/org/apache/tomcat/util/net/ServerSocketFactory.html webapps/docs/api/org/apache/tomcat/util/net/SocketProperties.html diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile index a9dda19ea72..05e2ac48a94 100644 --- a/www/tomcat/v8/Makefile +++ b/www/tomcat/v8/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.26 2017/04/21 13:27:47 kurt Exp $ +# $OpenBSD: Makefile,v 1.27 2017/07/10 16:52:03 dcoppa Exp $ COMMENT-main = Java servlet 3.1 and Java server pages 2.3 server MAJ_VER = 8 MIN_VER = 5 -MICRO_VER = 12 -REVISION-main = 0 +MICRO_VER = 16 .include diff --git a/www/tomcat/v8/distinfo b/www/tomcat/v8/distinfo index 0142b7d3fde..ce448eceb02 100644 --- a/www/tomcat/v8/distinfo +++ b/www/tomcat/v8/distinfo @@ -1,4 +1,4 @@ -SHA256 (apache-tomcat-8.5.12-fulldocs.tar.gz) = eitFd8Ljh6AA8pG2o4KRqExUflKfPs1VMUragSv+sr4= -SHA256 (apache-tomcat-8.5.12.tar.gz) = bSytG1ldDMgIP5u7tzw1nWESScfq8oPEDLSuTKnEZEo= -SIZE (apache-tomcat-8.5.12-fulldocs.tar.gz) = 5750182 -SIZE (apache-tomcat-8.5.12.tar.gz) = 9353658 +SHA256 (apache-tomcat-8.5.16-fulldocs.tar.gz) = iftIFjWDSveryc/v1ntTDx8xVMO8KoIM7rgOLpwNkcA= +SHA256 (apache-tomcat-8.5.16.tar.gz) = k5+3yfrjKY3QzLRyS5yUPFJOivKHUxyPO77AcH5XgPE= +SIZE (apache-tomcat-8.5.16-fulldocs.tar.gz) = 5809408 +SIZE (apache-tomcat-8.5.16.tar.gz) = 9417469 diff --git a/www/tomcat/v8/pkg/PLIST-examples b/www/tomcat/v8/pkg/PLIST-examples index 58db67078ef..d7801912e8a 100644 --- a/www/tomcat/v8/pkg/PLIST-examples +++ b/www/tomcat/v8/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.24 2017/03/23 18:35:30 dcoppa Exp $ +@comment $OpenBSD: PLIST-examples,v 1.25 2017/07/10 16:52:03 dcoppa Exp $ @option is-branch @owner _tomcat @group _tomcat @@ -182,6 +182,7 @@ webapps/docs/api/org/apache/catalina/core/ webapps/docs/api/org/apache/catalina/core/AccessLogAdapter.html webapps/docs/api/org/apache/catalina/core/ApplicationContext.html webapps/docs/api/org/apache/catalina/core/ApplicationContextFacade.html +webapps/docs/api/org/apache/catalina/core/ApplicationFilterChain.html webapps/docs/api/org/apache/catalina/core/ApplicationFilterConfig.html webapps/docs/api/org/apache/catalina/core/ApplicationFilterFactory.html webapps/docs/api/org/apache/catalina/core/ApplicationFilterRegistration.html @@ -434,6 +435,7 @@ webapps/docs/api/org/apache/catalina/realm/package-summary.html webapps/docs/api/org/apache/catalina/realm/package-tree.html webapps/docs/api/org/apache/catalina/security/ webapps/docs/api/org/apache/catalina/security/Constants.html +webapps/docs/api/org/apache/catalina/security/DeployXmlPermission.html webapps/docs/api/org/apache/catalina/security/SecurityClassLoad.html webapps/docs/api/org/apache/catalina/security/SecurityConfig.html webapps/docs/api/org/apache/catalina/security/SecurityListener.html @@ -613,6 +615,7 @@ webapps/docs/api/org/apache/catalina/tribes/ChannelReceiver.html webapps/docs/api/org/apache/catalina/tribes/ChannelSender.html webapps/docs/api/org/apache/catalina/tribes/ErrorHandler.html webapps/docs/api/org/apache/catalina/tribes/Heartbeat.html +webapps/docs/api/org/apache/catalina/tribes/JmxChannel.html webapps/docs/api/org/apache/catalina/tribes/ManagedChannel.html webapps/docs/api/org/apache/catalina/tribes/Member.html webapps/docs/api/org/apache/catalina/tribes/MembershipListener.html @@ -629,6 +632,7 @@ webapps/docs/api/org/apache/catalina/tribes/group/ExtendedRpcCallback.html webapps/docs/api/org/apache/catalina/tribes/group/GroupChannel.HeartbeatThread.html webapps/docs/api/org/apache/catalina/tribes/group/GroupChannel.InterceptorIterator.html webapps/docs/api/org/apache/catalina/tribes/group/GroupChannel.html +webapps/docs/api/org/apache/catalina/tribes/group/GroupChannelMBean.html webapps/docs/api/org/apache/catalina/tribes/group/InterceptorPayload.html webapps/docs/api/org/apache/catalina/tribes/group/Response.html webapps/docs/api/org/apache/catalina/tribes/group/RpcCallback.html @@ -639,11 +643,13 @@ webapps/docs/api/org/apache/catalina/tribes/group/RpcMessage.NoRpcChannelReply.h webapps/docs/api/org/apache/catalina/tribes/group/RpcMessage.html 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/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/GzipInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.CoordinationEvent.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.CoordinationMessage.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.html @@ -652,10 +658,14 @@ webapps/docs/api/org/apache/catalina/tribes/group/interceptors/OrderInterceptor. webapps/docs/api/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.PingThread.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.html +webapps/docs/api/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptorMBean.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.MapEntry.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.html webapps/docs/api/org/apache/catalina/tribes/group/interceptors/package-frame.html @@ -676,6 +686,11 @@ webapps/docs/api/org/apache/catalina/tribes/io/XByteBuffer.html webapps/docs/api/org/apache/catalina/tribes/io/package-frame.html webapps/docs/api/org/apache/catalina/tribes/io/package-summary.html webapps/docs/api/org/apache/catalina/tribes/io/package-tree.html +webapps/docs/api/org/apache/catalina/tribes/jmx/ +webapps/docs/api/org/apache/catalina/tribes/jmx/JmxRegistry.html +webapps/docs/api/org/apache/catalina/tribes/jmx/package-frame.html +webapps/docs/api/org/apache/catalina/tribes/jmx/package-summary.html +webapps/docs/api/org/apache/catalina/tribes/jmx/package-tree.html webapps/docs/api/org/apache/catalina/tribes/membership/ webapps/docs/api/org/apache/catalina/tribes/membership/Constants.html webapps/docs/api/org/apache/catalina/tribes/membership/McastService.html @@ -683,6 +698,7 @@ webapps/docs/api/org/apache/catalina/tribes/membership/McastServiceImpl.Receiver webapps/docs/api/org/apache/catalina/tribes/membership/McastServiceImpl.RecoveryThread.html webapps/docs/api/org/apache/catalina/tribes/membership/McastServiceImpl.SenderThread.html webapps/docs/api/org/apache/catalina/tribes/membership/McastServiceImpl.html +webapps/docs/api/org/apache/catalina/tribes/membership/McastServiceMBean.html webapps/docs/api/org/apache/catalina/tribes/membership/MemberImpl.html webapps/docs/api/org/apache/catalina/tribes/membership/Membership.MbrEntry.html webapps/docs/api/org/apache/catalina/tribes/membership/Membership.html @@ -727,10 +743,12 @@ webapps/docs/api/org/apache/catalina/tribes/transport/bio/package-summary.html webapps/docs/api/org/apache/catalina/tribes/transport/bio/package-tree.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/ webapps/docs/api/org/apache/catalina/tribes/transport/nio/NioReceiver.html +webapps/docs/api/org/apache/catalina/tribes/transport/nio/NioReceiverMBean.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/NioReplicationTask.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/NioSender.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/ParallelNioSender.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/PooledParallelSender.html +webapps/docs/api/org/apache/catalina/tribes/transport/nio/PooledParallelSenderMBean.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/package-frame.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/package-summary.html webapps/docs/api/org/apache/catalina/tribes/transport/nio/package-tree.html @@ -1423,6 +1441,8 @@ 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/ProxyConnection.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.StatementProxy.html +webapps/docs/api/org/apache/tomcat/jdbc/pool/StatementFacade.html webapps/docs/api/org/apache/tomcat/jdbc/pool/TrapException.html webapps/docs/api/org/apache/tomcat/jdbc/pool/Validator.html webapps/docs/api/org/apache/tomcat/jdbc/pool/XADataSource.html @@ -1549,6 +1569,8 @@ webapps/docs/api/org/apache/tomcat/util/buf/Constants.html webapps/docs/api/org/apache/tomcat/util/buf/HexUtils.html webapps/docs/api/org/apache/tomcat/util/buf/MessageBytes.html webapps/docs/api/org/apache/tomcat/util/buf/StringCache.html +webapps/docs/api/org/apache/tomcat/util/buf/StringUtils.Function.html +webapps/docs/api/org/apache/tomcat/util/buf/StringUtils.html webapps/docs/api/org/apache/tomcat/util/buf/UDecoder.html webapps/docs/api/org/apache/tomcat/util/buf/UEncoder.SafeCharsSet.html webapps/docs/api/org/apache/tomcat/util/buf/UEncoder.html @@ -1665,6 +1687,7 @@ webapps/docs/api/org/apache/tomcat/util/digester/ArrayStack.html webapps/docs/api/org/apache/tomcat/util/digester/CallMethodRule.html webapps/docs/api/org/apache/tomcat/util/digester/CallParamRule.html webapps/docs/api/org/apache/tomcat/util/digester/Digester.html +webapps/docs/api/org/apache/tomcat/util/digester/DocumentProperties.Charset.html webapps/docs/api/org/apache/tomcat/util/digester/DocumentProperties.Encoding.html webapps/docs/api/org/apache/tomcat/util/digester/DocumentProperties.html webapps/docs/api/org/apache/tomcat/util/digester/FactoryCreateRule.html @@ -1690,6 +1713,7 @@ webapps/docs/api/org/apache/tomcat/util/http/ webapps/docs/api/org/apache/tomcat/util/http/CookieProcessor.html webapps/docs/api/org/apache/tomcat/util/http/CookieProcessorBase.html webapps/docs/api/org/apache/tomcat/util/http/FastHttpDateFormat.html +webapps/docs/api/org/apache/tomcat/util/http/HttpMessages.html webapps/docs/api/org/apache/tomcat/util/http/LegacyCookieProcessor.html webapps/docs/api/org/apache/tomcat/util/http/MimeHeaders.html webapps/docs/api/org/apache/tomcat/util/http/Parameters.FailReason.html @@ -1857,6 +1881,7 @@ webapps/docs/api/org/apache/tomcat/util/net/SSLUtilBase.html webapps/docs/api/org/apache/tomcat/util/net/SecureNio2Channel.html webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.html webapps/docs/api/org/apache/tomcat/util/net/SendfileDataBase.html +webapps/docs/api/org/apache/tomcat/util/net/SendfileKeepAliveState.html webapps/docs/api/org/apache/tomcat/util/net/SendfileState.html webapps/docs/api/org/apache/tomcat/util/net/SocketBufferHandler.html webapps/docs/api/org/apache/tomcat/util/net/SocketEvent.html @@ -1962,6 +1987,7 @@ webapps/docs/api/org/apache/tomcat/websocket/WrappedMessageHandler.html webapps/docs/api/org/apache/tomcat/websocket/WsContainerProvider.html webapps/docs/api/org/apache/tomcat/websocket/WsExtension.html webapps/docs/api/org/apache/tomcat/websocket/WsExtensionParameter.html +webapps/docs/api/org/apache/tomcat/websocket/WsFrameBase.ReadState.html webapps/docs/api/org/apache/tomcat/websocket/WsFrameBase.html webapps/docs/api/org/apache/tomcat/websocket/WsFrameClient.html webapps/docs/api/org/apache/tomcat/websocket/WsHandshakeResponse.html diff --git a/www/tomcat/v8/pkg/PLIST-main b/www/tomcat/v8/pkg/PLIST-main index c33a0ec0d64..9e7678eceb1 100644 --- a/www/tomcat/v8/pkg/PLIST-main +++ b/www/tomcat/v8/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.10 2017/03/23 18:35:30 dcoppa Exp $ +@comment $OpenBSD: PLIST-main,v 1.11 2017/07/10 16:52:03 dcoppa Exp $ @option is-branch @newgroup _tomcat:526 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin @@ -102,7 +102,7 @@ tomcat/lib/catalina-ha.jar tomcat/lib/catalina-storeconfig.jar tomcat/lib/catalina-tribes.jar tomcat/lib/catalina.jar -tomcat/lib/ecj-4.6.1.jar +tomcat/lib/ecj-4.6.3.jar tomcat/lib/el-api.jar tomcat/lib/jasper-el.jar tomcat/lib/jasper.jar