# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1442943449 25200
# Node ID 80635abb92eddf25ef7cf3aebd53eec94fe75a7f
# Parent  4c05a81342271e402658f2ed6e7745220336363a
21672988 mod_jk upgrade to version 1.2.41
21665244 problem in UTILITY/APACHE

diff -r 4c05a8134227 -r 80635abb92ed components/apache2-modules/mod_jk/Makefile
--- a/components/apache2-modules/mod_jk/Makefile	Wed Sep 16 02:02:30 2015 -0700
+++ b/components/apache2-modules/mod_jk/Makefile	Tue Sep 22 10:37:29 2015 -0700
@@ -18,18 +18,18 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mod_jk
-COMPONENT_VERSION=	1.2.28
+COMPONENT_VERSION=	1.2.41
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/connectors-doc/
 COMPONENT_SRC_NAME=	tomcat-connectors
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
+    sha256:f193b02aeec71daab13fc5bbb99f13eca9d916b79a024f8035a65f39559bc7fd
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
diff -r 4c05a8134227 -r 80635abb92ed components/apache2-modules/mod_jk/apache-jk.p5m
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Wed Sep 16 02:02:30 2015 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Tue Sep 22 10:37:29 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/apache-jk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,7 +27,7 @@
 set name=pkg.description \
     value="Tomcat Connector plugin for Apache Web Server Version 2.2"
 set name=com.oracle.info.description value="the Tomcat Connector plugin for Apache Web Server V2.2"
-set name=com.oracle.info.tpno value=9082
+set name=com.oracle.info.tpno value=24206
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
diff -r 4c05a8134227 -r 80635abb92ed components/apache2-modules/mod_jk/apache.license
--- a/components/apache2-modules/mod_jk/apache.license	Wed Sep 16 02:02:30 2015 -0700
+++ b/components/apache2-modules/mod_jk/apache.license	Tue Sep 22 10:37:29 2015 -0700
@@ -253,7 +253,7 @@
 
 
 Apache Tomcat Connectors
-Copyright 2002-2009 The Apache Software Foundation
+Copyright 2002-2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).