Version bump, fixes bug #112225 and bug #110170.

Package-Manager: portage-2.1.1_pre3-r3

5 files changed, 97 insertions, 14 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index b13e071dfcff..b43688d28d83 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.7 2006/05/26 09:51:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.8 2006/07/23 09:31:44 nelchael Exp $
+
+*mod_jk-1.2.15 (23 Jul 2006)
+
+  23 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> files/88_mod_jk.conf,
+  +mod_jk-1.2.15.ebuild:
+  Version bump, fixes bug #112225 and bug #110170.
 
   26 May 2006; <nixnut@gentoo.org> mod_jk-1.2.13.ebuild:
   Added ~ppc. bug #134330
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 0a4012f132b4..c9d2161339f6 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 88_mod_jk.conf 5392 RMD160 42e8bd973d9eccc9df13c74b8981b44638e01383 SHA1 225c191705d3f6d4ebfdba90e5992288dbb433c5 SHA256 1e56489bb8f68ce25e6a3497456a16b1fae0a54ead6306537bb13cf9221487d7
-MD5 1e8094206c6318f27770a5d0062d59d6 files/88_mod_jk.conf 5392
-RMD160 42e8bd973d9eccc9df13c74b8981b44638e01383 files/88_mod_jk.conf 5392
-SHA256 1e56489bb8f68ce25e6a3497456a16b1fae0a54ead6306537bb13cf9221487d7 files/88_mod_jk.conf 5392
+AUX 88_mod_jk.conf 5391 RMD160 840beec20a576b630c571d26fbf3e61722991810 SHA1 dbbf75f2d9427441496786c6767b62231deb12db SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf
+MD5 eecf40590474fbcdb54010d1f8525e49 files/88_mod_jk.conf 5391
+RMD160 840beec20a576b630c571d26fbf3e61722991810 files/88_mod_jk.conf 5391
+SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf files/88_mod_jk.conf 5391
 AUX jk-workers.properties 1034 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f SHA1 c1a1619fd51b8825fc1c464aeabd5a7597515733 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d
 MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034
 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
 DIST jakarta-tomcat-connectors-1.2.10-src.tar.gz 825352
 DIST jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
+DIST jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463 RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 SHA1 c9a67de4e03d6d7780cf0b14284f62d30bb78156 SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641
 EBUILD mod_jk-1.2.10.ebuild 1623 RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 SHA1 ce8cfe4232a724b37eb3c3f1e19fbe6a51f722a4 SHA256 054ee3e14468c6e543efed3f2ea0870fb52ece4641746a24299a8ddf61433603
 MD5 8e8673e565394d4acade788257281555 mod_jk-1.2.10.ebuild 1623
 RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 mod_jk-1.2.10.ebuild 1623
@@ -19,10 +20,14 @@ EBUILD mod_jk-1.2.13.ebuild 1624 RMD160 b180861ada2449d71512183726048616982deb0e
 MD5 1c0b965430b130f56e26a1a59086cb3e mod_jk-1.2.13.ebuild 1624
 RMD160 b180861ada2449d71512183726048616982deb0e mod_jk-1.2.13.ebuild 1624
 SHA256 e845730af5f6631df995f98fabc2a716641e5f279fa918227850343b5079c9dd mod_jk-1.2.13.ebuild 1624
