Updated www/apache-tomcat7 to 7.0.26

 Tomcat 7.0.26 (markt)
   Catalina
     code Provide constants for commonly used Charset objects
          and use these constants where appropriate. (markt)
          Refactor the fix for 52184 to correct two issues (a
     fix  missing class and incorrect class/method names) when
          using the extras logging packages. (markt)
          52444: Only load classes during HandlesTypes
     fix  processing if the class is a match. Previously,
          every class in the web application was loaded
          regardless of whether it was a match or not. (markt)
     fix  52488: Correct typo: exipre -> expire. (markt)
     add  Add a unit test for SSO authentication. Patch
          provided by Brian Burch. (markt)
          52511: Correct regression in the fix for 51741 that
     fix  caused a harmless exception to be logged when
          scanning for annotations and WEB-INF/classes did not
          exist. (markt)
     code Refactor to remove a circular dependency between
          org.apache.catalina and org.apache.naming. (markt)
          Remove some initialisation code from the standard
     code start process (i.e. via the scripts) that was
          intended for embedding but is not required when
          performing a standard start.(markt)
          Add new method to MBeanFactory that allows any Valve
     add  to be created and deprecate the methods to create
          specific Valves. (markt)
     add  Partial sync of MIME type mapping with mime.types
          from the Apache web server. (rjung)
          52577: Fix a regression in the fix for 52328.
     fix  Prevent output truncation when reset() is called on
          a response. (mark)
          52586: Remove an old and now unnecessary hack that
     fix  modified the path info reported via the
          javax.servlet.forward.path_info request attribute
          when forwarding to an error page. (markt)
          52587: Ensure that if it is necessary to fall back
     fix  to the default NullRealm, the NullRealm instance is
          created early enough for it to be correctly
          initialised. (markt)
     fix  Fix millisecond output in AccessLogValve when using
          a SimpleDateFormat based time pattern. (rjung)
          52591: When dumping MBean data, skip attributes
     fix  where getters throw UnsupportedOperationException.
          (markt)
          52607: Ensure that the extension validator checks
     fix  the JARs in the shared and common class loaders for
          extensions. (markt)
          Correct a threading issue in the generation of the
          list of standard authenticators during Context
     fix  initialization that could lead to a web application
          failing to start if Contexts were started in
          parallel. (markt)
          52669: Correct regression that broke annotation
          processing in /WEB-INF/classes for web applications
     fix  deployed as WARs, packageless classes and some
          embedding scenarios. The regression was introduced
          by the invalid assumptions made in the fix for
          51741. (markt)
     fix  52671: When dumping MBean data, skip attributes
          where getters throw NullPointerException. (markt)

 Javadocs
   Coyote
          51543: Provide a meaningful error message when
     add  writing more response headers than permitted.
          (markt)
          52547: Ensure that bytes written (which is used by
     fix  the access log) is correctly reset after an HTTP 1.0
          request has been processed. (markt)
     code Minor refactoring to reduce code duplication in the
          HTTP connectors. (markt)
          52606: Ensure that POST bodies are available for
     fix  reply after FORM authentication when using the AJP
          connectors. (markt)
 * Building
   Jasper
         52474: Ensure that leading and trailing white space
     fix is removed from listener class names when parsing TLD
         files. (markt)
         52480: When converting class path entries from URLs
         to files/directories, ensure that any URL encoded
     fix characters are converted. Fixes JSP compilation with
         javac when Tomcat is installed at a path that
         includes spaces. (markt)
     fix 52666: Correct coercion order in EL when processing
         the equality and inequality operators. (markt)

   Web applications
            Improve BUILDING.txt. Update instructions for
     update building. Add instructions for using Checkstyle
            and running the tests. (kkolinko)
            38216: Improve handling of null return values in
     add    the JMX proxy servlet which is part of the Manager
            application. (kkolinko)
            52515: Make it clear in the Realm how-to in the
     fix    documentation web application that digested
            password storage when using DIGEST authentication
            requires that MD5 digests are used. (markt)
     fix    52634: Fix typos in JSP examples. Patch provided
            by Felix Schumacher. (rjung)
     fix    52641: Remove mentioning of ldap.jar from docs.
            Patch provided by Felix Schumacher. (rjung)

   jdbc-pool
         Fix code style issues and enable Checkstyle checks
     fix for jdbc-pool when it is built within Tomcat.
         (kkolinko)
     fix 51582 Correct set and reset the query cache to avoid
         NPE (fhanik)

   Other
         Update Commons Daemon to 1.0.9 to resolve 52548 which
     fix meant that services created with service.bat did not
         set the catalina.home and catalina.base system
         properties. (markt)
         Implement check for correct end-of-line characters in
     add the source files. It is run as separate target in
         build.xml. (kkolinko)

2 files changed, 6 insertions, 6 deletions

diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile
index 14de3127e43..56eb9f22df5 100644
--- a/www/apache-tomcat7/Makefile
+++ b/www/apache-tomcat7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/02/05 15:29:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2012/03/05 11:18:17 abs Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		7.0.25
+TOMCAT_VER=		7.0.26
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat7/distinfo b/www/apache-tomcat7/distinfo
index 79200542a24..c4e4197ee15 100644
--- a/www/apache-tomcat7/distinfo
+++ b/www/apache-tomcat7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/02/05 15:29:18 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2012/03/05 11:18:17 abs Exp $
 
-SHA1 (apache-tomcat-7.0.25.tar.gz) = 642867e55cc658f6c12adf25ca1e5629c9c12aae
-RMD160 (apache-tomcat-7.0.25.tar.gz) = 7c2d94b68b3d9deb4f1217aa5e257108558588e8
-Size (apache-tomcat-7.0.25.tar.gz) = 7527434 bytes
+SHA1 (apache-tomcat-7.0.26.tar.gz) = 7702bf80c9f765fb40043b45f988bdcce421f541
+RMD160 (apache-tomcat-7.0.26.tar.gz) = 2bec968a0cf8aeba384f78121cbb563bf9704989
+Size (apache-tomcat-7.0.26.tar.gz) = 7540233 bytes