ports/110522: [UPDATE]update tomcat55 to 5.5.23:Tomcat is a Java Open-source Web Server

Mon Mar 19 16:20:06 UTC 2007

>Number:         110522
>Category:       ports
>Synopsis:       [UPDATE]update tomcat55 to 5.5.23:Tomcat is a Java Open-source Web Server
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 16:20:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Nemo Liu
>Release:        6.2
>Organization:
>Environment:
FreeBSD nfstest.sina.com.cn 6.2-STORM-r4 FreeBSD 6.2-STORM-r4 #1: Thu Feb  1 09:43:06 UTC 2007     root at mammoth.sina.com:/usr/obj/usr/src/sys/SMP  i386
>Description:
5.5.23 is the lastest release of tomcat 5.5 branch which support JSP 2.0 and Servlet 2.4.
Changelog:
http://tomcat.apache.org/tomcat-5.5-doc/changelog.html
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

? patch-tomcat55.diff
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile

--- Makefile	1 Nov 2006 12:06:01 -0000	1.39
+++ Makefile	19 Mar 2007 16:03:04 -0000
@@ -2,17 +2,17 @@
 # Date created:		Tue Aug 12 23:26:32 CST 2003
 # Whom:			Kang Liu <liukang at bjpu.edu.cn>
 #
-# $FreeBSD: ports/www/tomcat55/Makefile,v 1.39 2006/11/01 12:06:01 lawrance Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	tomcat
-PORTVERSION=	5.5.20
+PORTVERSION=	5.5.23
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	nemoliu at gmail.com
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo	1 Nov 2006 12:06:01 -0000	1.18
+++ distinfo	19 Mar 2007 16:03:04 -0000
@@ -1,6 +1,6 @@
-SIZE (apache-tomcat-5.5.20.tar.gz) = 5949295
-MD5 (apache-tomcat-5.5.20.tar.gz) = 2efa171cddb9f85ed19ef6f21b2c7d31
-SHA256 (apache-tomcat-5.5.20.tar.gz) = 272be39f7414878ce5b5d27c7c2b812fe2c1e679bd04a5b89fb863a1a304c7fa
-SIZE (apache-tomcat-5.5.20-compat.tar.gz) = 1624224
-MD5 (apache-tomcat-5.5.20-compat.tar.gz) = 9afe29117c5eca667d72bb847416153e
-SHA256 (apache-tomcat-5.5.20-compat.tar.gz) = 9fc5003b3a54c90449a3010e72ccafed778427df976ef2121985ca270b088e13
+MD5 (apache-tomcat-5.5.23.tar.gz) = 7a4cc2e00c7d2c9d9c4437ede337f832
+SHA256 (apache-tomcat-5.5.23.tar.gz) = 2948a0d6da10ff3760d58a4c73857424cfcdf7ce267ca030d94efaad11b59f81
+SIZE (apache-tomcat-5.5.23.tar.gz) = 5977561
+MD5 (apache-tomcat-5.5.23-compat.tar.gz) = 81581379bf8e10f345d774076930d51c
+SHA256 (apache-tomcat-5.5.23-compat.tar.gz) = f794d89c2cdca86b70fa6e95420299213553019e20323db832c4bb52a8a91e83
+SIZE (apache-tomcat-5.5.23-compat.tar.gz) = 1624205
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/pkg-plist,v
retrieving revision 1.20
diff -u -r1.20 pkg-plist
--- pkg-plist	3 Jul 2006 09:49:56 -0000	1.20
+++ pkg-plist	19 Mar 2007 16:03:04 -0000
@@ -1,14 +1,3 @@
- at comment $FreeBSD: ports/www/tomcat55/pkg-plist,v 1.20 2006/07/03 09:49:56 hq Exp $
- at unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/host-manager.xml %D/%%T%%/conf/Catalina/localhost/host-manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/host-manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/host-manager.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/manager.xml %D/%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/manager.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.policy must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.properties must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/context.xml %D/%%T%%/conf/context.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/context.xml; else echo If permanently deleting this package, %D/%%T%%/conf/context.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/server-minimal.xml %D/%%T%%/conf/server-minimal.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-minimal.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server-minimal.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
- at unexec if cmp -s %D/%%T%%/conf/logging.properties %D/%%T%%/conf/logging.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/logging.properties; else echo If permanently deleting this package, %D/%%T%%/conf/logging.properties must be removed manually; fi
 %%T%%/LICENSE
 %%T%%/NOTICE
 %%T%%/RELEASE-NOTES
