From 2a2702517be65a348ec6cd3e29f24ec02f2c5b6d Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Fri, 24 Feb 2012 08:45:57 +0000
Subject: [PATCH] Bugfixing update to 7.0.26

---
 www/tomcat/v7/Makefile           |  4 ++--
 www/tomcat/v7/distinfo           | 20 ++++++++++----------
 www/tomcat/v7/pkg/PLIST-examples |  9 ++++++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index 0a60d1445a2..fa05d90341b 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2012/01/26 10:13:15 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.4 2012/02/24 08:45:57 dcoppa Exp $
 
 COMMENT-main=	Java servlet 2.5 and Java server pages 2.1 server
 COMMENT-examples=example applications and full documentation
 
-V=		7.0.25
+V=		7.0.26
 DISTNAME=	apache-tomcat-${V}
 PKGNAME=	tomcat-${V}
 PKGNAME-main=	tomcat-${V}
diff --git a/www/tomcat/v7/distinfo b/www/tomcat/v7/distinfo
index b2b00fc0f1d..72e2828912b 100644
--- a/www/tomcat/v7/distinfo
+++ b/www/tomcat/v7/distinfo
@@ -1,10 +1,10 @@
-MD5 (apache-tomcat-7.0.25-fulldocs.tar.gz) = 1ALYw6rAJ20/21GWMAzhzA==
-MD5 (apache-tomcat-7.0.25.tar.gz) = KqWdI1VdZBsg761K7Ya2kw==
-RMD160 (apache-tomcat-7.0.25-fulldocs.tar.gz) = T9Qy9sfctBgj8Ja7NR0q++tMV/M=
-RMD160 (apache-tomcat-7.0.25.tar.gz) = fC2Utos9netPEheqXiVxCFWFiOg=
-SHA1 (apache-tomcat-7.0.25-fulldocs.tar.gz) = VTnjM0iCKPcwBo14CQ6kLE387T8=
-SHA1 (apache-tomcat-7.0.25.tar.gz) = ZChn5VzGWPbBKt8lyh5WKcnBKq4=
-SHA256 (apache-tomcat-7.0.25-fulldocs.tar.gz) = uPToyDryq/Hq/KjtdqfLPyZ93NPb7BH6Aztf2ws6sIk=
-SHA256 (apache-tomcat-7.0.25.tar.gz) = e6A7ZwO0PaaGhhP9Ylv7E6eR1XR4tKTkm9tW+fw5lLQ=
-SIZE (apache-tomcat-7.0.25-fulldocs.tar.gz) = 4729642
-SIZE (apache-tomcat-7.0.25.tar.gz) = 7527434
+MD5 (apache-tomcat-7.0.26-fulldocs.tar.gz) = BJ6JPQe3nFl33RsAdMb80w==
+MD5 (apache-tomcat-7.0.26.tar.gz) = ANMQ8vThWCGVHp0gavRcaw==
+RMD160 (apache-tomcat-7.0.26-fulldocs.tar.gz) = Tq6fSVqEXe/8mNUc8fDI3o86pyo=
+RMD160 (apache-tomcat-7.0.26.tar.gz) = K+yWigz4rro4T3gSHLtWO/lwSYk=
+SHA1 (apache-tomcat-7.0.26-fulldocs.tar.gz) = tOwLXHev6LxLUCVVUJhP+8JqAks=
+SHA1 (apache-tomcat-7.0.26.tar.gz) = dwK/gMn3ZftABDtF+Yi9zOQh9UE=
+SHA256 (apache-tomcat-7.0.26-fulldocs.tar.gz) = 0/jU03UaVXoQyv39rBd/Vehx3qzzcYeXRan1W0KZ280=
+SHA256 (apache-tomcat-7.0.26.tar.gz) = ibpf3gxZbbOIw7vSZbYwB6nMPfOo5teaRngMGjlAjLU=
+SIZE (apache-tomcat-7.0.26-fulldocs.tar.gz) = 4745058
+SIZE (apache-tomcat-7.0.26.tar.gz) = 7540233
diff --git a/www/tomcat/v7/pkg/PLIST-examples b/www/tomcat/v7/pkg/PLIST-examples
index ebed9570acb..0d248d00bff 100644
--- a/www/tomcat/v7/pkg/PLIST-examples
+++ b/www/tomcat/v7/pkg/PLIST-examples
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.3 2012/01/26 10:13:15 dcoppa Exp $
+@comment $OpenBSD: PLIST-examples,v 1.4 2012/02/24 08:45:57 dcoppa Exp $
 @conflict jakarta-tomcat-examples-*
 @pkgpath www/jakarta-tomcat/v7,-examples
 @owner _tomcat
