Update jakarta-tomcat to 5.0.28.

    Also, work around a horrible interaction with the gzip in NetBSD
    2.0 (at least RC4). If gzip is used in a pipeline the tarfile
    fails to extract (PR bin/27228)

Changes since 5.0.27:
     General
       fix        30239: Updated IIS how-to to link to Wiki page with
                  instrutions for IIS 5 and IIS 6 configurations. (yoavs)
       fix        30238: Replaced isapi_redirector.dll isapi_redirect.dll
                  in installation script for consistency. (yoavs)
       fix        29584: Enhanced and clarified JNDI documentation.
                  (yoavs)
       fix        30245: Corrected Connector documentation to list
                  "address" as a common attribute. (yoavs)
       fix        29826: Modified setclasspath.bat exit code to 1.
                  (yoavs)
       update     Updated status page, mostly rewritten. (yoavs)
       update     Updated Jakarta-Commons dependencies: BeanUtils to 1.7.0,
                  Collections to 3.1. (yoavs)
       update     Removed classic compiler directives from Ant build, as we
                  use modern anyways. (yoavs)
       update     Modified RELEASE-PLAN-5.0.html to indicate status given
                  start of work on Tomcat 5.next. (yoavs)
       update     Added command lines utilities version.sh, version.bat to
                  let you know what version is installed. (funkman)

     Catalina
                  30602: Subject is not available during the first call
       fix        to the servlet which use the basic authentication
                  (jfarcand)
       fix        29831: Added support for Boolean property to
                  BeanFactory. (yoavs)
       fix        28875: Made ErrorReportValve use UTF-8 encoding by
                  default. (yoavs)
       fix        30325: Only set CATALINA_HOME if not already set (in
                  bin/catalina.sh). (yoavs)
       fix        30144: Made SSIServlet check resource MimeType before
                  using text/html and UTF-8 default. (yoavs)
                  29406: Made JAASRealm configurable as to whether it
       fix        should use the context ClassLoader or the default
                  ClassLoader by adding a useContextClassLoader boolean
                  attribute. (yoavs)
                  If ServletResponse.getWriter() is called and no char
                  encoding has been specified, set response char encoding to
       fix        default (ISO-8859-1) so that it is reflected in
                  getContentType() and Content-Type header, as required by
                  the Servlet Spec (Bugtraq 6152759) (luehe)
       fix        29869: Better JMX/JSR77 support in StandardContext and
                  StandardWrapper. (remm)
       update     Fixed broken link to JK documenration from AJP Connector
                  reference page. (yoavs)
       fix        30587: Typo in ExtendedAccessLogValve. (yoavs)
       fix        30561: Broken restart of NamingService. (yoavs)
       fix        29668: NPE in HostConfig, directory created for
                  deployed WAR instead of xml file. (yoavs)
       fix        30179: Improved Bootstrap catalina.properties
                  handling. (yoavs)
       fix        30762: Servlet#destroy was called before
                  contextDestroyed. (yoavs)
       fix        30650: Added explicit comments on session equals()
                  implementation. (yoavs)

     Coyote
       fix     30770: Check that the browser actually sent a user-agent
               header before using it. (billbarker)
               Default charset not included in Content-Type response header
       fix     if no char encoding was specified (see Bugtraq 6152759).
               (luehe)

     Jasper
       fix     29971: Commented out page directive is parsed. (luehe)
       fix     30067: 'Scripting elements are disallowed here' exception
               behind scriptless tag. (luehe)
       fix     30073: NPE when compiling .jspx with broken xml format in
               jspcmode. (luehe)
       fix     30291: Smap for a tag should not include its body.
               (kinman)
       fix     30289: Incorrect Smap for multiple line java expression.
               (kinman)

     Cluster

     Webapps
       fix     29779: Admin/Examples SetCharacterEncodingFilter wrong
               package. (yoavs)
       fix     30354: manager-howto.xml used wrong Ant task. (yoavs)