@@ -19,7 +8,6 @@
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
-%%JAVA14%%%%T%%/bin/jmx.jar
 %%T%%/bin/jkstatus-tasks.xml
 %%T%%/bin/jmxaccessor-tasks.xml
 %%T%%/bin/jsvc.tar.gz
@@ -30,8 +18,6 @@
 %%T%%/bin/tomcat-native.tar.gz
 %%T%%/bin/tool-wrapper.sh
 %%T%%/bin/version.sh
-%%JAVA14%%%%T%%/common/endorsed/xercesImpl.jar
-%%JAVA14%%%%T%%/common/endorsed/xml-apis.jar
 %%T%%/common/i18n/tomcat-i18n-en.jar
 %%T%%/common/i18n/tomcat-i18n-es.jar
 %%T%%/common/i18n/tomcat-i18n-fr.jar
@@ -46,16 +32,26 @@
 %%T%%/common/lib/naming-resources.jar
 %%T%%/common/lib/servlet-api.jar
 %%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/host-manager.xml.%%CONF_EXT%%
-%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%
-%%T%%/conf/catalina.policy.%%CONF_EXT%%
-%%T%%/conf/catalina.properties.%%CONF_EXT%%
-%%T%%/conf/context.xml.%%CONF_EXT%%
-%%T%%/conf/logging.properties.%%CONF_EXT%%
-%%T%%/conf/server-minimal.xml.%%CONF_EXT%%
-%%T%%/conf/server.xml.%%CONF_EXT%%
-%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%
-%%T%%/conf/web.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/host-manager.xml
+%%T%%/conf/Catalina/localhost/host-manager.xml.sample
+%%T%%/conf/Catalina/localhost/manager.xml
+%%T%%/conf/Catalina/localhost/manager.xml.sample
+%%T%%/conf/catalina.policy
+%%T%%/conf/catalina.policy.sample
+%%T%%/conf/catalina.properties
+%%T%%/conf/catalina.properties.sample
+%%T%%/conf/context.xml
+%%T%%/conf/context.xml.sample
+%%T%%/conf/logging.properties
+%%T%%/conf/logging.properties.sample
+%%T%%/conf/server-minimal.xml
+%%T%%/conf/server-minimal.xml.sample
+%%T%%/conf/server.xml
+%%T%%/conf/server.xml.sample
+%%T%%/conf/tomcat-users.xml
+%%T%%/conf/tomcat-users.xml.sample
+%%T%%/conf/web.xml
+%%T%%/conf/web.xml.sample
 %%T%%/logs/stderr.log
 %%T%%/logs/stdout.log
 %%T%%/server/lib/catalina-ant-jmx.jar
@@ -64,7 +60,7 @@
 %%T%%/server/lib/catalina-optional.jar
 %%T%%/server/lib/catalina-storeconfig.jar
 %%T%%/server/lib/catalina.jar
-%%T%%/server/lib/commons-modeler.jar
+%%T%%/server/lib/commons-modeler-2.0.jar
 %%T%%/server/lib/servlets-cgi.renametojar
 %%T%%/server/lib/servlets-default.jar
 %%T%%/server/lib/servlets-invoker.jar
@@ -720,6 +716,7 @@
 %%T%%/webapps/tomcat-docs/printer/ssi-howto.html
 %%T%%/webapps/tomcat-docs/printer/ssl-howto.html
 %%T%%/webapps/tomcat-docs/printer/status.html
+%%T%%/webapps/tomcat-docs/printer/virtual-hosting-howto.html
 %%T%%/webapps/tomcat-docs/printer/windows-service-howto.html
 %%T%%/webapps/tomcat-docs/proxy-howto.html
 %%T%%/webapps/tomcat-docs/realm-howto.html
@@ -831,20 +828,15 @@
 %%T%%/webapps/tomcat-docs/ssi-howto.html
 %%T%%/webapps/tomcat-docs/ssl-howto.html
 %%T%%/webapps/tomcat-docs/status.html
