Lots of changes, see the changelog for all the details:

	http://tomcat.apache.org/tomcat-5.5-doc/changelog.html

Of note:
important: Data integrity   CVE-2007-6286
important: Information disclosure   CVE-2007-5461
low: Elevated privileges   CVE-2007-5342
low: Session hi-jacking   CVE-2007-5333

Are all fixed in this release.

3 files changed, 14 insertions, 14 deletions

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index 41059f781ee..bac4bcc0fe9 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/11/20 22:13:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/12 20:41:48 adrianp Exp $
 
 DISTNAME=	apache-tomcat-${TOMCAT_VERSION}
 CATEGORIES=	www java
@@ -9,7 +9,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-TOMCAT_VERSION=	5.5.25
+TOMCAT_VERSION=	5.5.26
 
 USE_JAVA=	run
 # This needs java 1.5 or higher.
diff --git a/www/apache-tomcat55/PLIST b/www/apache-tomcat55/PLIST
index d31058f0783..17c3d412891 100644
--- a/www/apache-tomcat55/PLIST
+++ b/www/apache-tomcat55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/11/20 22:13:29 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/03/12 20:41:48 adrianp Exp $
 share/examples/rc.d/tomcat
 tomcat/LICENSE
 tomcat/NOTICE
@@ -8,7 +8,7 @@ tomcat/bin/bootstrap.jar
 tomcat/bin/catalina-tasks.xml
 tomcat/bin/catalina.sh
 tomcat/bin/commons-daemon.jar
-tomcat/bin/commons-logging-api.jar
+tomcat/bin/commons-logging-api-1.1.1.jar
 tomcat/bin/digest.sh
 tomcat/bin/jkstatus-tasks.xml
 tomcat/bin/jmxaccessor-tasks.xml
@@ -67,7 +67,7 @@ tomcat/server/webapps/host-manager/images/update.gif
 tomcat/server/webapps/host-manager/images/void.gif
 tomcat/server/webapps/host-manager/manager.xml
 tomcat/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
-tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.0.jar
+tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.2.jar
 tomcat/server/webapps/manager/WEB-INF/web.xml
 tomcat/server/webapps/manager/html-manager-howto.html
 tomcat/server/webapps/manager/images/add.gif
@@ -182,21 +182,21 @@ tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002dcom
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/functions_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/implicit_002dobjects_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/jspattribute_jsp.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp$shuffle_jspHelper.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp$Helper.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx$basic_jspxHelper.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx$Helper.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/textRotate_jspx.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/config_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/dynamicattrs_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/book_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/hello_jsp.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp$repeat_jspHelper.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp$Helper.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/hello_jsp.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp$panel_jspHelper.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp$Helper.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp$products_jspHelper.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp$Helper.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/hello_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/jsptoservlet_jsp.class
diff --git a/www/apache-tomcat55/distinfo b/www/apache-tomcat55/distinfo
index f52bf287fa9..eaa3e23e8f7 100644
--- a/www/apache-tomcat55/distinfo
+++ b/www/apache-tomcat55/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/11/20 22:13:30 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2008/03/12 20:41:48 adrianp Exp $
 
-SHA1 (apache-tomcat-5.5.25.tar.gz) = a0b45be80eeee7373d5e122245aa7bdc4f56b601
-RMD160 (apache-tomcat-5.5.25.tar.gz) = 12968c99720f8241b1bc9296c31b8099498075a5
-Size (apache-tomcat-5.5.25.tar.gz) = 6034852 bytes
+SHA1 (apache-tomcat-5.5.26.tar.gz) = 7260b246094cc76c42c67b913b0af85450afeeb6
+RMD160 (apache-tomcat-5.5.26.tar.gz) = 85849d1e9c25fef90f59065e38eb7c788106056d
+Size (apache-tomcat-5.5.26.tar.gz) = 6372195 bytes