-MISC ChangeLog 1424 RMD160 74359f301d08ce000d8647f380af1dbe33bd5ae6 SHA1 df3116a2fdca3c16ca0f761f29cd7630fb741ac5 SHA256 49556bdbd6a4624e138bda10dd36e70338115e6183990954b73716cc18dc3700
-MD5 29be28079d596d71e0e2983a120046d5 ChangeLog 1424
-RMD160 74359f301d08ce000d8647f380af1dbe33bd5ae6 ChangeLog 1424
-SHA256 49556bdbd6a4624e138bda10dd36e70338115e6183990954b73716cc18dc3700 ChangeLog 1424
+EBUILD mod_jk-1.2.15.ebuild 1746 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 SHA1 12254394a4a3a307c8e3da90b00334303b9c07d1 SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c
+MD5 097f26a843471eaaf31f6bd28e32f81d mod_jk-1.2.15.ebuild 1746
+RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 mod_jk-1.2.15.ebuild 1746
+SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c mod_jk-1.2.15.ebuild 1746
+MISC ChangeLog 1608 RMD160 cc5d1fa6208c747b6d26051f8ddbc2b18bfa4f94 SHA1 f7449f044113c85d432972bdce6caec9018e4a43 SHA256 c9b48f9e9a26868046ee53528b791d393992ed263357599a70a44c162c1ea180
+MD5 b60bd1cd5df055a8c93a02ece6894d25 ChangeLog 1608
+RMD160 cc5d1fa6208c747b6d26051f8ddbc2b18bfa4f94 ChangeLog 1608
+SHA256 c9b48f9e9a26868046ee53528b791d393992ed263357599a70a44c162c1ea180 ChangeLog 1608
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -33,10 +38,13 @@ SHA256 4a5e0ad580f0cb449794bcd03b44e65f2de6654906fdf9a9f2ad8d232cb29951 files/di
 MD5 0a5d4f7b9130e9a14216fc10df29468a files/digest-mod_jk-1.2.13 88
 RMD160 2b9e6a07650770cdcc074d33f0286783ad607767 files/digest-mod_jk-1.2.13 88
 SHA256 70ec509a789992879712625d0479c2fa127a1aa9f30dbf7111808661908074bc files/digest-mod_jk-1.2.13 88
+MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15 310
+RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15 310
+SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15 310
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEds+BoFw4q70f3SsRAuoxAKCUetvPlUOtEUFj+fJiXUIPutOwRQCcC5Yx
-PsQ2slRxFNalilchJ95yN9Y=
-=KyKA
+iD8DBQFEw0IKgo/w9rxVVVERAml1AJ49+j3rOJERFbAFsGKTig4b1WUXmgCgplq9
+rV5JypT3ySfQNxvFqZ/xfkk=
+=Viid
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
index 4044a18326ac..4ee73d13ef7c 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -22,7 +22,7 @@ JkLogFile	logs/mod_jk.log
 # info log will contains standard mod_jk activity (default).
 # error log will contains also error reports.
 # debug log will contains all informations on mod_jk activity
-#JkLogLevel	info
+JkLogLevel	info
 
 
 ###
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.15 b/www-apache/mod_jk/files/digest-mod_jk-1.2.15
new file mode 100644
index 000000000000..915a2d7dadc5
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.15
@@ -0,0 +1,3 @@
+MD5 b815a666329f7de097775113547539e0 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
diff --git a/www-apache/mod_jk/mod_jk-1.2.15.ebuild b/www-apache/mod_jk/mod_jk-1.2.15.ebuild
new file mode 100644
index 000000000000..4e8021bfa884
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.15.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.15.ebuild,v 1.1 2006/07/23 09:31:44 nelchael Exp $
+
+inherit apache-module java-utils-2
+
+MY_P="jakarta-tomcat-connectors-${PV}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc"
+SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="apache2"
+
+DEPEND=">=virtual/jdk-1.4"
+S="${WORKDIR}/${MY_P}/jk/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+DOCFILES="CHANGES.txt README"
+
+need_apache
+
+src_compile() {
+	local apxs
+	local java_args
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+	java_args="--with-java-home=${JAVA_HOME} --enable-jni"
+
+	econf \
+		--with-apxs=${apxs} \
+		--with-apr-config=/usr/bin/apr-config \
+		${java_args} \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	local confdir=""
+	use apache2 && confdir="/etc/apache2"
+	use apache2 || confdir="/etc/apache"
+
+	dodir ${confdir}
+	insinto ${confdir}
+	doins ${FILESDIR}/jk-workers.properties
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
+	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
+	einfo "your own."
+}