Tue Mar 26 20:56:23 2019 UTC ()
Update to 7.0.93

Changelog:
Update the packaged version of the Tomcat Native Library to 1.2.21
to pick up the latest Windows binaries built with APR 1.6.5 and
OpenSSL 1.1.1a and to pick up the memory leak fixes when using
NIO/NIO2 with OpenSSL.


(ryoon)
diff -r1.38 -r1.39 pkgsrc/www/apache-tomcat7/Makefile
diff -r1.21 -r1.22 pkgsrc/www/apache-tomcat7/PLIST
diff -r1.32 -r1.33 pkgsrc/www/apache-tomcat7/distinfo
cvs diff -r1.38 -r1.39 pkgsrc/www/apache-tomcat7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/Makefile 2019/01/22 14:46:49 1.38
+++ pkgsrc/www/apache-tomcat7/Makefile 2019/03/26 20:56:23 1.39
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.38 2019/01/22 14:46:49 ryoon Exp $ 1# $NetBSD: Makefile,v 1.39 2019/03/26 20:56:23 ryoon 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.92 24TOMCAT_VER= 7.0.93
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.21 -r1.22 pkgsrc/www/apache-tomcat7/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/PLIST 2019/01/22 14:46:49 1.21
+++ pkgsrc/www/apache-tomcat7/PLIST 2019/03/26 20:56:23 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2019/01/22 14:46:49 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.22 2019/03/26 20:56:23 ryoon 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/BUILDING.txt 13share/tomcat/BUILDING.txt
14share/tomcat/CONTRIBUTING.md 14share/tomcat/CONTRIBUTING.md
@@ -263,28 +263,26 @@ share/tomcat/webapps/examples/WEB-INF/cl @@ -263,28 +263,26 @@ share/tomcat/webapps/examples/WEB-INF/cl
263share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 263share/tomcat/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
264share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.class 264share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
265share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.java 265share/tomcat/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
266share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.class 266share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.class
267share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.java 267share/tomcat/webapps/examples/WEB-INF/classes/error/Smart.java
268share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class 268share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
269share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 269share/tomcat/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
270share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.class 270share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.class
271share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.java 271share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTag.java
272share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class 272share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
273share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java 273share/tomcat/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
274share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.class 274share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.class
275share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.java 275share/tomcat/webapps/examples/WEB-INF/classes/examples/LogTag.java
276share/tomcat/webapps/examples/WEB-INF/classes/examples/ShowSource.class 
277share/tomcat/webapps/examples/WEB-INF/classes/examples/ShowSource.java 
278share/tomcat/webapps/examples/WEB-INF/classes/examples/ValuesTag.class 276share/tomcat/webapps/examples/WEB-INF/classes/examples/ValuesTag.class
279share/tomcat/webapps/examples/WEB-INF/classes/examples/ValuesTag.java 277share/tomcat/webapps/examples/WEB-INF/classes/examples/ValuesTag.java
280share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class 278share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
281share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 279share/tomcat/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
282share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class 280share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
283share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java 281share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
284share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class 282share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
285share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java 283share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
286share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.class 284share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.class
287share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java 285share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java
288share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class 286share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
289share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java 287share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
290share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 288share/tomcat/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
@@ -546,28 +544,26 @@ share/tomcat/webapps/examples/jsp/securi @@ -546,28 +544,26 @@ share/tomcat/webapps/examples/jsp/securi
546share/tomcat/webapps/examples/jsp/security/protected/login.jsp 544share/tomcat/webapps/examples/jsp/security/protected/login.jsp
547share/tomcat/webapps/examples/jsp/security/protected/login.jsp.html 545share/tomcat/webapps/examples/jsp/security/protected/login.jsp.html
548share/tomcat/webapps/examples/jsp/sessions/DummyCart.html 546share/tomcat/webapps/examples/jsp/sessions/DummyCart.html
549share/tomcat/webapps/examples/jsp/sessions/carts.html 547share/tomcat/webapps/examples/jsp/sessions/carts.html
550share/tomcat/webapps/examples/jsp/sessions/carts.jsp 548share/tomcat/webapps/examples/jsp/sessions/carts.jsp
551share/tomcat/webapps/examples/jsp/sessions/carts.jsp.html 549share/tomcat/webapps/examples/jsp/sessions/carts.jsp.html
552share/tomcat/webapps/examples/jsp/sessions/crt.html 550share/tomcat/webapps/examples/jsp/sessions/crt.html
553share/tomcat/webapps/examples/jsp/simpletag/foo.html 551share/tomcat/webapps/examples/jsp/simpletag/foo.html
554share/tomcat/webapps/examples/jsp/simpletag/foo.jsp 552share/tomcat/webapps/examples/jsp/simpletag/foo.jsp
555share/tomcat/webapps/examples/jsp/simpletag/foo.jsp.html 553share/tomcat/webapps/examples/jsp/simpletag/foo.jsp.html
556share/tomcat/webapps/examples/jsp/snp/snoop.html 554share/tomcat/webapps/examples/jsp/snp/snoop.html
557share/tomcat/webapps/examples/jsp/snp/snoop.jsp 555share/tomcat/webapps/examples/jsp/snp/snoop.jsp
558share/tomcat/webapps/examples/jsp/snp/snoop.jsp.html 556share/tomcat/webapps/examples/jsp/snp/snoop.jsp.html
559share/tomcat/webapps/examples/jsp/source.jsp 
560share/tomcat/webapps/examples/jsp/source.jsp.html 
561share/tomcat/webapps/examples/jsp/tagplugin/choose.html 557share/tomcat/webapps/examples/jsp/tagplugin/choose.html
562share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp 558share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp
563share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp.html 559share/tomcat/webapps/examples/jsp/tagplugin/choose.jsp.html
564share/tomcat/webapps/examples/jsp/tagplugin/foreach.html 560share/tomcat/webapps/examples/jsp/tagplugin/foreach.html
565share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp 561share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp
566share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp.html 562share/tomcat/webapps/examples/jsp/tagplugin/foreach.jsp.html
567share/tomcat/webapps/examples/jsp/tagplugin/howto.html 563share/tomcat/webapps/examples/jsp/tagplugin/howto.html
568share/tomcat/webapps/examples/jsp/tagplugin/if.html 564share/tomcat/webapps/examples/jsp/tagplugin/if.html
569share/tomcat/webapps/examples/jsp/tagplugin/if.jsp 565share/tomcat/webapps/examples/jsp/tagplugin/if.jsp
570share/tomcat/webapps/examples/jsp/tagplugin/if.jsp.html 566share/tomcat/webapps/examples/jsp/tagplugin/if.jsp.html
571share/tomcat/webapps/examples/jsp/tagplugin/notes.html 567share/tomcat/webapps/examples/jsp/tagplugin/notes.html
572share/tomcat/webapps/examples/jsp/xml/xml.html 568share/tomcat/webapps/examples/jsp/xml/xml.html
573share/tomcat/webapps/examples/jsp/xml/xml.jsp 569share/tomcat/webapps/examples/jsp/xml/xml.jsp
cvs diff -r1.32 -r1.33 pkgsrc/www/apache-tomcat7/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/distinfo 2019/01/22 14:46:49 1.32
+++ pkgsrc/www/apache-tomcat7/distinfo 2019/03/26 20:56:23 1.33
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.32 2019/01/22 14:46:49 ryoon Exp $ 1$NetBSD: distinfo,v 1.33 2019/03/26 20:56:23 ryoon Exp $
2 2
3SHA1 (apache-tomcat-7.0.92.tar.gz) = 7433b661ed1c0744f7915b88c3ffabf230254dea 3SHA1 (apache-tomcat-7.0.93.tar.gz) = 5ed572783a3e06f4e9c5fa391004c4171935a4d4
4RMD160 (apache-tomcat-7.0.92.tar.gz) = e0636ab6ad9f32fecf76d79d69562a6282fcc83f 4RMD160 (apache-tomcat-7.0.93.tar.gz) = 2fa8b4b193c3ca89dab5b604bb02c206fb8a40fc
5SHA512 (apache-tomcat-7.0.92.tar.gz) = e5e17ea68956df5d4c220f2e2891953b362b4fadd391f7cb9bc00d86986aa2e2499176d59c393f41db9ab3e0d7f1ab492a881f85c6650514a7f02f047d4eb2b0 5SHA512 (apache-tomcat-7.0.93.tar.gz) = 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
6Size (apache-tomcat-7.0.92.tar.gz) = 9125027 bytes 6Size (apache-tomcat-7.0.93.tar.gz) = 9138957 bytes