--- a/components/apache2-modules/mod_jk/Makefile Tue Sep 15 01:11:53 2015 -0700
+++ b/components/apache2-modules/mod_jk/Makefile Tue Sep 15 00:52:48 2015 -0700
@@ -23,17 +23,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= mod_jk
-COMPONENT_VERSION= 1.2.40
+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:895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d
+ sha256:f193b02aeec71daab13fc5bbb99f13eca9d916b79a024f8035a65f39559bc7fd
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/apache
-TPNO= 19268
+TPNO= 24206
CONFIGURE_DEFAULT_DIRS=no
DEFAULT_COMPILER=no
--- a/components/apache2-modules/mod_jk/apache.license Tue Sep 15 01:11:53 2015 -0700
+++ b/components/apache2-modules/mod_jk/apache.license Tue Sep 15 00:52:48 2015 -0700
@@ -253,7 +253,7 @@
Apache Tomcat Connectors
-Copyright 2002-2014 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/).
--- a/components/apache2-modules/mod_jk/patches/srcdir.patch Tue Sep 15 01:11:53 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-Patch origin: in-house
-Patch status: under investigation, submitted upstream
-
-https://issues.apache.org/bugzilla/show_bug.cgi?id=57060
-
---- native/common/Makefile.in 2012-05-09 13:08:26.000000000 +0000
-+++ native/common/Makefile.in 2014-09-16 12:42:37.566279820 +0000
-@@ -31,7 +31,7 @@
- OEXT=.lo
- include list.mk
-
--CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
-+CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
-
- include @top_srcdir@/scripts/build/rules.mk
-
---- native/apache-2.0/Makefile.in 2012-05-09 13:08:26.000000000 +0000
-+++ native/apache-2.0/Makefile.in 2014-09-17 09:40:13.054602402 +0000
-@@ -15,6 +15,9 @@
-
- ##
-
-+srcdir=@srcdir@
-+top_srcdir=@top_srcdir@
-+top_builddir=@top_builddir@
- APXS=@APXS@
- CP=@CP@
- APACHE_DIR=@APACHE_DIR@
-@@ -36,20 +39,20 @@
- include @APACHE_CONFIG_VARS@
-
- # Local settings ( overriding/appending to Apache's )
--COMMON=../common
--JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
-+COMMON=common
-+JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
- CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
-
-
- # Implicit rules
--include ../scripts/build/rules.mk
-+include @top_srcdir@/scripts/build/rules.mk
-
- OEXT=.lo
-
- all: Makefile @LIB_JK_TYPE@
- install: @INSTALL_TYPE@
-
--Makefile: Makefile.in
-+Makefile: ${srcdir}/Makefile.in
- echo Regenerating Makefile
- ( cd ..; ./config.status )
-
-@@ -74,11 +77,14 @@
- #################### Dynamic .so file ####################
- # APXS will compile every file, this is derived from apxs
-
-+mod_jk.lo: ${srcdir}/mod_jk.c
-+ ${LT_COMPILE}
-+
- mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
- $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
-
- mod_jk.so: mod_jk.la
-- ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
-+ @top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
-
- install_dynamic:
- @echo ""