@@ -738,6 +738,7 @@ webapps/docs/api/org/apache/catalina/util/RequestUtil.html
 webapps/docs/api/org/apache/catalina/util/ResourceSet.html
 webapps/docs/api/org/apache/catalina/util/SchemaResolver.html
 webapps/docs/api/org/apache/catalina/util/ServerInfo.html
+webapps/docs/api/org/apache/catalina/util/SessionConfig.html
 webapps/docs/api/org/apache/catalina/util/SessionIdGenerator.html
 webapps/docs/api/org/apache/catalina/util/Strftime.html
 webapps/docs/api/org/apache/catalina/util/StringParser.html
@@ -1153,8 +1154,6 @@ webapps/docs/api/org/apache/juli/logging/
 webapps/docs/api/org/apache/juli/logging/Log.html
 webapps/docs/api/org/apache/juli/logging/LogConfigurationException.html
 webapps/docs/api/org/apache/juli/logging/LogFactory.html
-webapps/docs/api/org/apache/juli/logging/UserDataHelper.Mode.html
-webapps/docs/api/org/apache/juli/logging/UserDataHelper.html
 webapps/docs/api/org/apache/juli/logging/package-frame.html
 webapps/docs/api/org/apache/juli/logging/package-summary.html
 webapps/docs/api/org/apache/juli/logging/package-tree.html
@@ -1244,6 +1243,7 @@ webapps/docs/api/org/apache/tomcat/JarScanner.html
 webapps/docs/api/org/apache/tomcat/JarScannerCallback.html
 webapps/docs/api/org/apache/tomcat/PeriodicEventListener.html
 webapps/docs/api/org/apache/tomcat/buildutil/
+webapps/docs/api/org/apache/tomcat/buildutil/CheckEol.html
 webapps/docs/api/org/apache/tomcat/buildutil/Txt2Html.html
 webapps/docs/api/org/apache/tomcat/buildutil/package-frame.html
 webapps/docs/api/org/apache/tomcat/buildutil/package-summary.html
@@ -1498,6 +1498,7 @@ webapps/docs/api/org/apache/tomcat/util/http/FastHttpDateFormat.html
 webapps/docs/api/org/apache/tomcat/util/http/HttpMessages.html
 webapps/docs/api/org/apache/tomcat/util/http/MimeHeaders.html
 webapps/docs/api/org/apache/tomcat/util/http/Parameters.html
+webapps/docs/api/org/apache/tomcat/util/http/RequestUtil.html
 webapps/docs/api/org/apache/tomcat/util/http/ServerCookie.html
 webapps/docs/api/org/apache/tomcat/util/http/fileupload/
 webapps/docs/api/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.html
@@ -1572,6 +1573,8 @@ webapps/docs/api/org/apache/tomcat/util/http/package-summary.html
 webapps/docs/api/org/apache/tomcat/util/http/package-tree.html
 webapps/docs/api/org/apache/tomcat/util/log/
 webapps/docs/api/org/apache/tomcat/util/log/SystemLogHandler.html
+webapps/docs/api/org/apache/tomcat/util/log/UserDataHelper.Mode.html
+webapps/docs/api/org/apache/tomcat/util/log/UserDataHelper.html
 webapps/docs/api/org/apache/tomcat/util/log/package-frame.html
 webapps/docs/api/org/apache/tomcat/util/log/package-summary.html
 webapps/docs/api/org/apache/tomcat/util/log/package-tree.html