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

(Portage version: 2.1.2.1)

8 files changed, 14 insertions, 153 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/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