commit: 18d1534ee94f8a925cefb3f153230e2676c10758
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 02:41:15 2017 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 02:41:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d1534e
www-apache/mod_jk: cleanup vulnerable wrt sec bug #551216
www-apache/mod_jk/Manifest | 2 -
www-apache/mod_jk/mod_jk-1.2.37.ebuild | 74 ----------------------------------
www-apache/mod_jk/mod_jk-1.2.40.ebuild | 65 -----------------------------
3 files changed, 141 deletions(-)
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 1a3592c1ebb..a265d05d5df 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1 @@
-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/mod_jk-1.2.37.ebuild
b/www-apache/mod_jk/mod_jk-1.2.37.ebuild
deleted file mode 100644
index 03013156b80..00000000000
--- a/www-apache/mod_jk/mod_jk-1.2.37.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit apache-module java-pkg-2
-
-MY_P="tomcat-connectors-${PV}-src"
-
-KEYWORDS="amd64 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/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES"
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=""
-
-need_apache
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-}
-
-src_configure() {
- econf \
- --with-apxs=${APXS} \
- --with-apr-config=/usr/bin/apr-config \
- || die "econf failed"
-}
-
-src_compile() {
- emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
- # install the workers.properties file
- insinto "${APACHE_CONFDIR}"
- newins "${CONF_DIR}/workers.properties.minimal" \
- jk-workers-minimal.properties || die
- newins "${CONF_DIR}/workers.properties" \
- jk-workers.properties || die
- doins "${CONF_DIR}/uriworkermap.properties" || die
-
- # 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."
-
- elog "Advanced Directives and Options can be found at: "
- elog "http://tomcat.apache.org/connectors-doc/reference/workers.html";
-
- elog ""
- elog "JNI Worker Deprecation:"
- elog "Workers of type jni are broken since a long time."
- elog "Since there is no more use for them, they have been deprecated
now,"
- elog "and will be removed in a future release."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.40.ebuild
b/www-apache/mod_jk/mod_jk-1.2.40.ebuild
deleted file mode 100644
index aac99dff2b1..00000000000
--- a/www-apache/mod_jk/mod_jk-1.2.40.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit apache-module java-pkg-opt-2 readme.gentoo
-
-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/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-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_apache
-
-DOC_CONTENTS="
- Advanced Directives and Options can be found at:
- http://tomcat.apache.org/connectors-doc/reference/workers.html
-"
-
-pkg_setup() {
- if use java ; then
- java-pkg-2_pkg_setup
- fi
-}
-
-src_configure() {
- econf \
- --with-apxs=${APXS} \
- --with-apr-config=/usr/bin/apr-config
-}
-
-src_compile() {
- emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
-}
-
-src_install() {
- # install the workers.properties file
- insinto "${APACHE_CONFDIR}"
- newins "${CONF_DIR}/workers.properties.minimal" \
- jk-workers-minimal.properties
- newins "${CONF_DIR}/workers.properties" \
- jk-workers.properties
- doins "${CONF_DIR}/uriworkermap.properties"
-
- # call the nifty default src_install
- apache-module_src_install
-
- readme.gentoo_create_doc
-}
