Mon Jul 8 14:26:15 2013 UTC ()
Updte to 7.0.42

Changelog:
    Add support for time to first byte in the AccessLogValve. Patch provided by Jeremy Boynes.
    Correct a regression introduced in 7.0.39 (refactoring of base 64 encoding and decoding) that broke the JNDI Realm when userPassword was set and passwords were hashed with MD5 or SHA1.
    Ensure that the build process produces Javadoc that is not vulnerable to CVE-2013-1571. Based on a patch by Uwe Schindler.


(ryoon)
diff -r1.13 -r1.14 pkgsrc/www/apache-tomcat7/Makefile
diff -r1.9 -r1.10 pkgsrc/www/apache-tomcat7/distinfo
cvs diff -r1.13 -r1.14 pkgsrc/www/apache-tomcat7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/Makefile 2013/06/17 15:07:54 1.13
+++ pkgsrc/www/apache-tomcat7/Makefile 2013/07/08 14:26:15 1.14
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.13 2013/06/17 15:07:54 ryoon Exp $ 1# $NetBSD: Makefile,v 1.14 2013/07/08 14:26:15 ryoon Exp $
2# 2#
3 3
4DISTNAME= apache-tomcat-${TOMCAT_VER} 4DISTNAME= apache-tomcat-${TOMCAT_VER}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/} 6MASTER_SITES= ${MASTER_SITE_APACHE:=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
22PKG_DESTDIR_SUPPORT= destdir 22PKG_DESTDIR_SUPPORT= destdir
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26TOMCAT_VER= 7.0.41 26TOMCAT_VER= 7.0.42
27TOMCAT_HOME= ${PREFIX}/share/tomcat 27TOMCAT_HOME= ${PREFIX}/share/tomcat
28EGDIR= ${PREFIX}/share/examples/tomcat 28EGDIR= ${PREFIX}/share/examples/tomcat
29DOCDIR= ${PREFIX}/share/doc/tomcat 29DOCDIR= ${PREFIX}/share/doc/tomcat
30RCD_SCRIPTS= tomcat 30RCD_SCRIPTS= tomcat
31TOMCAT_USER?= tomcat 31TOMCAT_USER?= tomcat
32TOMCAT_GROUP?= tomcat 32TOMCAT_GROUP?= tomcat
33PKG_GROUPS= ${TOMCAT_GROUP} 33PKG_GROUPS= ${TOMCAT_GROUP}
34PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP} 34PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
35PKG_GROUPS_VARS+= TOMCAT_GROUP 35PKG_GROUPS_VARS+= TOMCAT_GROUP
36PKG_USERS_VARS+= TOMCAT_USER 36PKG_USERS_VARS+= TOMCAT_USER
37PKG_HOME.tomcat= ${TOMCAT_HOME} 37PKG_HOME.tomcat= ${TOMCAT_HOME}
38PKG_SHELL.tomcat= ${SH} 38PKG_SHELL.tomcat= ${SH}
39PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf 39PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf
cvs diff -r1.9 -r1.10 pkgsrc/www/apache-tomcat7/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/distinfo 2013/06/17 15:07:54 1.9
+++ pkgsrc/www/apache-tomcat7/distinfo 2013/07/08 14:26:15 1.10
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.9 2013/06/17 15:07:54 ryoon Exp $ 1$NetBSD: distinfo,v 1.10 2013/07/08 14:26:15 ryoon Exp $
2 2
3SHA1 (apache-tomcat-7.0.41.tar.gz) = 87974fcc24711ea253fb43e3db450664e02e1adf 3SHA1 (apache-tomcat-7.0.42.tar.gz) = 001a64629a93103d4f53ac95faf3e52a63657b95
4RMD160 (apache-tomcat-7.0.41.tar.gz) = cfc76367c2019d0f6c73dbbb57ba0222753f2d28 4RMD160 (apache-tomcat-7.0.42.tar.gz) = 131341cd66866ef1c0ed9f188684e87d15ba8384
5Size (apache-tomcat-7.0.41.tar.gz) = 7946142 bytes 5Size (apache-tomcat-7.0.42.tar.gz) = 7955948 bytes