Pullup ticket 2115 - requested by lkundrak

security update for apache-tomcat55

Revisions pulled up:
- pkgsrc/www/apache-tomcat55/Makefile				1.11
- pkgsrc/www/apache-tomcat55/PLIST				1.3
- pkgsrc/www/apache-tomcat55/distinfo				1.4

   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Wed Apr 25 06:14:45 UTC 2007

   Modified Files:
   	pkgsrc/www/apache-tomcat55: Makefile PLIST distinfo

   Log Message:
   Update apache-tomcat55 to 5.5.23.

   Tomcat 5.5.23 (fhanik)
   Catalina
    41608 Make log levels consistent when Servlet.service() throws
          an exception. (markt)
    41666 Correct handling of boundary conditions for If-Unmodified-Since
          and If-Modified-Since headers. Patch provided by Suzuki Yuichiro.
          (markt)
    41674 Fix error messages when parsing context.xml that incorrectly
          referred to web.xml. (markt)
    41739 Correct handling of servlets with a load-on-startup value of zero.
          These are now the first servlets to be started. (markt)

   Coyote
    Requests with multiple content-length headers are now rejected. (markt)

   Tomcat 5.5.22 (fhanik)
   General
    Fix regression in build that prevented connectors from building. (markt)

   Tomcat 5.5.21 (fhanik)
   Catalina
    41401: StandardService.getConnectorNames() return array of Connector JMX
           objectnames. (pero)
    29727: If env-entry values in web.xml are changed then ensure new values
           are applied when context is reloaded. (markt)
    34956: Ensure request and response objects passed to a RequestDispatcher
           meet the requirements of SRV.8.2 and SRV.14.2.5.1. This is
           disabled by default. The Java option
           -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true is required
           to enable this test. (markt)
    36274: When including static content with the DefaultServlet also treat
           content types ending in xml as text. (markt)
    36976: Don't use CATALINA_OPTS when stopping Tomcat. This allows options
           for starting and stopping to be set on JAVA_OPTS and options for
           starting only to be set on CATALINA_OPTS. Without this fix, some
           startup options (eg the port for remote JMX) would cause stop to
           fail. Based on a fix suggested by Michael Vorburger. (markt)
    37070: Update mbean name documentation to include the StandardWrapper.
           (markt)
    37356: Ensure sessions time out correctly. This has been fixed by
           removing the accessCount feature by default. This feature prevents
           the session from timing out whilst requests that last longer than
           the session time out are being processed. This feature is enabled
           by setting the Java option
           -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true The feature
           is now implemented with synchronization which addresses the thread
           safety issues associated with the original bug report. (markt)

    37439: Update documentation for Engine component to add the requirement
           that the name must be unique. (markt)
    37458: Add syncs to the WebappClassloader to address rare issues when
           multiple threads attempt to load the same class concurrently.
           (markt)
    37509: Do not remove whitespace from the end of values defined in
           logging.properties files. (markt)
    38198: Add reference to Context documentation from Host documentation
           that explains how Context name is obtained from the Context
           filename. (markt)
    39088: Prevent infinte loops when an exception is thrown that returns
           itself for getRootCause(). Based on a patch by Wouter Zelle.
           (markt)
    39436: Correct MIME type for SVG. (markt)
    39627: JULI no longer ignores a ".level=XXX" directive in
           logging.properties. Patch provided by Roger Keays and Richard
           Fearn. (markt)
    39724: Removing the last valve from a pipeline did not return the pipeline
           to the original state. Patch provided by David Gagon. (markt)
    40367: Update JK auto configuration documentation to clarify that
           workers.properties must also exist. (markt)
    40524: HttpServletRequest.getAuthType() now returns CLIENT_CERT rather
           than CLIENT-CERT for certificate authentication as per the spec.
           Note that web.xml continues to use CLIENT-CERT to specify the
           certificate authentication should be used. (markt)
    40526: Add support for JPDA_OPTS to catalina.bat and add a JPDA_SUSPEND
           environment variable to both startup scripts. Patch provided by
           Kurt Roy. (markt)
    40528: Add missing message localisations as provided by Ben Clifford.
           (markt)
    40585: Fix parameterised constructor for o.a.juli.FileHandler so
           parameters have an effect. (markt)
    40625: Stop CGIServlet swallowing the root cause of an exception. Patch
           provided by Takayoshi Kimura. (markt)
    40723: Correct table creation example in JavaDoc for JDBCAccessLogValve.
           (markt)
    40802: Add jsp-api.jar to fileset in catalina-tasks.xml as provided by
           Daniel Santos. (pero)
    40817: Correct problem where CGI scripts in the root of the ROOT context
           threw a StringIndexOutOfBoundsException. (markt)
    Set the SCRIPT_FILENAME environment variable required by PHP when using
    the CGIServlet to execute PHP. (markt)
    40823: Update context doc to clarify use of ROOT.xml, multi-level context
           paths and to further discourage use of server.xml (markt)
    40844: Add additional syncs to JDBCRealm to resolve NPE when two users
           try to authenticate using DIGEST authentication at the same time.
           (markt)
    40860: Log exceptions and other problems during parameter processing.
           (markt)
    40901: Encode directory listing output. Based on a patch provided by
           Chris Halstead. (markt)
    40929: Correct JavaDoc for StandardCalssLoader. (markt)
    41008: Allow POST to be used for indexed queries with CGI Servlet. Patch
           provided by Chris Halstead. (markt)
    41020: Improve error message when custom error report Valve fails to load.
           Also remove requirement that custom error report Valves extend
           ValveBase. (markt)
    41217: Set secure attribute on SSO cookie when cookie is created during
           a secure request. Patch provided by Chris Halstead. (markt)
    Ensure Accept-Language headers conform to RFC 2616. Ignore them if they
    do not. (markt)
    Make provided instances of RequestDisvs)
    40160: add reference to the Filter proposed in this Bugzilla item to the
           WebdavServlet. While at it, give the WebdavServlet some
           long-overdue TLC by cleaning up some of the old datl JDK
           1.4-compliant) interfaces. (yoavs)
    Add a virtual hosting how-to contributed by Hassan Schroeder. (markt)

   Cluster
    Add clustered SSO code and backport feature from Tomcat 6.0.x, subn (pero)
    Add better recovery at FastAsyncQueueSender. Made the startegy more robust
    for temporary connection problems (pero)

