Tomcat 6.0.44 version bump. Remove vulnerable versions. Fix security bug 549536.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 12 insertions, 38 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b3cb3cb76b22..49d6b3805ab7 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.183 2015/05/26 20:04:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.184 2015/06/03 14:56:25 monsieurp Exp $
+
+*tomcat-servlet-api-6.0.44 (03 Jun 2015)
+
+  03 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +tomcat-servlet-api-6.0.44.ebuild, -tomcat-servlet-api-6.0.41.ebuild,
+  -tomcat-servlet-api-6.0.43.ebuild:
+  Tomcat 6.0.44 version bump. Remove vulnerable versions. Fix security bug
+  549536.
 
 *tomcat-servlet-api-8.0.23 (26 May 2015)
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
deleted file mode 100644
index 1abfb3720f77..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild,v 1.5 2014/11/29 13:35:44 ago Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
index 6c815732ec09..3a2369524300 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild,v 1.1 2015/02/10 12:16:27 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild,v 1.1 2015/06/03 14:56:25 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -18,8 +18,8 @@ SLOT="2.5"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${MY_P}/"