dev-java/tomcat-servlet-api: removed version affected by CVE-2011-3190

Package-Manager: portage-2.1.10.14/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 20917d9a6043..c3f2032279fc 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.103 2011/09/02 10:52:25 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.104 2011/09/07 17:17:43 fordfrog Exp $
+
+  07 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  -tomcat-servlet-api-7.0.20.ebuild:
+  Removed slot 7 version affected by CVE-2011-3190
 
   02 Sep 2011; Miroslav Šulc <fordfrog@gentoo.org>
   -tomcat-servlet-api-7.0.14.ebuild, -tomcat-servlet-api-7.0.16.ebuild,
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index ce047c8db201..4c5d58e226a7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,7 +11,6 @@ DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f146
 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-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
-DIST apache-tomcat-7.0.20-src.tar.gz 4037475 RMD160 9c3cf854e98b3e4ef9e4b16cfbf11b48a7300947 SHA1 9bdffb0567c59eaa7502818ec48ca63310709cbe SHA256 7391619ee4e27b1608a8fea18b0a4677d7f2be51e4b1340c553650f1cfa1036d
 DIST apache-tomcat-7.0.21-src.tar.gz 4040831 RMD160 0648477adec2034c7678c9ca3b41f3b2e3070d6e SHA1 3c71f7a2c1e161e32a86f86daead62620c5b8100 SHA256 7381142eaebfa43f5e77098487ee857f4dc1885c0bed197812eb43adbfb04d2c
 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
@@ -24,7 +23,6 @@ EBUILD tomcat-servlet-api-6.0.28.ebuild 1011 RMD160 4f32ad1192f3b6e96057554419e0
 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-6.0.33.ebuild 1009 RMD160 b4deba53ff435c635cc872589ade80a00c6c5920 SHA1 c2db06e9501e016b947eddb627b360e08f5bc4e6 SHA256 16682b04b3dec1f9a17a505023591b6a1e0891a66743405c8c1866ec1b04518e
-EBUILD tomcat-servlet-api-7.0.20.ebuild 1114 RMD160 af4518f18cce9762f6da52450d3a26a7749c1e3c SHA1 c081eb9a350e625afbe6a3a22906f4c62c262bee SHA256 5b8890f5b9957c46cc5d97fab8097b242354ef695025c759e7c1c37ea8d5b87a
 EBUILD tomcat-servlet-api-7.0.21.ebuild 1114 RMD160 837dd2ede25257297ba1d3a2977a875428e940a0 SHA1 91d634b13db74d1bf7345bd62cc5e339f8580fbc SHA256 d1c6b64b4bbdc5be8d9bb3b0823ae7cbdbafeb4c98fdea9caaef4c7bd1b6a3cb
-MISC ChangeLog 16837 RMD160 66a3054dd7dc7c69ed16ed1f7fff4f20931cb625 SHA1 edc2ad179452f577d4b88ed91c4a3a7f1b0edf36 SHA256 fa4af05b71e3c902f1a6659f30b000fd5a58f93c167570a195e655de1210c4cd
+MISC ChangeLog 16978 RMD160 afcbae868c153477843f0996c1faf90ab32c5a70 SHA1 eca25b7c7fb0e55bc37ea429502cf215cd0172b7 SHA256 4f8991ff7af23ce91a5b6ced82bb65a346781ed4aa853f40aecc13ca9b700184
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.20.ebuild
deleted file mode 100644
index 7dc7ccfb35fa..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.20.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.20.ebuild,v 1.1 2011/08/15 09:22:50 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/
-}