# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1402086018 25200
# Node ID c8e10eb1df2b62281ba6e2e040a33b283505474a
# Parent  4852f4b88ee67cbe8905c1a3dc3aade894f6d38b
18920855 Upgrade Apache Tomcat to version 6.0.41
18909758 problem in UTILITY/TOMCAT
18909770 problem in UTILITY/TOMCAT
18909774 problem in UTILITY/TOMCAT
18920808 problem in UTILITY/TOMCAT

diff -r 4852f4b88ee6 -r c8e10eb1df2b components/tomcat/Makefile
--- a/components/tomcat/Makefile	Thu Jun 05 21:21:10 2014 -0700
+++ b/components/tomcat/Makefile	Fri Jun 06 13:20:18 2014 -0700
@@ -26,13 +26,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	6.0.39
+COMPONENT_VERSION=	6.0.41
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f31eba79138f5ac8223ff706fb2637205837ea44ba27c39bfb18ce9aada0f7ec
+    sha256:6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tomcat
 
diff -r 4852f4b88ee6 -r c8e10eb1df2b components/tomcat/tomcat-examples.p5m
--- a/components/tomcat/tomcat-examples.p5m	Thu Jun 05 21:21:10 2014 -0700
+++ b/components/tomcat/tomcat-examples.p5m	Fri Jun 06 13:20:18 2014 -0700
@@ -35,7 +35,7 @@
 set name=pkg.summary \
     value="Tomcat Servlet/JSP Container - example applications"
 set name=com.oracle.info.description value="the Tomcat example applications"
-set name=com.oracle.info.tpno value=17010
+set name=com.oracle.info.tpno value=17997
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
diff -r 4852f4b88ee6 -r c8e10eb1df2b components/tomcat/tomcat.p5m
--- a/components/tomcat/tomcat.p5m	Thu Jun 05 21:21:10 2014 -0700
+++ b/components/tomcat/tomcat.p5m	Fri Jun 06 13:20:18 2014 -0700
@@ -40,7 +40,7 @@
     value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tomcat Servlet/JSP Container"
 set name=com.oracle.info.description value="the Tomcat Servlet/JSP Container"
-set name=com.oracle.info.tpno value=17010
+set name=com.oracle.info.tpno value=17997
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)