Date: Sun, 26 Jun 2016 18:14:13 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r417597 - in branches/2016Q2/www: tomcat-native tomcat7 tomcat8 Message-ID: <201606261814.u5QIEDMF000455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: junovitch Date: Sun Jun 26 18:14:13 2016 New Revision: 417597 URL: https://svnweb.freebsd.org/changeset/ports/417597 Log: MFH: r417360 - Update tomcat-native to 1.2.7 release. - Update tomcat7 to 7.0.70 release. - Update tomcat8 to 8.0.36 release. PR: 209669 Submitted by: geoffroy desvernay <dgeo@centrale-marseille.fr> Approved by: ports-secteam (with hat) Security: CVE-2016-3092 Security: https://vuxml.FreeBSD.org/freebsd/cbceeb49-3bc7-11e6-8e82-002590263bf5.html Modified: branches/2016Q2/www/tomcat-native/Makefile branches/2016Q2/www/tomcat-native/distinfo branches/2016Q2/www/tomcat7/Makefile branches/2016Q2/www/tomcat7/distinfo branches/2016Q2/www/tomcat7/pkg-plist branches/2016Q2/www/tomcat8/Makefile branches/2016Q2/www/tomcat8/distinfo branches/2016Q2/www/tomcat8/pkg-plist Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/www/tomcat-native/Makefile ============================================================================== --- branches/2016Q2/www/tomcat-native/Makefile Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat-native/Makefile Sun Jun 26 18:14:13 2016 (r417597) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat-native -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.7 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/native USES= libtool USE_OPENSSL= yes +WITH_OPENSSL_PORT= yes USE_JAVA= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ @@ -29,12 +30,9 @@ CONFIGURE_ARGS= --with-apr=${LOCALBASE} PLIST_FILES= lib/libtcnative-1.a \ lib/libtcnative-1.so \ lib/libtcnative-1.so.0 \ - lib/libtcnative-1.so.0.2.2 - -.include <bsd.port.options.mk> + lib/libtcnative-1.so.0.2.7 -.if ${OSVERSION} < 1000028 -WITH_OPENSSL_PORT= yes -.endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.7 .include <bsd.port.mk> Modified: branches/2016Q2/www/tomcat-native/distinfo ============================================================================== --- branches/2016Q2/www/tomcat-native/distinfo Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat-native/distinfo Sun Jun 26 18:14:13 2016 (r417597) @@ -1,2 +1,3 @@ -SHA256 (tomcat-native-1.2.2-src.tar.gz) = 9bd4deb1a816efda8208bfb4f55ee1689571e1d05a5c1e84faf2ad1021a9cae6 -SIZE (tomcat-native-1.2.2-src.tar.gz) = 400183 +TIMESTAMP = 1466667598 +SHA256 (tomcat-native-1.2.7-src.tar.gz) = 19e87bc6ea7f763bf9e6515f8c31d8e9bb3e0c1132b36769cdf32c6702723d25 +SIZE (tomcat-native-1.2.7-src.tar.gz) = 390573 Modified: branches/2016Q2/www/tomcat7/Makefile ============================================================================== --- branches/2016Q2/www/tomcat7/Makefile Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat7/Makefile Sun Jun 26 18:14:13 2016 (r417597) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 7.0.68 +PORTVERSION= 7.0.70 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-7/v${PORTVERSION}/bin PKGNAMESUFFIX= 7 Modified: branches/2016Q2/www/tomcat7/distinfo ============================================================================== --- branches/2016Q2/www/tomcat7/distinfo Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat7/distinfo Sun Jun 26 18:14:13 2016 (r417597) @@ -1,2 +1,3 @@ -SHA256 (apache-tomcat-7.0.68.tar.gz) = 2c1a02422f265607de733521e54f18613e9dd5efc2861914fe45a858227bb8e0 -SIZE (apache-tomcat-7.0.68.tar.gz) = 8900822 +TIMESTAMP = 1466667531 +SHA256 (apache-tomcat-7.0.70.tar.gz) = 13f33616a3352e4fce548e042adfdd824353d0b48a42e1606daace7916868c74 +SIZE (apache-tomcat-7.0.70.tar.gz) = 8924465 Modified: branches/2016Q2/www/tomcat7/pkg-plist ============================================================================== --- branches/2016Q2/www/tomcat7/pkg-plist Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat7/pkg-plist Sun Jun 26 18:14:13 2016 (r417597) @@ -341,7 +341,8 @@ %%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.class %%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java %%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$1.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandler.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerBinary.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandlerText.class %%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.class %%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Direction.class @@ -626,5 +627,5 @@ @dir %%T%%/endorsed @dir %%T%%/logs @dir %%T%%/work -@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work -@unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually +@postexec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work +@postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually Modified: branches/2016Q2/www/tomcat8/Makefile ============================================================================== --- branches/2016Q2/www/tomcat8/Makefile Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat8/Makefile Sun Jun 26 18:14:13 2016 (r417597) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.0.30 +PORTVERSION= 8.0.36 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin PKGNAMESUFFIX= 8 Modified: branches/2016Q2/www/tomcat8/distinfo ============================================================================== --- branches/2016Q2/www/tomcat8/distinfo Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat8/distinfo Sun Jun 26 18:14:13 2016 (r417597) @@ -1,2 +1,3 @@ -SHA256 (apache-tomcat-8.0.30.tar.gz) = 2fc3dde305e08388a12bd2868063ab6829a1d70acd9affe3a8707bd9679e0059 -SIZE (apache-tomcat-8.0.30.tar.gz) = 9150593 +TIMESTAMP = 1466677342 +SHA256 (apache-tomcat-8.0.36.tar.gz) = 7963464d86faf8416b92fb2b04c70da9759c7c332e1700c1e9f581883b4db664 +SIZE (apache-tomcat-8.0.36.tar.gz) = 9277365 Modified: branches/2016Q2/www/tomcat8/pkg-plist ============================================================================== --- branches/2016Q2/www/tomcat8/pkg-plist Sun Jun 26 18:13:40 2016 (r417596) +++ branches/2016Q2/www/tomcat8/pkg-plist Sun Jun 26 18:14:13 2016 (r417597) @@ -37,7 +37,7 @@ %%T%%/lib/catalina-storeconfig.jar %%T%%/lib/catalina-tribes.jar %%T%%/lib/catalina.jar -%%T%%/lib/ecj-4.4.2.jar +%%T%%/lib/ecj-4.5.jar %%T%%/lib/el-api.jar %%T%%/lib/jasper-el.jar %%T%%/lib/jasper.jar @@ -645,4 +645,4 @@ @dir %%T%%/work @owner @group -@unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually +@postunexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606261814.u5QIEDMF000455>