From de7ba2b223d2b7c3b024c389683b096e18a52b07 Mon Sep 17 00:00:00 2001
From: spz <spz@pkgsrc.org>
Date: Tue, 15 Feb 2011 07:03:11 +0000
Subject: Update to the latest version; the full changelog is at
 http://tomcat.apache.org/tomcat-6.0-doc/changelog.html

Security relevant fixes:
CVE-2011-0534 - remote denial of service
CVE-2011-0013 - cross site scripting
CVE-2010-4172 - cross site scripting
CVE-2010-3718 - SecurityManager file permission bypass
---
 www/apache-tomcat6/Makefile |  4 ++--
 www/apache-tomcat6/PLIST    | 14 ++++++++++++--
 www/apache-tomcat6/distinfo |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'www')

diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile
index 778b36cd980..da75ccc43e8 100644
--- a/www/apache-tomcat6/Makefile
+++ b/www/apache-tomcat6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/09/19 14:32:04 spz Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/15 07:03:11 spz Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
@@ -22,7 +22,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		6.0.29
+TOMCAT_VER=		6.0.32
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST
index bb04436ddc0..7697388e255 100644
--- a/www/apache-tomcat6/PLIST
+++ b/www/apache-tomcat6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/09/19 14:32:04 spz Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/02/15 07:03:11 spz Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -29,9 +29,9 @@ share/tomcat/lib/catalina-ant.jar
 share/tomcat/lib/catalina-ha.jar
 share/tomcat/lib/catalina-tribes.jar
 share/tomcat/lib/catalina.jar
+share/tomcat/lib/ecj-3.3.1.jar
 share/tomcat/lib/el-api.jar
 share/tomcat/lib/jasper-el.jar
-share/tomcat/lib/jasper-jdt.jar
 share/tomcat/lib/jasper.jar
 share/tomcat/lib/jsp-api.jar
 share/tomcat/lib/servlet-api.jar
@@ -102,6 +102,7 @@ share/tomcat/webapps/docs/config/cluster.html
 share/tomcat/webapps/docs/config/context.html
 share/tomcat/webapps/docs/config/engine.html
 share/tomcat/webapps/docs/config/executor.html
+share/tomcat/webapps/docs/config/filter.html
 share/tomcat/webapps/docs/config/globalresources.html
 share/tomcat/webapps/docs/config/host.html
 share/tomcat/webapps/docs/config/http.html
@@ -158,9 +159,14 @@ share/tomcat/webapps/docs/security-manager-howto.html
 share/tomcat/webapps/docs/setup.html
 share/tomcat/webapps/docs/ssi-howto.html
 share/tomcat/webapps/docs/ssl-howto.html
+share/tomcat/webapps/docs/tribes/developers.html
 share/tomcat/webapps/docs/tribes/faq.html
+share/tomcat/webapps/docs/tribes/interceptors.html
 share/tomcat/webapps/docs/tribes/introduction.html
+share/tomcat/webapps/docs/tribes/membership.html
 share/tomcat/webapps/docs/tribes/setup.html
+share/tomcat/webapps/docs/tribes/status.html
+share/tomcat/webapps/docs/tribes/transport.html
 share/tomcat/webapps/docs/virtual-hosting-howto.html
 share/tomcat/webapps/docs/windows-service-howto.html
 share/tomcat/webapps/examples/WEB-INF/classes/CookieExample.class
@@ -445,6 +451,8 @@ share/tomcat/webapps/examples/servlets/reqheaders.html
 share/tomcat/webapps/examples/servlets/reqinfo.html
 share/tomcat/webapps/examples/servlets/reqparams.html
 share/tomcat/webapps/examples/servlets/sessions.html
+share/tomcat/webapps/host-manager/401.jsp
+share/tomcat/webapps/host-manager/403.jsp
 share/tomcat/webapps/host-manager/META-INF/context.xml
 share/tomcat/webapps/host-manager/WEB-INF/web.xml
 share/tomcat/webapps/host-manager/images/add.gif
@@ -458,6 +466,7 @@ share/tomcat/webapps/host-manager/images/update.gif
 share/tomcat/webapps/host-manager/images/void.gif
 share/tomcat/webapps/host-manager/manager.xml
 share/tomcat/webapps/manager/401.jsp
+share/tomcat/webapps/manager/403.jsp
 share/tomcat/webapps/manager/META-INF/context.xml
 share/tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 share/tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp
@@ -473,3 +482,4 @@ share/tomcat/webapps/manager/images/update.gif
 share/tomcat/webapps/manager/images/void.gif
 share/tomcat/webapps/manager/status.xsd
 share/tomcat/webapps/manager/xform.xsl
+@pkgdir share/tomcat/conf
diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo
index 285a0913879..61c3d956021 100644
--- a/www/apache-tomcat6/distinfo
+++ b/www/apache-tomcat6/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/09/19 14:32:04 spz Exp $
+$NetBSD: distinfo,v 1.5 2011/02/15 07:03:11 spz Exp $
 
-SHA1 (apache-tomcat-6.0.29.tar.gz) = d7f307ccc02e7309d61d7f35fa6e371a79733016
-RMD160 (apache-tomcat-6.0.29.tar.gz) = d5c4dceebefe15d863e4eaa0c943d182562cb283
-Size (apache-tomcat-6.0.29.tar.gz) = 6407210 bytes
+SHA1 (apache-tomcat-6.0.32.tar.gz) = c0c87e09dae381873d94ba01cc1fef5c188c5ca0
+RMD160 (apache-tomcat-6.0.32.tar.gz) = f4b2c3c66a040a196d7edbae2c98f3aeb29d3a23
+Size (apache-tomcat-6.0.32.tar.gz) = 6507748 bytes
-- 
cgit v1.2.3