3 files changed, 11 insertions, 9 deletions

diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index b2cfb38ac94..7f790f6ad2c 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2007/06/23 22:37:48 salo 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.20
+TOMCAT_VERSION=	5.5.23
 
 USE_JAVA=	run
 # This needs java 1.5 or higher.
@@ -67,7 +67,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
 .endfor
 	${INSTALL_DATA_DIR} ${TOMCAT_LIB}
-	${RM} -r ${WRKSRC}/temp/*
+	${RM} -rf ${WRKSRC}/temp/*
 	@(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB};		\
 	${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r;	\
 	${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print	\
diff --git a/www/apache-tomcat55/PLIST b/www/apache-tomcat55/PLIST
index 888c28d314c..66c44ab3244 100644
--- a/www/apache-tomcat55/PLIST
+++ b/www/apache-tomcat55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:43:55 abs Exp $
+@comment $NetBSD: PLIST,v 1.2.6.1 2007/06/23 22:37:49 salo Exp $
 share/examples/rc.d/tomcat
 tomcat/LICENSE
 tomcat/NOTICE
@@ -41,7 +41,7 @@ tomcat/server/lib/catalina-cluster.jar
 tomcat/server/lib/catalina-optional.jar
 tomcat/server/lib/catalina-storeconfig.jar
 tomcat/server/lib/catalina.jar
-tomcat/server/lib/commons-modeler.jar
+tomcat/server/lib/commons-modeler-2.0.jar
 tomcat/server/lib/servlets-cgi.renametojar
 tomcat/server/lib/servlets-default.jar
 tomcat/server/lib/servlets-invoker.jar
@@ -702,6 +702,7 @@ tomcat/webapps/tomcat-docs/printer/setup.html
 tomcat/webapps/tomcat-docs/printer/ssi-howto.html
 tomcat/webapps/tomcat-docs/printer/ssl-howto.html
 tomcat/webapps/tomcat-docs/printer/status.html
+tomcat/webapps/tomcat-docs/printer/virtual-hosting-howto.html
 tomcat/webapps/tomcat-docs/printer/windows-service-howto.html
 tomcat/webapps/tomcat-docs/proxy-howto.html
 tomcat/webapps/tomcat-docs/realm-howto.html
@@ -813,6 +814,7 @@ tomcat/webapps/tomcat-docs/setup.html
 tomcat/webapps/tomcat-docs/ssi-howto.html
 tomcat/webapps/tomcat-docs/ssl-howto.html
 tomcat/webapps/tomcat-docs/status.html
+tomcat/webapps/tomcat-docs/virtual-hosting-howto.html
 tomcat/webapps/tomcat-docs/windows-service-howto.html
 tomcat/webapps/webdav/WEB-INF/web.xml
 tomcat/webapps/webdav/index.html
diff --git a/www/apache-tomcat55/distinfo b/www/apache-tomcat55/distinfo
index 2b3d7b017ae..b7c4d821dd6 100644
--- a/www/apache-tomcat55/distinfo
+++ b/www/apache-tomcat55/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/11/13 11:25:16 abs Exp $
+$NetBSD: distinfo,v 1.3.4.1 2007/06/23 22:37:49 salo Exp $
 
-SHA1 (apache-tomcat-5.5.20.tar.gz) = 70316421f72291bbce3fe6e79bff39f526132946
-RMD160 (apache-tomcat-5.5.20.tar.gz) = 93c422347a28b5159301f8f7799d59fdb58c43c6
-Size (apache-tomcat-5.5.20.tar.gz) = 5949295 bytes
+SHA1 (apache-tomcat-5.5.23.tar.gz) = 81a095ccd3c6b03a882b8b91bdfe46a32fa373b5
+RMD160 (apache-tomcat-5.5.23.tar.gz) = 9173e12cf70d741c8b3b73812a3f9c49c7147417
+Size (apache-tomcat-5.5.23.tar.gz) = 5977561 bytes