Wed Jan 31 23:27:43 2018 UTC ()
Update to 7.0.84

Notable changes:
 - Use a loop to preload anonymous inner classes when running under a SecurityManager, to be safe for future changes in the code or using a different compiler. (kkolinko)
 -  Implement a small optimisation to how JAR URLs are processed to reduce the storage of duplicate String objects in memory. Patch provided by Dmitri Blinov. (markt)

Full changelog:
 https://tomcat.apache.org/tomcat-7.0-doc/changelog.html


(zafer)
diff -r1.34 -r1.35 pkgsrc/www/apache-tomcat7/Makefile
diff -r1.17 -r1.18 pkgsrc/www/apache-tomcat7/PLIST
diff -r1.28 -r1.29 pkgsrc/www/apache-tomcat7/distinfo
cvs diff -r1.34 -r1.35 pkgsrc/www/apache-tomcat7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/Makefile 2017/10/31 14:31:10 1.34
+++ pkgsrc/www/apache-tomcat7/Makefile 2018/01/31 23:27:43 1.35
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.34 2017/10/31 14:31:10 fhajny Exp $ 1# $NetBSD: Makefile,v 1.35 2018/01/31 23:27:43 zafer Exp $
2 2
3DISTNAME= apache-tomcat-${TOMCAT_VER} 3DISTNAME= apache-tomcat-${TOMCAT_VER}
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/} 5MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
6MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/ 6MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCAT_VER}/bin/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://tomcat.apache.org/ 9HOMEPAGE= http://tomcat.apache.org/
10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies 10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13CONFLICTS+= jakarta-tomcat55-[0-9]* 13CONFLICTS+= jakarta-tomcat55-[0-9]*
14CONFLICTS+= jakarta-tomcat-[0-9]* 14CONFLICTS+= jakarta-tomcat-[0-9]*
15 15
16NO_BUILD= yes 16NO_BUILD= yes
17USE_LANGUAGES= # none 17USE_LANGUAGES= # none
18USE_JAVA= run 18USE_JAVA= run
19USE_JAVA2= 6 19USE_JAVA2= 6
20USE_TOOLS+= pax 20USE_TOOLS+= pax
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24TOMCAT_VER= 7.0.82 24TOMCAT_VER= 7.0.84
25TOMCAT_HOME= ${PREFIX}/share/tomcat 25TOMCAT_HOME= ${PREFIX}/share/tomcat
26EGDIR= ${PREFIX}/share/examples/tomcat 26EGDIR= ${PREFIX}/share/examples/tomcat
27DOCDIR= ${PREFIX}/share/doc/tomcat 27DOCDIR= ${PREFIX}/share/doc/tomcat
28RCD_SCRIPTS= tomcat 28RCD_SCRIPTS= tomcat
29SMF_NAME= tomcat 29SMF_NAME= tomcat
30TOMCAT_USER?= tomcat 30TOMCAT_USER?= tomcat
31TOMCAT_GROUP?= tomcat 31TOMCAT_GROUP?= tomcat
32PKG_GROUPS= ${TOMCAT_GROUP} 32PKG_GROUPS= ${TOMCAT_GROUP}
33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP} 33PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
34PKG_GROUPS_VARS+= TOMCAT_GROUP 34PKG_GROUPS_VARS+= TOMCAT_GROUP
35PKG_USERS_VARS+= TOMCAT_USER 35PKG_USERS_VARS+= TOMCAT_USER
36PKG_HOME.tomcat= ${TOMCAT_HOME} 36PKG_HOME.tomcat= ${TOMCAT_HOME}
37PKG_SHELL.tomcat= ${SH} 37PKG_SHELL.tomcat= ${SH}
cvs diff -r1.17 -r1.18 pkgsrc/www/apache-tomcat7/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/PLIST 2017/04/10 10:32:47 1.17
+++ pkgsrc/www/apache-tomcat7/PLIST 2018/01/31 23:27:43 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2017/04/10 10:32:47 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.18 2018/01/31 23:27:43 zafer Exp $
2share/doc/tomcat/LICENSE 2share/doc/tomcat/LICENSE
3share/doc/tomcat/NOTICE 3share/doc/tomcat/NOTICE
4share/doc/tomcat/RELEASE-NOTES 4share/doc/tomcat/RELEASE-NOTES
5share/doc/tomcat/RUNNING.txt 5share/doc/tomcat/RUNNING.txt
6share/examples/tomcat/catalina.policy 6share/examples/tomcat/catalina.policy
7share/examples/tomcat/catalina.properties 7share/examples/tomcat/catalina.properties
8share/examples/tomcat/context.xml 8share/examples/tomcat/context.xml
9share/examples/tomcat/logging.properties 9share/examples/tomcat/logging.properties
10share/examples/tomcat/server.xml 10share/examples/tomcat/server.xml
11share/examples/tomcat/tomcat-users.xml 11share/examples/tomcat/tomcat-users.xml
12share/examples/tomcat/web.xml 12share/examples/tomcat/web.xml
13share/tomcat/bin/bootstrap.jar 13share/tomcat/bin/bootstrap.jar
14share/tomcat/bin/catalina-tasks.xml 14share/tomcat/bin/catalina-tasks.xml
@@ -161,26 +161,27 @@ share/tomcat/webapps/docs/images/tomcat. @@ -161,26 +161,27 @@ share/tomcat/webapps/docs/images/tomcat.
161share/tomcat/webapps/docs/images/update.gif 161share/tomcat/webapps/docs/images/update.gif
162share/tomcat/webapps/docs/images/void.gif 162share/tomcat/webapps/docs/images/void.gif
163share/tomcat/webapps/docs/index.html 163share/tomcat/webapps/docs/index.html
164share/tomcat/webapps/docs/introduction.html 164share/tomcat/webapps/docs/introduction.html
165share/tomcat/webapps/docs/jasper-howto.html 165share/tomcat/webapps/docs/jasper-howto.html
166share/tomcat/webapps/docs/jdbc-pool.html 166share/tomcat/webapps/docs/jdbc-pool.html
167share/tomcat/webapps/docs/jndi-datasource-examples-howto.html 167share/tomcat/webapps/docs/jndi-datasource-examples-howto.html
168share/tomcat/webapps/docs/jndi-resources-howto.html 168share/tomcat/webapps/docs/jndi-resources-howto.html
169share/tomcat/webapps/docs/jspapi/index.html 169share/tomcat/webapps/docs/jspapi/index.html
170share/tomcat/webapps/docs/logging.html 170share/tomcat/webapps/docs/logging.html
171share/tomcat/webapps/docs/manager-howto.html 171share/tomcat/webapps/docs/manager-howto.html
172share/tomcat/webapps/docs/maven-jars.html 172share/tomcat/webapps/docs/maven-jars.html
173share/tomcat/webapps/docs/mbeans-descriptors-howto.html 173share/tomcat/webapps/docs/mbeans-descriptors-howto.html
 174share/tomcat/webapps/docs/mbeans-descriptors.dtd
174share/tomcat/webapps/docs/monitoring.html 175share/tomcat/webapps/docs/monitoring.html
175share/tomcat/webapps/docs/proxy-howto.html 176share/tomcat/webapps/docs/proxy-howto.html
176share/tomcat/webapps/docs/realm-howto.html 177share/tomcat/webapps/docs/realm-howto.html
177share/tomcat/webapps/docs/security-howto.html 178share/tomcat/webapps/docs/security-howto.html
178share/tomcat/webapps/docs/security-manager-howto.html 179share/tomcat/webapps/docs/security-manager-howto.html
179share/tomcat/webapps/docs/servletapi/index.html 180share/tomcat/webapps/docs/servletapi/index.html
180share/tomcat/webapps/docs/setup.html 181share/tomcat/webapps/docs/setup.html
181share/tomcat/webapps/docs/ssi-howto.html 182share/tomcat/webapps/docs/ssi-howto.html
182share/tomcat/webapps/docs/ssl-howto.html 183share/tomcat/webapps/docs/ssl-howto.html
183share/tomcat/webapps/docs/tribes/developers.html 184share/tomcat/webapps/docs/tribes/developers.html
184share/tomcat/webapps/docs/tribes/faq.html 185share/tomcat/webapps/docs/tribes/faq.html
185share/tomcat/webapps/docs/tribes/interceptors.html 186share/tomcat/webapps/docs/tribes/interceptors.html
186share/tomcat/webapps/docs/tribes/introduction.html 187share/tomcat/webapps/docs/tribes/introduction.html
@@ -213,26 +214,28 @@ share/tomcat/webapps/examples/WEB-INF/cl @@ -213,26 +214,28 @@ share/tomcat/webapps/examples/WEB-INF/cl
213share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.class 214share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.class
214share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.java 215share/tomcat/webapps/examples/WEB-INF/classes/SessionExample.java
215share/tomcat/webapps/examples/WEB-INF/classes/async/Async0$1.class 216share/tomcat/webapps/examples/WEB-INF/classes/async/Async0$1.class
216share/tomcat/webapps/examples/WEB-INF/classes/async/Async0.class 217share/tomcat/webapps/examples/WEB-INF/classes/async/Async0.class
217share/tomcat/webapps/examples/WEB-INF/classes/async/Async0.java 218share/tomcat/webapps/examples/WEB-INF/classes/async/Async0.java
218share/tomcat/webapps/examples/WEB-INF/classes/async/Async1$1.class 219share/tomcat/webapps/examples/WEB-INF/classes/async/Async1$1.class
219share/tomcat/webapps/examples/WEB-INF/classes/async/Async1.class 220share/tomcat/webapps/examples/WEB-INF/classes/async/Async1.class
220share/tomcat/webapps/examples/WEB-INF/classes/async/Async1.java 221share/tomcat/webapps/examples/WEB-INF/classes/async/Async1.java
221share/tomcat/webapps/examples/WEB-INF/classes/async/Async2$1.class 222share/tomcat/webapps/examples/WEB-INF/classes/async/Async2$1.class
222share/tomcat/webapps/examples/WEB-INF/classes/async/Async2.class 223share/tomcat/webapps/examples/WEB-INF/classes/async/Async2.class
223share/tomcat/webapps/examples/WEB-INF/classes/async/Async2.java 224share/tomcat/webapps/examples/WEB-INF/classes/async/Async2.java
224share/tomcat/webapps/examples/WEB-INF/classes/async/Async3.class 225share/tomcat/webapps/examples/WEB-INF/classes/async/Async3.class
225share/tomcat/webapps/examples/WEB-INF/classes/async/Async3.java 226share/tomcat/webapps/examples/WEB-INF/classes/async/Async3.java
 227share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.class
 228share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockContextListener.java
226share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class 229share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.class
227share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java 230share/tomcat/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
228share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class 231share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker$Stock.class
229share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker$TickListener.class 232share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker$TickListener.class
230share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker.class 233share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker.class
231share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker.java 234share/tomcat/webapps/examples/WEB-INF/classes/async/Stockticker.java
232share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.class 235share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.class
233share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.java 236share/tomcat/webapps/examples/WEB-INF/classes/cal/Entries.java
234share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.class 237share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.class
235share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.java 238share/tomcat/webapps/examples/WEB-INF/classes/cal/Entry.java
236share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.class 239share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
237share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.java 240share/tomcat/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
238share/tomcat/webapps/examples/WEB-INF/classes/cal/TableBean.class 241share/tomcat/webapps/examples/WEB-INF/classes/cal/TableBean.class
cvs diff -r1.28 -r1.29 pkgsrc/www/apache-tomcat7/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/distinfo 2017/10/31 14:31:10 1.28
+++ pkgsrc/www/apache-tomcat7/distinfo 2018/01/31 23:27:43 1.29
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.28 2017/10/31 14:31:10 fhajny Exp $ 1$NetBSD: distinfo,v 1.29 2018/01/31 23:27:43 zafer Exp $
2 2
3SHA1 (apache-tomcat-7.0.82.tar.gz) = 4681bfbc86bb4da76a7aabbb3c545475eb9a8075 3SHA1 (apache-tomcat-7.0.84.tar.gz) = e2940f45dde581741e2639e831d08498b6bb9d3a
4RMD160 (apache-tomcat-7.0.82.tar.gz) = 1496ceb71e3a1eadaa772cd56176066513709e8b 4RMD160 (apache-tomcat-7.0.84.tar.gz) = c2b8fd488c5af9fc7cabad4f64e9b1f748e28a00
5SHA512 (apache-tomcat-7.0.82.tar.gz) = 15291c1f228ac0445729f023b69f4b0e2ffca5ff0c4e4719067e5a9ef3d508e2666dd9af7e9e32dbaa7e27a893868646988241a322a60cd7cab35ee8c6f045de 5SHA512 (apache-tomcat-7.0.84.tar.gz) = 8885117f1748322da56fa10eb9f5519bd4beb7b3b85ad1d6907224bef6adaf1f155ee981a8aa6b35516450b9d40cda5bad06fb825e19904afe3aef057aa13878
6Size (apache-tomcat-7.0.82.tar.gz) = 8997403 bytes 6Size (apache-tomcat-7.0.84.tar.gz) = 9032792 bytes