Removed versions that have a security vulnerability per bug #169433. Corrected file path issue with modules conf file.

Package-Manager: portage-2.1.2.1

9 files changed, 29 insertions, 184 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 9f7249febfbc..0c186878b287 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.25 2007/03/08 14:12:25 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.26 2007/03/08 16:04:50 wltjr Exp $
+
+*mod_jk-1.2.21-r2 (08 Mar 2007)
+
+  08 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/88_mod_jk.conf, -mod_jk-1.2.19-r1.ebuild, -mod_jk-1.2.20-r1.ebuild,
+  -mod_jk-1.2.21-r1.ebuild, +mod_jk-1.2.21-r2.ebuild:
+  Removed versions that have a security vulnerability per bug #169433.
+  Corrected file path issue with modules conf file.
 
   08 Mar 2007; Steve Dibb <beandog@gentoo.org> mod_jk-1.2.21-r1.ebuild:
   amd64 stable, security bug 169433
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 1ecbd811491e..19e6bb3199c8 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,40 +1,24 @@
-AUX 88_mod_jk.conf 5413 RMD160 c819778af79a218c1be50dd44926dc76186abcd8 SHA1 dcdcd25c9f4f809e2e2fd7bde194dbb87f0e3ad4 SHA256 6d094519669eddb1407d52c346f13dd930bf4aa2509dfef5fbd9146e76f82432
-MD5 ff72392876e555a587c311d19aceca22 files/88_mod_jk.conf 5413
-RMD160 c819778af79a218c1be50dd44926dc76186abcd8 files/88_mod_jk.conf 5413
-SHA256 6d094519669eddb1407d52c346f13dd930bf4aa2509dfef5fbd9146e76f82432 files/88_mod_jk.conf 5413
+AUX 88_mod_jk.conf 5413 RMD160 f4ca8cf6841180f37501f32f7b28ba49ca754bdc SHA1 2e3ad055d8f64979554455fd3b3273b216622963 SHA256 3b7c0b4cbf62d6df0f3eb2a0a9ca6a58816f73098c3f8f775ffef8b19868de5e
+MD5 702378d441773b194f7a8df5d0af57df files/88_mod_jk.conf 5413
+RMD160 f4ca8cf6841180f37501f32f7b28ba49ca754bdc files/88_mod_jk.conf 5413
+SHA256 3b7c0b4cbf62d6df0f3eb2a0a9ca6a58816f73098c3f8f775ffef8b19868de5e files/88_mod_jk.conf 5413
 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 tomcat-connectors-1.2.19-src.tar.gz 1246419 RMD160 f48895b847b84a77f95ec87faa47115b023f686f SHA1 7e49c98000455ea226b16c45cf63fd565c2221eb SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0
-DIST tomcat-connectors-1.2.20-src.tar.gz 1316612 RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc SHA1 716b61ffa137067c1df9fb1b0a5d81f6969a181a SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610
 DIST tomcat-connectors-1.2.21-src.tar.gz 1334563 RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d SHA1 77b110d91ef0f3574bf74fa1dd37802def361ea6 SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa
-EBUILD mod_jk-1.2.19-r1.ebuild 1910 RMD160 d6769f5c04b7f02259722d342b6271abc08c5f04 SHA1 0f7f43d53479824a1d320da07350dda2beb3666d SHA256 e1bf4ab867d2c5697a0de3844bdf26290a462e0b2d54e756d38d61864994e97b
-MD5 0282c811a6d82ce6f09542bef243583e mod_jk-1.2.19-r1.ebuild 1910
-RMD160 d6769f5c04b7f02259722d342b6271abc08c5f04 mod_jk-1.2.19-r1.ebuild 1910
-SHA256 e1bf4ab867d2c5697a0de3844bdf26290a462e0b2d54e756d38d61864994e97b mod_jk-1.2.19-r1.ebuild 1910
-EBUILD mod_jk-1.2.20-r1.ebuild 1549 RMD160 810cf749054b28f7472d0da8eb67effcf778f8a8 SHA1 0245a14219ceb3b94083125e0993493b44c99290 SHA256 bd029cb352a9f926ba3776176cd1676c0175badc1e2681da13cde8cdb6e9b01c
-MD5 0d7dec6e62f38a7b562391f3f0f6547d mod_jk-1.2.20-r1.ebuild 1549
-RMD160 810cf749054b28f7472d0da8eb67effcf778f8a8 mod_jk-1.2.20-r1.ebuild 1549
-SHA256 bd029cb352a9f926ba3776176cd1676c0175badc1e2681da13cde8cdb6e9b01c mod_jk-1.2.20-r1.ebuild 1549
-EBUILD mod_jk-1.2.21-r1.ebuild 1716 RMD160 4bf35081e39a90a934b3de34dee85e39bc868e2f SHA1 e359367eaabb368ada56cbc14b72f521ffea51c5 SHA256 b26237bc10dab2a9d3153c28d467fe458a164b3f21cfe59d67f57e68a20b65dc
-MD5 ae2f597f0a9b4fb618406acee92f11c7 mod_jk-1.2.21-r1.ebuild 1716
-RMD160 4bf35081e39a90a934b3de34dee85e39bc868e2f mod_jk-1.2.21-r1.ebuild 1716
-SHA256 b26237bc10dab2a9d3153c28d467fe458a164b3f21cfe59d67f57e68a20b65dc mod_jk-1.2.21-r1.ebuild 1716
-MISC ChangeLog 4787 RMD160 f71bb20937ee794dfc883ab665506e1c6edc51ec SHA1 22aa9a9cc208f1569e90d9b40ccdb5ba08c31272 SHA256 b316c12ffca458b26d45d8eec770e723befe950c6a2ae6e5733f00b861d0fd93
-MD5 307adb6c622f3603ea90c955bd1e60ec ChangeLog 4787
-RMD160 f71bb20937ee794dfc883ab665506e1c6edc51ec ChangeLog 4787
-SHA256 b316c12ffca458b26d45d8eec770e723befe950c6a2ae6e5733f00b861d0fd93 ChangeLog 4787
+EBUILD mod_jk-1.2.21-r2.ebuild 1729 RMD160 2b4ba0e64a3dbecfab480166c9c3e66800303167 SHA1 e989e6d7c4447c4859fcd3346dcffd40185b5f3e SHA256 152f40d4d8619ffec91aec32b094e0b468b0f3f64c5ed46ff6c229de26f918cc
+MD5 0becf8b087da28c3f84a78f5230e5c8f mod_jk-1.2.21-r2.ebuild 1729
+RMD160 2b4ba0e64a3dbecfab480166c9c3e66800303167 mod_jk-1.2.21-r2.ebuild 1729
+SHA256 152f40d4d8619ffec91aec32b094e0b468b0f3f64c5ed46ff6c229de26f918cc mod_jk-1.2.21-r2.ebuild 1729
+MISC ChangeLog 5129 RMD160 6da98f922eb362a84a092c06191c31274a487fa3 SHA1 8dcf8e8105fd23b4ea46f868f1f6c8f358d37be3 SHA256 ebd80a68541e0f822303a021895fd15f67f352da1cf6c34e6c16a3fb225176dd
+MD5 2343b9e467d338ac5239aa352aa43987 ChangeLog 5129
+RMD160 6da98f922eb362a84a092c06191c31274a487fa3 ChangeLog 5129
+SHA256 ebd80a68541e0f822303a021895fd15f67f352da1cf6c34e6c16a3fb225176dd ChangeLog 5129
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
 SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f metadata.xml 490
-MD5 6a1a77b35ef40de8cea74b541da1086b files/digest-mod_jk-1.2.19-r1 289
-RMD160 697b2e65cc081d5e40685b670d61f0992d46a628 files/digest-mod_jk-1.2.19-r1 289
-SHA256 82a579b49926d41fc56a3e3866a8b00c430e49b455a50d31a3133a87ae07a221 files/digest-mod_jk-1.2.19-r1 289
-MD5 351803f1828843b33d077f268ce7697c files/digest-mod_jk-1.2.20-r1 289
-RMD160 300a2ff8289cd5721e1dd04b0b8bb6fc08b7fe2d files/digest-mod_jk-1.2.20-r1 289
-SHA256 e02255ee932a8ec7fe4d9bd14d03d4ed317bd86ae39bcf5da3cc18c467756a8a files/digest-mod_jk-1.2.20-r1 289
-MD5 bfb38ada368b556843143972158bd03f files/digest-mod_jk-1.2.21-r1 289
-RMD160 50d1681f5733e770bbfbdeaf86a0ba890a89bc26 files/digest-mod_jk-1.2.21-r1 289
-SHA256 51d6699d225cf9d6ca08e83085169e088bf9a48d1664efff0020454290409b1c files/digest-mod_jk-1.2.21-r1 289
+MD5 bfb38ada368b556843143972158bd03f files/digest-mod_jk-1.2.21-r2 289
+RMD160 50d1681f5733e770bbfbdeaf86a0ba890a89bc26 files/digest-mod_jk-1.2.21-r2 289
+SHA256 51d6699d225cf9d6ca08e83085169e088bf9a48d1664efff0020454290409b1c files/digest-mod_jk-1.2.21-r2 289
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
index 4dd0df6c2c36..2830dcc63ac2 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -13,7 +13,7 @@ JkWorkersFile	/etc/apache2/jk-workers.properties
 ### Where to put mod_jk logs
 ###
 # specify the location where mod_jk is going to place its log file.
