Wed Sep 10 09:53:31 2008 UTC ()
Updated www/apache-tomcat55 to 5.5.27

Tomcat 5.5.27 (fhanik)

    General

        44463: War file upload in manager webapp fails due to missing commons-io dependency. Added commons-io 1.4. (rjung)

    Catalina

        44021, 43013: Add support for # to signify multi-level contexts for directories and wars.
        44494: Backport from 6.0 (rjung)
        Add additional checks for URI normalization. (remm)
        Don't throw an ArrayIndexOutOfBoundsException when empty URL is requested. Patch provided by Charles R Caldarale. (markt)
        29936: Don't use parser from a webapp to parse web.xml and possibly context.xml files. (markt)
        43079: Correct pattern verification for suspicious URLs. Patch provided by John Kew. (markt)
        43080: Log suspicious URL pattern warnings to the correct web application. (markt)
        43117: Setting an empty workDIR could delete all of CATALINA_HOME. Patch provided by Takayuki Kaneko. (markt)
        44282: Prevent security exception in trace level logging for web application class loader when running under a security manager. (markt)
        44529: No roles specified (deny all) should take precedence over no auth-constraint specified (allow-all). (markt)
        43578: Enable start on Linux if $CATALINA_HOME contains a space. Original patch provided by Ray Sauers with improvements by Ian Ward Comfort. (markt)
        44673: Throw IOE if ServletInputStream is closed and a call is made to any read(), ready(), mark(), reset(), or skip() method as per javadocs for Reader. (markt)
        Enable the CGIServlet to work with Windows Vista. (markt)
        Add additional permission required to read JDK logging configuration when running with a security manager. (markt)
        44943: Reduce copy/paste issues caused by different engine names in server.xml. (markt)
        45195: Prevent NPE when calling Session.getAttribute(null) and Session.removeAttribute(null). The spec is unclear but this is a regression from 5.0.x. (markt)
        45293: Update name of commons-logging jar in security policy. (markt)
        45453: Fix race condition in JDBC Realm. Based on a patch provided by Santtu Hyrkk. (markt)
        JAAS Realm did not read role information for users. (markt)

    Connectors

        Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk has hung up the phone. (billbarker)
        42727: Handle request lines that are exact multiples of 4096 in length. Patch provided by Will Pugh. (markt)
        43191: Compression could not be disabled for some file types. Based on a patch by Len Popp. (markt)
        45591: Fix NPE on shutdown failure in some cases. Based on a patch by Matt Passell. (markt)

    Jasper

        31257: Quote endorsed dirs if they contain a space. (markt)
        42943: Make sure nested element is inside <jsp:text> element before throwing exception. (markt)
        44877: Prevent collisions in tag pool names. (markt)
        45015: Enfore JSP spec rules on quoting in attrbutes. This is configurable using the system property org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING. (markt)

    Webapps

        42899: When saving config from admin app, correctly handle case where the old config file does not exist. (markt)
        44541: Document packetSize attribute for AJP connector. (markt)
        44715: Document use of secret for AJP connector. (markt)
        45323: Add note that context.xml files can only contain a single Context element. (markt)
        Update JNDI datasource docs since maxActive setting for unlimited changed in commons-pool > 1.2. (markt)

    Specification

        Use a localised error message if a user tries to write a negative length byte array during default processing of a HEAD request. (markt)
        44562: HEAD requests cannot use includes. Patch provided by David Jencks. (markt)


(abs)
diff -r1.16 -r1.17 pkgsrc/www/apache-tomcat55/Makefile
diff -r1.5 -r1.6 pkgsrc/www/apache-tomcat55/PLIST
diff -r1.6 -r1.7 pkgsrc/www/apache-tomcat55/distinfo

