From: Patrice Clement <monsieurp@gentoo.org>
Date: Mon, 14 Mar 2016 21:58:42 +0000 (+0000)
Subject: dev-java/groovy: Clean up vulnerable versions. Fixes security bug 555470.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8da262ac9276f072534568445746b9aa2a86e72b;p=gentoo.git

dev-java/groovy: Clean up vulnerable versions. Fixes security bug 555470.

Package-Manager: portage-2.2.26
---

diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index d14223eb4f6b..6fafc8bb0bd7 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,3 +1 @@
 DIST groovy-2.4.5.zip 10214173 SHA256 6fbbe2c1e16bd1c56b889cbcadff04d055a96568883f885ed904265e4e9d8780 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d WHIRLPOOL c05dcb4afddc9ad217bb99d6cc9618e6a67e7f13f52b99ecc155a9b8e97079dcd8f83402cad61acdbcca4141018965320b8194a84dbf6036f2daf699a2111149
-DIST groovy-src-1.7.5.zip 12875363 SHA256 9864b36d681ecc4e4a8f86c8b958203f8e2c01c150a3f992f5f63df552979067 SHA512 fa0f617d1894e6fd7b30216b69dc3060154a31d28a3831e7135b18377c5bc368d193d914d2b77a7daf28498562fb96c04794c874101b23dafb4421e3a1d59404 WHIRLPOOL 478346b89661f6b57cc5740df038e8bf3ced62a84a4de1dea3da94a9519cae6eba43cf583c4a81b2f459f6409a7387c2079098b12495b9f1b669260af4efaccb
-DIST groovy-src-1.8.5.zip 13131836 SHA256 82f1e45e5886278a4c86ed15dfd90a84b7e43848c72537a235835c7557e8f8cd SHA512 23cddae38b6d0b1b83dae7cf7ebc3fe68f7e8ddb33cd6fa421c0c3c76ca8bf5a8b3fe72cabe915901305f513a2b3269baf205a7a0dd6b1c6f751496d51e0557a WHIRLPOOL 9db6d1da9304e8000de9954faf91d26d76c15e628a25a09c1291afc2ca8b33bbe24d44d891599548df6931db632ae6cd801e83cb05fb6abf33f3282f463a4482
diff --git a/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch b/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
deleted file mode 100644
index d857afffca1d..000000000000
--- a/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/build.xml b/build.xml
-index ffca39c..07d93b9 100644
---- a/build.xml
-+++ b/build.xml
-@@ -830,6 +830,7 @@ $Date: 2012/01/28 09:43:04 $
-                 <path refid="toolsPath"/>
-                 <pathelement path="${mainClassesDirectory}"/>
-             </classpath>
-+	    <jvmarg value="-Duser.home=${user.home}" />
-             <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
-             <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>
-             <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>
diff --git a/dev-java/groovy/groovy-1.7.5.ebuild b/dev-java/groovy/groovy-1.7.5.ebuild
deleted file mode 100644
index 8c2decd8bd7d..000000000000
--- a/dev-java/groovy/groovy-1.7.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
-# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
-
-# We currently do not build the embeddable jar (which is created using JarJar).
-# We could provide that via a USE flag.
-# We also don't use automatic build rewriting as there seems to be already some level of support
-# in the upstream build system
-
-# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
-# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
-
-EAPI="3"
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV/_rc/-RC-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-
-SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
-LICENSE="codehaus-groovy"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND=">=dev-java/asm-3.2
-	>=dev-java/ant-core-1.8.0
-	>=dev-java/junit-4.6
-	dev-java/antlr:0
-	dev-java/xstream
-	dev-java/jline
-	dev-java/commons-cli
-	dev-java/jansi
-	dev-java/servletapi:2.4
-	>=dev-java/bsf-2.4
-	java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.5
-	!<dev-java/groovy-1.6.3
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-ivy:2
-	doc? (
-		dev-java/qdox
-	)
-	test? (
-		dev-java/jmock
-		dev-java/xmlunit
-		dev-db/hsqldb
-		dev-java/commons-logging
-		dev-java/ant-junit
-		dev-java/ant-trax
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_PKG_BSFIX=""
-
-src_prepare() {
-	rm -rf bootstrap
-	# security directory is needed for tests, but they currently don't pass
-	#rm -rf security
-	mkdir -p target/lib && cd target/lib
-	mkdir compile && mkdir runtime && mkdir tools
-	cd compile
-
-	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
-	java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
-	java-pkg_jar-from --virtual jmx
-	java-pkg_jar-from --build-only ant-ivy:2
-	use doc && java-pkg_jar-from --build-only qdox-1.6,ant-antlr
-}
-
-src_compile() {
-	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
-		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
-
-	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
-	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
-}
-
-src_test() {
-	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
-
-	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
-
-	cd "${S}"
-	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
-		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
-}
-
-src_install() {
-	java-pkg_newjar "target/dist/${PN}.jar"
-	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
-
-	# FIXME: install those two later
-	#
-	#use doc && java-pkg_dojavadoc "target/html/api/"
-	#use doc && java-pkg_dojavadoc "target/html/gapi/"
-
-	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
-	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
-	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
-	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
-	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
-}
diff --git a/dev-java/groovy/groovy-1.8.5-r1.ebuild b/dev-java/groovy/groovy-1.8.5-r1.ebuild
deleted file mode 100644
index bd4c6187cf21..000000000000
--- a/dev-java/groovy/groovy-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
-# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
-
-# We currently do not build the embeddable jar (which is created using JarJar).
-# We could provide that via a USE flag.
-# We also don't use automatic build rewriting as there seems to be already some level of support
-# in the upstream build system
-
-# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
-# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
-
-EAPI="3"
-WANT_ANT_TASKS="ant-antlr"
-JAVA_PKG_IUSE="doc source"
-
-inherit base versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV/_rc/-RC-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-
-SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
-LICENSE="codehaus-groovy"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-RESTRICT="test"
-
-CDEPEND=">=dev-java/asm-3.2:3
-	>=dev-java/ant-core-1.8.0:0
-	>=dev-java/junit-4.6:4
-	dev-java/antlr:0
-	dev-java/xstream:0
-	dev-java/jline:0
-	dev-java/commons-cli:1
-	dev-java/jansi:0
-	java-virtuals/servlet-api:2.4
-	>=dev-java/bsf-2.4:2.3
-	java-virtuals/jmx:0"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-ivy:2
-	doc? (
-		dev-java/qdox:1.12
-		dev-java/commons-logging:0
-	)
-	test? (
-		dev-java/jmock:1.0
-		dev-java/xmlunit:1
-		dev-db/hsqldb:0
-		dev-java/commons-logging:0
-		dev-java/ant-junit:0
-		dev-java/ant-trax:0
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8-build-pref-locking-fix.patch" )
-
-JAVA_PKG_BSFIX=""
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e 's/fullQualifiedName/fullyQualifiedName/g' \
-		src/tools/org/codehaus/groovy/tools/DocGenerator.groovy
-
-	rm -rf bootstrap
-	# security directory is needed for tests, but they currently don't pass
-	#rm -rf security
-	mkdir -p target/lib && cd target/lib
-	mkdir compile && mkdir runtime && mkdir tools
-	cd compile
-
-	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-3,xstream,jansi
-	java-pkg_jar-from jline,junit,servlet-api-2.4,bsf-2.3
-	java-pkg_jar-from --virtual jmx
-	java-pkg_jar-from --build-only ant-ivy:2
-	use doc && java-pkg_jar-from --build-only qdox-1.12,ant-antlr,commons-logging
-}
-
-src_compile() {
-	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
-		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
-
-	use doc && ANT_TASKS="ant-antlr" ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
-	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
-}
-
-src_test() {
-	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
-
-	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
-
-	cd "${S}"
-	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
-		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
-}
-
-src_install() {
-	java-pkg_newjar "target/dist/${PN}.jar"
-	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
-
-	# FIXME: install those two later
-	#
-	#use doc && java-pkg_dojavadoc "target/html/api/"
-	#use doc && java-pkg_dojavadoc "target/html/gapi/"
-
-	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
-	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
-	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
-	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
-	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
-}