-JkLogFile	/etc/apache2/log/mod_jk.log
+JkLogFile	/var/log/apache2/mod_jk.log
 
 
 ###
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1
deleted file mode 100644
index 068380b5cd69..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c3b7135a4992c7f39d5f7aef9c25b30 tomcat-connectors-1.2.19-src.tar.gz 1246419
-RMD160 f48895b847b84a77f95ec87faa47115b023f686f tomcat-connectors-1.2.19-src.tar.gz 1246419
-SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0 tomcat-connectors-1.2.19-src.tar.gz 1246419
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1
deleted file mode 100644
index fbc0dafee4d2..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f10709339009b3be9398d3a838d9cabd tomcat-connectors-1.2.20-src.tar.gz 1316612
-RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc tomcat-connectors-1.2.20-src.tar.gz 1316612
-SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 tomcat-connectors-1.2.20-src.tar.gz 1316612
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r2
index 4ee079f49367..4ee079f49367 100644
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r2
diff --git a/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild
deleted file mode 100644
index 09dbf537a5df..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 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.19-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $
-
-inherit apache-module autotools java-pkg-opt-2
-
-MY_P="tomcat-connectors-${PV}-src"
-
-KEYWORDS="amd64 ~ppc x86"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
-HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="java"
-
-DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
-APACHE1_MOD_CONF="88_${PN}"
-APACHE1_MOD_DEFINE="JK"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES.txt README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	local apxs
-	local java_args
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-	use java && java_args="--with-java-home=${JAVA_HOME} \
-				--with-java-platform=2 --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 "emake failed"
-}
-
-src_install() {
-	# install the workers.properties file
-	insinto "${APACHE_CONFDIR}"
-	doins "${FILESDIR}/jk-workers.properties"
-
-	# if using java, install the jni stuff
-	if use java ; then
-		insinto "${APACHE_MODULESDIR}"
-		doins "${S}/jni/jk_jnicb.so"
-	fi
-
-	# call the nifty default src_install :-)
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	elog "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	elog "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	elog "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild
deleted file mode 100644
index b684d6589301..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 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.20-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $
-
-inherit apache-module autotools
-
-MY_P="tomcat-connectors-${PV}-src"
-
-KEYWORDS="amd64 ~ppc x86"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
-HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
-APACHE1_MOD_CONF="88_${PN}"
-APACHE1_MOD_DEFINE="JK"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES.txt README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-
-	econf \
-		--with-apxs=${apxs} \
-		--with-apr-config=/usr/bin/apr-config \
-		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
-	# install the workers.properties file
-	insinto "${APACHE_CONFDIR}"
-	doins "${FILESDIR}/jk-workers.properties"
-
-	# call the nifty default src_install :-)
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	elog "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	elog "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	elog "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild
index bc77692156ac..4725486dcde6 100644
--- a/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 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.21-r1.ebuild,v 1.3 2007/03/08 14:12:25 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21-r2.ebuild,v 1.1 2007/03/08 16:04:50 wltjr Exp $
 
 inherit apache-module autotools
 
 MY_P="tomcat-connectors-${PV}-src"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol."
 HOMEPAGE="http://tomcat.apache.org/connectors-doc/"
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+
 S="${WORKDIR}/${MY_P}/native"
 
 APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
@@ -25,7 +26,7 @@ APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_CONF="88_${PN}"
 APACHE2_MOD_DEFINE="JK"
 
-DOCFILES="README"
+DOCFILES="CHANGES.txt README"
 
 need_apache