cvs diff -r1.16 -r1.17 pkgsrc/www/apache-tomcat55/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat55/Makefile 2008/06/20 01:09:40 1.16
+++ pkgsrc/www/apache-tomcat55/Makefile 2008/09/10 09:53:31 1.17
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.17 2008/09/10 09:53:31 abs Exp $
2 2
3DISTNAME= apache-tomcat-${TOMCAT_VERSION} 3DISTNAME= apache-tomcat-${TOMCAT_VERSION}
4CATEGORIES= www java 4CATEGORIES= www java
5# The list of sites to download is generated by an apache website. 5# The list of sites to download is generated by an apache website.
6# The getsite.sh script parses the HTML and extracts the urls. 6# The getsite.sh script parses the HTML and extracts the urls.
7 7
8MAINTAINER= abs@NetBSD.org 8MAINTAINER= abs@NetBSD.org
9HOMEPAGE= http://tomcat.apache.org/ 9HOMEPAGE= http://tomcat.apache.org/
10COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server 10COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14TOMCAT_VERSION= 5.5.26 14TOMCAT_VERSION= 5.5.27
15 15
16USE_JAVA= run 16USE_JAVA= run
17# This needs java 1.5 or higher. 17# This needs java 1.5 or higher.
18USE_JAVA2= 1.5 18USE_JAVA2= 1.5
19 19
20USE_TOOLS+= pax 20USE_TOOLS+= pax
21 21
22TOMCAT_LIB= ${PREFIX}/tomcat 22TOMCAT_LIB= ${PREFIX}/tomcat
23CATALINA_DIR= Catalina/localhost 23CATALINA_DIR= Catalina/localhost
24 24
25EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat 25EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat
26EGDIR2= ${EGDIR}/${CATALINA_DIR} 26EGDIR2= ${EGDIR}/${CATALINA_DIR}
27 27
@@ -51,27 +51,27 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONF @@ -51,27 +51,27 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONF
51CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} 51CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
52.endfor 52.endfor
53 53
54FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} 54FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
55 55
56# If we were going to build jsvc, this would be a start 56# If we were going to build jsvc, this would be a start
57# post-extract: 57# post-extract:
58# @(cd ${WRKSRC} && ${GZCAT} bin/jsvc.tar.gz | ${TAR} xf - ) 58# @(cd ${WRKSRC} && ${GZCAT} bin/jsvc.tar.gz | ${TAR} xf - )
59# 59#
60# post-configure: 60# post-configure:
61# @(cd ${WRKSRC}/jsvc-src ; ${SH} ./configure) 61# @(cd ${WRKSRC}/jsvc-src ; ${SH} ./configure)
62 62
63do-build: 63do-build:
64 @${MV} ${WRKSRC}/conf ${WRKDIR} 64 ${MV} ${WRKSRC}/conf ${WRKDIR}
65 65
66INSTALLATION_DIRS+= ${EGDIR2} ${TOMCAT_LIB} 66INSTALLATION_DIRS+= ${EGDIR2} ${TOMCAT_LIB}
67 67
68do-install: 68do-install:
69.for f in ${CFILES} 69.for f in ${CFILES}
70 ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR} 70 ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR}
71.endfor 71.endfor
72.for f in ${CF2FILES} 72.for f in ${CF2FILES}
73 ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2} 73 ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2}
74.endfor 74.endfor
75 ${RM} -rf ${WRKSRC}/temp/* 75 ${RM} -rf ${WRKSRC}/temp/*
76 cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB} 76 cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}
77 77

cvs diff -r1.5 -r1.6 pkgsrc/www/apache-tomcat55/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat55/PLIST 2008/03/12 20:41:48 1.5
+++ pkgsrc/www/apache-tomcat55/PLIST 2008/09/10 09:53:31 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2008/03/12 20:41:48 adrianp Exp $ 1@comment $NetBSD: PLIST,v 1.6 2008/09/10 09:53:31 abs Exp $
2share/examples/rc.d/tomcat 2share/examples/rc.d/tomcat
3tomcat/LICENSE 3tomcat/LICENSE
4tomcat/NOTICE 4tomcat/NOTICE
5tomcat/RELEASE-NOTES 5tomcat/RELEASE-NOTES
6tomcat/RUNNING.txt 6tomcat/RUNNING.txt
7tomcat/bin/bootstrap.jar 7tomcat/bin/bootstrap.jar
8tomcat/bin/catalina-tasks.xml 8tomcat/bin/catalina-tasks.xml
9tomcat/bin/catalina.sh 9tomcat/bin/catalina.sh
10tomcat/bin/commons-daemon.jar 10tomcat/bin/commons-daemon.jar
11tomcat/bin/commons-logging-api-1.1.1.jar 11tomcat/bin/commons-logging-api-1.1.1.jar
12tomcat/bin/digest.sh 12tomcat/bin/digest.sh
13tomcat/bin/jkstatus-tasks.xml 13tomcat/bin/jkstatus-tasks.xml
14tomcat/bin/jmxaccessor-tasks.xml 14tomcat/bin/jmxaccessor-tasks.xml
@@ -58,26 +58,27 @@ tomcat/server/webapps/host-manager/WEB-I @@ -58,26 +58,27 @@ tomcat/server/webapps/host-manager/WEB-I
58tomcat/server/webapps/host-manager/host-manager.xml 58tomcat/server/webapps/host-manager/host-manager.xml
59tomcat/server/webapps/host-manager/images/add.gif 59tomcat/server/webapps/host-manager/images/add.gif
60tomcat/server/webapps/host-manager/images/asf-logo.gif 60tomcat/server/webapps/host-manager/images/asf-logo.gif
61tomcat/server/webapps/host-manager/images/code.gif 61tomcat/server/webapps/host-manager/images/code.gif
62tomcat/server/webapps/host-manager/images/design.gif 62tomcat/server/webapps/host-manager/images/design.gif
63tomcat/server/webapps/host-manager/images/docs.gif 63tomcat/server/webapps/host-manager/images/docs.gif
64tomcat/server/webapps/host-manager/images/fix.gif 64tomcat/server/webapps/host-manager/images/fix.gif
65tomcat/server/webapps/host-manager/images/tomcat.gif 65tomcat/server/webapps/host-manager/images/tomcat.gif
66tomcat/server/webapps/host-manager/images/update.gif 66tomcat/server/webapps/host-manager/images/update.gif
67tomcat/server/webapps/host-manager/images/void.gif 67tomcat/server/webapps/host-manager/images/void.gif
68tomcat/server/webapps/host-manager/manager.xml 68tomcat/server/webapps/host-manager/manager.xml
69tomcat/server/webapps/manager/WEB-INF/lib/catalina-manager.jar 69tomcat/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
70tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.2.jar 70tomcat/server/webapps/manager/WEB-INF/lib/commons-fileupload-1.2.jar
 71tomcat/server/webapps/manager/WEB-INF/lib/commons-io-1.4.jar
71tomcat/server/webapps/manager/WEB-INF/web.xml 72tomcat/server/webapps/manager/WEB-INF/web.xml
72tomcat/server/webapps/manager/html-manager-howto.html 73tomcat/server/webapps/manager/html-manager-howto.html
73tomcat/server/webapps/manager/images/add.gif 74tomcat/server/webapps/manager/images/add.gif
74tomcat/server/webapps/manager/images/asf-logo.gif 75tomcat/server/webapps/manager/images/asf-logo.gif
75tomcat/server/webapps/manager/images/code.gif 76tomcat/server/webapps/manager/images/code.gif
76tomcat/server/webapps/manager/images/design.gif 77tomcat/server/webapps/manager/images/design.gif
77tomcat/server/webapps/manager/images/docs.gif 78tomcat/server/webapps/manager/images/docs.gif
78tomcat/server/webapps/manager/images/fix.gif 79tomcat/server/webapps/manager/images/fix.gif
79tomcat/server/webapps/manager/images/tomcat.gif 80tomcat/server/webapps/manager/images/tomcat.gif
80tomcat/server/webapps/manager/images/update.gif 81tomcat/server/webapps/manager/images/update.gif
81tomcat/server/webapps/manager/images/void.gif 82tomcat/server/webapps/manager/images/void.gif
82tomcat/server/webapps/manager/manager-howto.html 83tomcat/server/webapps/manager/manager-howto.html
83tomcat/server/webapps/manager/manager.xml 84tomcat/server/webapps/manager/manager.xml
@@ -518,31 +519,33 @@ tomcat/webapps/tomcat-docs/config/manage @@ -518,31 +519,33 @@ tomcat/webapps/tomcat-docs/config/manage
518tomcat/webapps/tomcat-docs/config/printer/ajp.html 519tomcat/webapps/tomcat-docs/config/printer/ajp.html
519tomcat/webapps/tomcat-docs/config/printer/context.html 520tomcat/webapps/tomcat-docs/config/printer/context.html
520tomcat/webapps/tomcat-docs/config/printer/engine.html 521tomcat/webapps/tomcat-docs/config/printer/engine.html
521tomcat/webapps/tomcat-docs/config/printer/globalresources.html 522tomcat/webapps/tomcat-docs/config/printer/globalresources.html
522tomcat/webapps/tomcat-docs/config/printer/host.html 523tomcat/webapps/tomcat-docs/config/printer/host.html
523tomcat/webapps/tomcat-docs/config/printer/http.html 524tomcat/webapps/tomcat-docs/config/printer/http.html
524tomcat/webapps/tomcat-docs/config/printer/index.html 525tomcat/webapps/tomcat-docs/config/printer/index.html
525tomcat/webapps/tomcat-docs/config/printer/loader.html 526tomcat/webapps/tomcat-docs/config/printer/loader.html
526tomcat/webapps/tomcat-docs/config/printer/manager.html 527tomcat/webapps/tomcat-docs/config/printer/manager.html
527tomcat/webapps/tomcat-docs/config/printer/realm.html 528tomcat/webapps/tomcat-docs/config/printer/realm.html
528tomcat/webapps/tomcat-docs/config/printer/resources.html 529tomcat/webapps/tomcat-docs/config/printer/resources.html
529tomcat/webapps/tomcat-docs/config/printer/server.html 530tomcat/webapps/tomcat-docs/config/printer/server.html
530tomcat/webapps/tomcat-docs/config/printer/service.html 531tomcat/webapps/tomcat-docs/config/printer/service.html
 532tomcat/webapps/tomcat-docs/config/printer/systemprops.html
531tomcat/webapps/tomcat-docs/config/printer/valve.html 533tomcat/webapps/tomcat-docs/config/printer/valve.html
532tomcat/webapps/tomcat-docs/config/realm.html 534tomcat/webapps/tomcat-docs/config/realm.html
533tomcat/webapps/tomcat-docs/config/resources.html 535tomcat/webapps/tomcat-docs/config/resources.html
534tomcat/webapps/tomcat-docs/config/server.html 536tomcat/webapps/tomcat-docs/config/server.html
535tomcat/webapps/tomcat-docs/config/service.html 537tomcat/webapps/tomcat-docs/config/service.html
 538tomcat/webapps/tomcat-docs/config/systemprops.html
536tomcat/webapps/tomcat-docs/config/valve.html 539tomcat/webapps/tomcat-docs/config/valve.html
537tomcat/webapps/tomcat-docs/connectors.html 540tomcat/webapps/tomcat-docs/connectors.html
538tomcat/webapps/tomcat-docs/default-servlet.html 541tomcat/webapps/tomcat-docs/default-servlet.html
539tomcat/webapps/tomcat-docs/deployer-howto.html 542tomcat/webapps/tomcat-docs/deployer-howto.html
540tomcat/webapps/tomcat-docs/developers.html 543tomcat/webapps/tomcat-docs/developers.html
541tomcat/webapps/tomcat-docs/html-manager-howto.html 544tomcat/webapps/tomcat-docs/html-manager-howto.html
542tomcat/webapps/tomcat-docs/images/add.gif 545tomcat/webapps/tomcat-docs/images/add.gif
543tomcat/webapps/tomcat-docs/images/asf-logo.gif 546tomcat/webapps/tomcat-docs/images/asf-logo.gif
544tomcat/webapps/tomcat-docs/images/code.gif 547tomcat/webapps/tomcat-docs/images/code.gif
545tomcat/webapps/tomcat-docs/images/design.gif 548tomcat/webapps/tomcat-docs/images/design.gif
546tomcat/webapps/tomcat-docs/images/docs.gif 549tomcat/webapps/tomcat-docs/images/docs.gif
547tomcat/webapps/tomcat-docs/images/fix.gif 550tomcat/webapps/tomcat-docs/images/fix.gif
548tomcat/webapps/tomcat-docs/images/printer.gif 551tomcat/webapps/tomcat-docs/images/printer.gif

cvs diff -r1.6 -r1.7 pkgsrc/www/apache-tomcat55/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat55/distinfo 2008/03/12 20:41:48 1.6
+++ pkgsrc/www/apache-tomcat55/distinfo 2008/09/10 09:53:31 1.7
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.6 2008/03/12 20:41:48 adrianp Exp $ 1$NetBSD: distinfo,v 1.7 2008/09/10 09:53:31 abs Exp $
2 2
3SHA1 (apache-tomcat-5.5.26.tar.gz) = 7260b246094cc76c42c67b913b0af85450afeeb6 3SHA1 (apache-tomcat-5.5.27.tar.gz) = 66cf7e1a67d7a54c3d31e5bf45f06d4173af8cee
4RMD160 (apache-tomcat-5.5.26.tar.gz) = 85849d1e9c25fef90f59065e38eb7c788106056d 4RMD160 (apache-tomcat-5.5.27.tar.gz) = 5479bb7dd9c0a2f9e37a9eedd5fefc62a57188a6
5Size (apache-tomcat-5.5.26.tar.gz) = 6372195 bytes 5Size (apache-tomcat-5.5.27.tar.gz) = 6478912 bytes