From: Patrice Clement <monsieurp@gentoo.org>
Date: Sun, 6 Sep 2015 09:09:53 +0000 (+0000)
Subject: dev-java/glassfish-servlet-api: Remove vulnerable version. Fixes security bug 386353.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae016993c8fbd1b1fc3dcce9689649cbeec1e7e9;p=gentoo.git

dev-java/glassfish-servlet-api: Remove vulnerable version. Fixes security bug 386353.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---

diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
index f1854ab6cc0a..80578b1f8bbb 100644
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -1,2 +1 @@
-DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
 DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
diff --git a/dev-java/glassfish-servlet-api/files/build_xml.patch b/dev-java/glassfish-servlet-api/files/build_xml.patch
deleted file mode 100644
index 033ebd625271..000000000000
--- a/dev-java/glassfish-servlet-api/files/build_xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build.xml	2007-04-27 03:38:38.000000000 -0400
-+++ build.xml	2007-04-27 03:39:17.000000000 -0400
-@@ -28,7 +28,9 @@
-              target="dist" inheritAll="false"/>
-         <ant dir="${servlet.api.home}/src/jsr245" 
-              target="dist" inheritAll="false"/>
-+<!--
-       <antcall target="prepare-jar"/>
-+-->
-     </target>
- 
-     <!-- build pwc-->
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
deleted file mode 100644
index 795b4314ad8c..000000000000
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/-b}"
-DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
-HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
-SRC_URI="http://download.java.net/javaee5/trunk/promoted/source/glassfish-v${MY_PV}-src.zip"
-LICENSE="CDDL"
-SLOT="2.5"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/glassfish/servlet-api/"
-
-PATCHES=( "${FILESDIR}/build_xml.patch" )
-
-src_compile() {
-	eant build $(use doc || echo -Ddocs.uptodate=true)
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/src/jakarta-servletapi-5/jsr154/dist/lib/*.jar
-	java-pkg_dojar "${S}"/src/jsr245/dist/lib/*.jar
-
-	use doc && java-pkg_dojavadoc src/jsr245/build/docs/api
-	use source && java-pkg_dosrc src/*
-}