dev-java/tomcat-servlet-api: removed version affected by security issue

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 6 insertions, 40 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b5e791669732..a597e4ed0c94 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.96 2011/05/14 11:38:42 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.97 2011/05/17 12:53:53 fordfrog Exp $
+
+  17 May 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  -tomcat-servlet-api-7.0.12.ebuild:
+  Removing version 7.0.12, affected by CVE-2011-1582
 
 *tomcat-servlet-api-7.0.14 (14 May 2011)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a36e30094d0f..d3f7a3e12aac 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,7 +10,6 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
-DIST apache-tomcat-7.0.12-src.tar.gz 3873145 RMD160 fc2785ae050378096c5a5879421345c9b11e9c6b SHA1 cd0f0e4c1f98c7c7b4085c613edc1a08e2cd6637 SHA256 87d6d5ca402c1c08da40e2ffaae72eb7b1a3448ca0429ffa561ed130842295d8
 DIST apache-tomcat-7.0.14-src.tar.gz 3898052 RMD160 7361f27ea40cbbe0e431c8dc5e39794cfe271b4b SHA1 ef717f131ff27fc52e8949ceb15eceec806ebf84 SHA256 2d50f2f67c0e2e711cb5119739ac8752c15bc6732f4c8eaf85fe00008103fb17
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 1020 RMD160 3ff4d9ad796f8ab50184cb320ea4ea70dbed90f8 SHA1 274595f3f036af8e7070485848126279b5a0459b SHA256 db3bb41efebee7c7a34a4ec5366ea161f6a4617af17e52ef62229197572bdce6
@@ -22,7 +21,6 @@ EBUILD tomcat-servlet-api-6.0.26.ebuild 1003 RMD160 b20f524bf4727d8025451a83f287
 EBUILD tomcat-servlet-api-6.0.28.ebuild 1011 RMD160 4f32ad1192f3b6e96057554419e04c90f4496cf8 SHA1 1dd611dcf0edcbc41d0141251c027f42ca0068a8 SHA256 8f05c975ef63c5f9037d73d276f2421e59f4e421a9c1b33be3d9a3682cbd9e08
 EBUILD tomcat-servlet-api-6.0.29.ebuild 1009 RMD160 fb863534c730913179f0e4c401d15e211ce5ff0e SHA1 dff3d348ba11015bfe0bfe62f36883da56b33b47 SHA256 1d8a7eef754546daff07695a76c11434845cb1b4f0e2508825526097b50ddce5
 EBUILD tomcat-servlet-api-6.0.32.ebuild 1005 RMD160 c8e74032f6786421216f83c2745a1382158ec7ca SHA1 d7296f1815a04d36790616e369311c4364276f1a SHA256 e0104a014337a4805370254e92f2257b7208fa8cb3f4a5729bee9b6a3cda5ea4
-EBUILD tomcat-servlet-api-7.0.12.ebuild 1114 RMD160 c4d66e0f4a129c89d5d1d2fcd5dfa6064b919d20 SHA1 7f8520069f39633d445560e677d6cdba783f889d SHA256 639515c3b05682d17f6b81fad016abae1dbe5f415d8a2e0a3a45a60b5c530b85
 EBUILD tomcat-servlet-api-7.0.14.ebuild 1114 RMD160 90554830aa274acc09251489c806d1cfb46f5485 SHA1 19ce6302ee550bfc4303dad8afe9e210b2e199b4 SHA256 171b00f754107e8bcb0373bd43fb5bcb1636b3b87027586409fbd194f881f1b5
-MISC ChangeLog 15773 RMD160 cd3178d56a5d227d801a99d7b7f58132992791d6 SHA1 0d379a74cb75b13be81e0fe352d2de57adfb7624 SHA256 b399abe2a2e0e03100a82becdc082a734067e049dec6951028019a965e488fcf
+MISC ChangeLog 15916 RMD160 4a0010f07401b4a5bf9444076191d67e52449674 SHA1 f5b12fc1fc1d653d12b8864762edf24828187e01 SHA256 824ce1b9e442d856b8003f7f31b3c1cc57bf3f784c65ffebbafb2a75a10edc89
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.12.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.12.ebuild
deleted file mode 100644
index afafed1bb9b4..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 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-7.0.12.ebuild,v 1.1 2011/04/07 14:11:18 fordfrog Exp $
-
-EAPI="2"
-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 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}