>Number:         33989
>Category:       pkg
>Synopsis:       [Patch] Tomcat update to 5.5.17
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jul 13 09:25:00 +0000 2006
>Originator:     Mindaugas <unex at linija org>
>Release:        NetBSD 3.0_STABLE
>Organization:
	
>Environment:
System: NetBSD linija.org 3.0_STABLE NetBSD 3.0_STABLE (Linija-$Revision) #0: Mon Feb 27 16:03:25 EET 2006 root@linija.org:/usr/obj/sys/arch/i386/compile/LINIJA i386
Architecture: i386
Machine: i386
>Description:
Please review a patch for Tomcat update to 5.5.17 version.
Full changelog (we're moving from 5.5.14 to 5.5.17):
http://tomcat.apache.org/tomcat-5.5-doc/changelog.html
Mostly bug fixes.

Thanks.

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache-tomcat55/Makefile,v
retrieving revision 1.6
diff -b -u -r1.6 Makefile
--- Makefile	7 Jul 2006 03:12:19 -0000	1.6
+++ Makefile	13 Jul 2006 07:46:49 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.6 2006/07/07 03:12:19 minskim Exp $
 
 DISTNAME=       apache-tomcat-${TOMCAT_VERSION}
-PKGREVISION=	2
 CATEGORIES=	www java
 # The list of sites to download is generated by an apache website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -11,7 +10,7 @@
 HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-TOMCAT_VERSION=	5.5.14
+TOMCAT_VERSION=	5.5.17
 
 USE_JAVA=	run
 # This needs java 1.5 or higher.
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache-tomcat55/PLIST,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 PLIST
--- PLIST	3 Jan 2006 18:12:37 -0000	1.1.1.1
+++ PLIST	13 Jul 2006 07:46:49 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $
+@comment $NetBSD$
 share/examples/rc.d/tomcat
 tomcat/LICENSE
 tomcat/NOTICE
@@ -35,6 +35,8 @@
 tomcat/common/lib/naming-factory.jar
 tomcat/common/lib/naming-resources.jar
 tomcat/common/lib/servlet-api.jar
+tomcat/conf/Catalina/localhost/manager.xml
+tomcat/conf/tomcat-users.xml
 tomcat/server/lib/catalina-ant-jmx.jar
 tomcat/server/lib/catalina-ant.jar
 tomcat/server/lib/catalina-cluster.jar
@@ -57,11 +59,11 @@
 tomcat/server/webapps/host-manager/WEB-INF/web.xml
 tomcat/server/webapps/host-manager/host-manager.xml
 tomcat/server/webapps/host-manager/images/add.gif
+tomcat/server/webapps/host-manager/images/asf-logo.gif
 tomcat/server/webapps/host-manager/images/code.gif
 tomcat/server/webapps/host-manager/images/design.gif
 tomcat/server/webapps/host-manager/images/docs.gif
 tomcat/server/webapps/host-manager/images/fix.gif
-tomcat/server/webapps/host-manager/images/jakarta-logo.gif
 tomcat/server/webapps/host-manager/images/tomcat.gif
 tomcat/server/webapps/host-manager/images/update.gif
 tomcat/server/webapps/host-manager/images/void.gif
@@ -71,11 +73,11 @@
 tomcat/server/webapps/manager/WEB-INF/web.xml
 tomcat/server/webapps/manager/html-manager-howto.html
 tomcat/server/webapps/manager/images/add.gif
+tomcat/server/webapps/manager/images/asf-logo.gif
 tomcat/server/webapps/manager/images/code.gif
 tomcat/server/webapps/manager/images/design.gif
 tomcat/server/webapps/manager/images/docs.gif
 tomcat/server/webapps/manager/images/fix.gif
-tomcat/server/webapps/manager/images/jakarta-logo.gif
 tomcat/server/webapps/manager/images/tomcat.gif
 tomcat/server/webapps/manager/images/update.gif
 tomcat/server/webapps/manager/images/void.gif
@@ -93,9 +95,9 @@
 tomcat/webapps/ROOT/WEB-INF/lib/catalina-root.jar
 tomcat/webapps/ROOT/WEB-INF/web.xml
 tomcat/webapps/ROOT/admin/index.html
+tomcat/webapps/ROOT/asf-logo-wide.gif
 tomcat/webapps/ROOT/favicon.ico
 tomcat/webapps/ROOT/index.jsp
-tomcat/webapps/ROOT/jakarta-banner.gif
 tomcat/webapps/ROOT/tomcat-power.gif
 tomcat/webapps/ROOT/tomcat.gif
 tomcat/webapps/balancer/META-INF/context.xml
@@ -540,11 +542,11 @@
 tomcat/webapps/tomcat-docs/developers.html
 tomcat/webapps/tomcat-docs/html-manager-howto.html
 tomcat/webapps/tomcat-docs/images/add.gif
+tomcat/webapps/tomcat-docs/images/asf-logo.gif
 tomcat/webapps/tomcat-docs/images/code.gif
 tomcat/webapps/tomcat-docs/images/design.gif
 tomcat/webapps/tomcat-docs/images/docs.gif
 tomcat/webapps/tomcat-docs/images/fix.gif
-tomcat/webapps/tomcat-docs/images/jakarta-logo.gif
 tomcat/webapps/tomcat-docs/images/printer.gif
 tomcat/webapps/tomcat-docs/images/tomcat.gif
 tomcat/webapps/tomcat-docs/images/update.gif
@@ -818,6 +820,7 @@
 tomcat/webapps/webdav/index.html
 tomcat/webapps/webdav/tomcat-power.gif
 tomcat/webapps/webdav/tomcat.gif
+@exec ${MKDIR} %D/tomcat/work
 @dirrm tomcat/work
 @dirrm tomcat/webapps/webdav/WEB-INF
 @dirrm tomcat/webapps/webdav
@@ -954,6 +957,7 @@
 @dirrm tomcat/webapps/jsp-examples/WEB-INF/classes
 @dirrm tomcat/webapps/jsp-examples/WEB-INF
 @dirrm tomcat/webapps/jsp-examples
+@exec ${MKDIR} %D/tomcat/webapps/balancer/images
 @dirrm tomcat/webapps/balancer/images
 @dirrm tomcat/webapps/balancer/WEB-INF/lib
 @dirrm tomcat/webapps/balancer/WEB-INF/config
@@ -965,7 +969,11 @@
 @dirrm tomcat/webapps/ROOT/WEB-INF
 @dirrm tomcat/webapps/ROOT
 @dirrm tomcat/webapps
+@exec ${MKDIR} %D/tomcat/temp
+@dirrm tomcat/temp
+@exec ${MKDIR} %D/tomcat/shared/lib
 @dirrm tomcat/shared/lib
+@exec ${MKDIR} %D/tomcat/shared/classes
 @dirrm tomcat/shared/classes
 @dirrm tomcat/shared
 @dirrm tomcat/share/examples/apache-tomcat/Catalina/localhost
@@ -983,15 +991,19 @@
 @dirrm tomcat/server/webapps/host-manager
 @dirrm tomcat/server/webapps
 @dirrm tomcat/server/lib
+@exec ${MKDIR} %D/tomcat/server/classes
 @dirrm tomcat/server/classes
 @dirrm tomcat/server
+@exec ${MKDIR} %D/tomcat/logs
 @dirrm tomcat/logs
 @dirrm tomcat/conf/Catalina/localhost
 @dirrm tomcat/conf/Catalina
 @dirrm tomcat/conf
 @dirrm tomcat/common/lib
 @dirrm tomcat/common/i18n
+@exec ${MKDIR} %D/tomcat/common/endorsed
 @dirrm tomcat/common/endorsed
+@exec ${MKDIR} %D/tomcat/common/classes
 @dirrm tomcat/common/classes
 @dirrm tomcat/common
 @dirrm tomcat/bin
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache-tomcat55/distinfo,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 distinfo
--- distinfo	3 Jan 2006 18:12:37 -0000	1.1.1.1
+++ distinfo	13 Jul 2006 07:46:49 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $
 
-SHA1 (apache-tomcat-5.5.14.tar.gz) = 669b096e67169b66cc4a3818532f5a575d06c6b5
-RMD160 (apache-tomcat-5.5.14.tar.gz) = 6979b10d3420d66222cc826b9934e3a45d24daf7
-Size (apache-tomcat-5.5.14.tar.gz) = 5965614 bytes
+SHA1 (apache-tomcat-5.5.17.tar.gz) = 5289b2e6302bb0ed792f45d730c13b3868368a7f
+RMD160 (apache-tomcat-5.5.17.tar.gz) = cf7520bc17d851c48d49fb14458bead97eb9a44b
+Size (apache-tomcat-5.5.17.tar.gz) = 5994530 bytes