From: James Le Cuirot <chewi@gentoo.org>
Date: Wed, 9 Sep 2015 09:04:21 +0000 (+0100)
Subject: dev-java/oracle-jre-bin: Remove PostVMInitHook to stop usage tracker
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2da2e40d3f5c7924615cad74415cb07a65089f9;p=gentoo.git

dev-java/oracle-jre-bin: Remove PostVMInitHook to stop usage tracker

Deleting the usage tracker resulted in exceptions being silently
raised in a thread and this caused havoc with debuggers. Deleting the
hook that calls it instead is a smaller change and avoids both
problems.

It is possible that Oracle may use this hook for something else
later. I have therefore added a JAVA_PKG_STRICT check to display its
contents on each merge so that we can keep an eye on it.

See bug #559936 for more details.

Package-Manager: portage-2.2.20.1
---

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
similarity index 95%
rename from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
rename to dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
index 970db2e47027..89907ab5900e 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
@@ -123,10 +123,11 @@ src_prepare() {
 		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
 	fi
 
-	# Delete Oracle's evil usage tracker. Not just because it's evil but
-	# because it breaks the sandbox during builds and we can't find any
-	# other feasible way to disable it or make it write somewhere else.
-	zip -d lib/rt.jar sun/usagetracker/\* || die
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
 }
 
 src_install() {