[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/files/, www-apache/mod_jk/

[Patrice Clement]

commit:     2620cebb313f435d213434e210692a0744fb7475
Author:     Timo Gurr <timo.gurr <AT> gmail <DOT> com>
AuthorDate: Tue Jun 20 13:23:59 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 15:22:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2620cebb

www-apache/mod_jk: version bump to 1.2.42.

Gentoo-Bug: https://bugs.gentoo.org/551216

Closes: https://github.com/gentoo/gentoo/pull/4962

 www-apache/mod_jk/Manifest             |  1 +
 www-apache/mod_jk/files/88_mod_jk.conf |  5 +++
 www-apache/mod_jk/mod_jk-1.2.42.ebuild | 60 ++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index ceb4768bb50..1a3592c1ebb 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,2 +1,3 @@
 DIST tomcat-connectors-1.2.37-src.tar.gz 1528647 SHA256 38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9 SHA512 96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f WHIRLPOOL 4d6b7b24610309f0fa44951dca81e0638aa92646e171df95fa225d1f813841592c687d6204dd0be4fb03303ad84ccee3f2adf54b542ee365877e74caaa5581d4
 DIST tomcat-connectors-1.2.40-src.tar.gz 1526449 SHA256 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d SHA512 502424add813e85d725dfd0658809db113510a9ed755d24257fa4ee50224971f9cd679fad4f6b4ecbcca0a6ecd1414c86b0d08023ce123374dc28538f1e53c1c WHIRLPOOL 7a5810727987b4aa76134fd813c611ea813bbd99b68bb283fdebc77ee0e67f00676a410de01984f880611e8033e80fadbb8bc6b480df5d3c5ea4c456cb11fa4b
+DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 SHA256 ea119f234c716649d4e7d4abd428852185b6b23a9205655e45554b88f01f3e31 SHA512 9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791 WHIRLPOOL e103c1bff37b841d629b42b0a2b23f5048666f58e102da4c42571a54323454e5a799c1c2494f8641ad8b16e267954d7eb60688f4ca13b8fe12d3d81f9897565a

diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
index 60d40baba4f..1c66783cca1 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -15,6 +15,11 @@ JkWorkersFile	/etc/apache2/jk-workers.properties
 # specify the location where mod_jk is going to place its log file.
 JkLogFile	/var/log/apache2/mod_jk.log
 
+###
+### Where to put mod_jk shm file
+###
+# specify the location where mod_jk is going to place its shared memory file.
+JkShmFile	/var/log/apache2/jk-runtime-status
 
 ###
 ### Set the jk log level [debug/error/info]

diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
new file mode 100644
index 00000000000..eed7662cad2
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module java-pkg-opt-2 readme.gentoo-r1
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND=""
+
+need_apache2
+
+DOC_CONTENTS="
+	Advanced Directives and Options can be found at:
+	https://tomcat.apache.org/connectors-doc/reference/workers.html
+"
+
+pkg_setup() {
+	use java && java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--with-apxs=${APXS}
+}
+
+src_compile() {
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	newins "${CONF_DIR}/workers.properties" \
+		jk-workers.properties
+	doins "${CONF_DIR}/uriworkermap.properties"
+
+	apache-module_src_install
+
+	readme.gentoo_create_doc
+}