3 files changed, 16 insertions, 11 deletions

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index cb0b61ad92d..9d12bff3019 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2004/09/09 07:14:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.49 2004/10/11 21:15:48 abs Exp $
 
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION=	1
 CATEGORIES=	www java
 # The list of sites to download is generated by a jakarta website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -11,7 +10,7 @@ MAINTAINER=	erh@NetBSD.org
 HOMEPAGE=	http://jakarta.apache.org/tomcat/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
-TOMCAT_VERSION=	5.0.27
+TOMCAT_VERSION=	5.0.28
 
 # This needs java 1.4 or higher.
 USE_JAVA2=	yes
@@ -23,6 +22,10 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/${PKGBASE}
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
+# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
+# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
+EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GZIP_CMD} -d ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+
 PKG_SYSCONFDIR.jakarta-tomcat=	${TOMCAT_LIB}/conf
 MAKE_DIRS=	${PKG_SYSCONFDIR.jakarta-tomcat}/${CATALINA_DIR}
 
diff --git a/www/jakarta-tomcat/PLIST b/www/jakarta-tomcat/PLIST
index c005b75a879..ce53f815447 100644
--- a/www/jakarta-tomcat/PLIST
+++ b/www/jakarta-tomcat/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/09 07:14:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/10/11 21:15:49 abs Exp $
 tomcat/LICENSE
 tomcat/NOTICE
 tomcat/RELEASE-NOTES
 tomcat/RUNNING.txt
 tomcat/bin/LauncherBootstrap.class
 tomcat/bin/bootstrap.jar
+tomcat/bin/catalina.50.sh
 tomcat/bin/catalina.sh
 tomcat/bin/catalina.xml
 tomcat/bin/commons-daemon.jar
@@ -23,11 +24,12 @@ tomcat/bin/tomcat5.exe
 tomcat/bin/tomcat5w.exe
 tomcat/bin/tool-wrapper-using-launcher.sh
 tomcat/bin/tool-wrapper.sh
+tomcat/bin/version.sh
 tomcat/common/endorsed/xercesImpl.jar
 tomcat/common/endorsed/xml-apis.jar
-tomcat/common/lib/ant.jar
 tomcat/common/lib/ant-launcher.jar
-tomcat/common/lib/commons-collections-2.1.1.jar
+tomcat/common/lib/ant.jar
+tomcat/common/lib/commons-collections-3.1.jar
 tomcat/common/lib/commons-dbcp-1.2.1.jar
 tomcat/common/lib/commons-el.jar
 tomcat/common/lib/commons-pool-1.2.jar
@@ -272,6 +274,7 @@ tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/panel_tag.cla
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/xhtmlbasic_tag.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/choose_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$1.class
+tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$2.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$3.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$4.class
@@ -280,7 +283,6 @@ tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$7.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$8.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$9.class
-tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class
 tomcat/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class
@@ -545,7 +547,6 @@ tomcat/webapps/tomcat-docs/architecture/startup/serverStartup.txt
 tomcat/webapps/tomcat-docs/balancer-howto.html
 tomcat/webapps/tomcat-docs/build.xml
 tomcat/webapps/tomcat-docs/building.html
-tomcat/webapps/tomcat-docs/catalina/d
 tomcat/webapps/tomcat-docs/catalina/docs/api/allclasses-frame.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/allclasses-noframe.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/constant-values.html
@@ -578,6 +579,7 @@ tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/BaseJ
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/IISConfig.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/NSConfig.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-frame.html
+tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-summary.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-tree.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/package-frame.html
 tomcat/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/package-summary.html
diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo
index 3b898b9a1bd..5f352568026 100644
--- a/www/jakarta-tomcat/distinfo
+++ b/www/jakarta-tomcat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/07/22 21:30:30 erh Exp $
+$NetBSD: distinfo,v 1.11 2004/10/11 21:15:49 abs Exp $
 
-SHA1 (jakarta-tomcat-5.0.27.tar.gz) = 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3
-Size (jakarta-tomcat-5.0.27.tar.gz) = 10298374 bytes
+SHA1 (jakarta-tomcat-5.0.28.tar.gz) = 00dc6526db0a8a75c2f4944b7253ea230b31ab70
+Size (jakarta-tomcat-5.0.28.tar.gz) = 10718313 bytes