+%%T%%/webapps/tomcat-docs/virtual-hosting-howto.html
 %%T%%/webapps/tomcat-docs/windows-service-howto.html
 %%T%%/webapps/webdav/WEB-INF/web.xml
 %%T%%/webapps/webdav/index.html
 %%T%%/webapps/webdav/tomcat-power.gif
 %%T%%/webapps/webdav/tomcat.gif
- at exec mkdir %D/%%T%%/work || true
- at exec mkdir %D/%%T%%/webapps/balancer/images || true
- at exec mkdir %D/%%T%%/temp || true
- at exec mkdir %D/%%T%%/shared || true
- at exec mkdir %D/%%T%%/shared/lib || true
- at exec mkdir %D/%%T%%/shared/classes || true
- at exec mkdir %D/%%T%%/server/classes || true
- at exec mkdir %D/%%T%%/common/endorsed ||true
- at exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/work
+%%T%%/common/endorsed/xercesImpl.jar
+%%T%%/common/endorsed/xml-apis.jar
+%%T%%/bin/jmx.jar
 @dirrm %%T%%/work
 @dirrm %%T%%/webapps/webdav/WEB-INF
 @dirrm %%T%%/webapps/webdav
@@ -1014,8 +1006,10 @@
 @dirrm %%T%%/conf
 @dirrm %%T%%/common/lib
 @dirrm %%T%%/common/i18n
- at dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common/classes
+ at dirrm %%T%%/common/endorsed
 @dirrm %%T%%/common
 @dirrm %%T%%/bin
 @dirrm %%T%%
+ at dirrm share/nls/en_US.US-ASCII
+ at dirrm share/nls/POSIX
Index: files/patch-conf::server.xml
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/files/patch-conf::server.xml,v
retrieving revision 1.4
diff -u -r1.4 patch-conf::server.xml
--- files/patch-conf::server.xml	7 Feb 2006 08:50:09 -0000	1.4
+++ files/patch-conf::server.xml	19 Mar 2007 16:03:04 -0000
@@ -1,4 +1,4 @@
-$FreeBSD: ports/www/tomcat55/files/patch-conf::server.xml,v 1.4 2006/02/07 08:50:09 lawrance Exp $
+$FreeBSD$
 
 --- conf/server.xml.orig	Sun Jun  5 21:37:27 2005
 +++ conf/server.xml	Sun Jun  5 21:40:08 2005
Index: files/pkg-deinstall.in
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/files/pkg-deinstall.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-deinstall.in
--- files/pkg-deinstall.in	7 Feb 2006 08:50:09 -0000	1.1
+++ files/pkg-deinstall.in	19 Mar 2007 16:03:04 -0000
@@ -8,7 +8,7 @@
 # * Checks if the '%%USER%%' user exists. If it does, then it displays
 #   a message.
 #
-# $FreeBSD: ports/www/tomcat55/files/pkg-deinstall.in,v 1.1 2006/02/07 08:50:09 lawrance Exp $
+# $FreeBSD$
 #
 
 USER=%%USER%%
Index: files/pkg-install.in
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/files/pkg-install.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-install.in
--- files/pkg-install.in	7 Feb 2006 08:50:09 -0000	1.1
+++ files/pkg-install.in	19 Mar 2007 16:03:04 -0000
@@ -3,7 +3,7 @@
 # Checks if the '%%USER%%' user and '%%GROUP%%' group exist. If they don't, then
 # an attempt is made to create both.
 #
-# $FreeBSD: ports/www/tomcat55/files/pkg-install.in,v 1.1 2006/02/07 08:50:09 lawrance Exp $
+# $FreeBSD$
 #
 
 # Make sure we're called during the 'make install' process
Index: files/tomcat55.sh.in
===================================================================
RCS file: /home/ncvs/ports/www/tomcat55/files/tomcat55.sh.in,v
retrieving revision 1.5
diff -u -r1.5 tomcat55.sh.in
--- files/tomcat55.sh.in	8 Sep 2006 09:31:07 -0000	1.5
+++ files/tomcat55.sh.in	19 Mar 2007 16:03:04 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/www/tomcat55/files/tomcat55.sh.in,v 1.5 2006/09/08 09:31:07 pav Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: tomcat%%TOMCAT_VERSION%%

>Release-Note:
>Audit-Trail:
>Unformatted:

