dev-java/tomcat-servlet-api: removed tomcat 7.x versions with security vulnerability

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

4 files changed, 7 insertions, 78 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index cde4b3f96d97..966d70ef15be 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,11 @@
 # 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.93 2011/03/11 16:30:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.94 2011/03/13 00:07:16 fordfrog Exp $
+
+  13 Mar 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  -tomcat-servlet-api-7.0.8.ebuild, -tomcat-servlet-api-7.0.10.ebuild:
+  Removed tomcat 7.x versions affected by security vulnerability as stated in
+  bug #358607
 
   11 Mar 2011; Miroslav Šulc <fordfrog@gentoo.org>
   -tomcat-servlet-api-7.0.5.ebuild, -tomcat-servlet-api-7.0.6.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8b142279f8dc..88a4070ad93d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,9 +10,7 @@ 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.10-src.tar.gz 3841847 RMD160 f9fa3c6a4d6912c466ed4e31a4df3da23cf954d6 SHA1 fc05c8a99f4e6c7e88fe0dfb15991e4f5fdb903a SHA256 b4e94314c7b619aac719712da41c501a907c016d97566cc84e487bfafcc2ad76
 DIST apache-tomcat-7.0.11-src.tar.gz 3846862 RMD160 6fdd09877b2655239406cf1ca8fd5919aadb2575 SHA1 e3abc434b8bae29761c552f7cd815ec182caebf4 SHA256 ebd0a840a7932fbdf476e10156f3e28ebcc16501e536051e992f3363f6ac7953
-DIST apache-tomcat-7.0.8-src.tar.gz 3819953 RMD160 68e02b33b80528f24cf6ff165c28f2e159a275e8 SHA1 08872dad8580061e9dc74bdc36b6d72d5927381f SHA256 3287376f530454c603f42114333b73fd1a58501f520f4f1261fd2c36112ce060
 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
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1132 RMD160 0015dbbe52367b5f0b984dc2c6238a8976122667 SHA1 9445f4f17a3ee1009177ed614cba92214e31f05c SHA256 53159cd44962ea7175a0bdb4c62500f2ba59a00382ea4e1caf3f9fd643a429af
@@ -23,8 +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.10.ebuild 1114 RMD160 e9b03c40b120f832feb49639bf726aa51448b440 SHA1 c50ca3a7518c5a1853c133ac4772a83a14fe7851 SHA256 bcda62b2fb7103a2cc64f93f521fdab047ea134ed37d01048d1f93f9c7a494a3
 EBUILD tomcat-servlet-api-7.0.11.ebuild 1114 RMD160 638eecff38011913aee207168c9f0d9bfaf4cf5f SHA1 dbb9e7fae201ad811d934c11dd4a421e96a9383d SHA256 d518448f62aaa4f641a0340aab5eb3cac7c392f59f5d65e18cc455f2b8eb92b4
-EBUILD tomcat-servlet-api-7.0.8.ebuild 1113 RMD160 66970e4f377275bccb9ba5c5637431ee2896a4de SHA1 21dc00448193f9a5635170e597d8338d10611b2e SHA256 1aaa801a884b57c1b45af0d3de317ae9c4dcab375797ace0d4cb7270f01793d5
-MISC ChangeLog 15160 RMD160 053332deb60cd1c3a4280725ffc40071979baa2b SHA1 c8a14f68409cfe56bd2a825bc8ce26433afb2f96 SHA256 63030c65248b47bdcfdf669947d1fc6210678cb8a81a5ae9bf542f4206da39df
+MISC ChangeLog 15376 RMD160 51fcd8767f0a8b332019fc02363d0184be537908 SHA1 fe2adc511a66dec7a81a12b38cc2c0747be079ea SHA256 f778d17730c3e488264b76f0b76cc4df0ed57d7b7226ba61e351681ba7a74d24
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.10.ebuild
deleted file mode 100644
index f916e9d38918..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.10.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.10.ebuild,v 1.1 2011/03/08 16:43:48 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/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.8.ebuild
deleted file mode 100644
index 9449de51ec85..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.8.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.8.ebuild,v 1.1 2011/02/10 11:37:55 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/
-}