Drop obsolete stripping of openjdk checks

(Portage version: 2.2.0_alpha55-r1/cvs/Linux x86_64)

3 files changed, 6 insertions, 84 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 8688fe7d8e6e..0591468cc87b 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.141 2011/09/17 18:37:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.142 2011/09/17 18:42:44 tommy Exp $
+
+  17 Sep 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> freenet-9999.ebuild,
+  -files/strip-openjdk-check.patch:
+  Drop obsolete stripping of openjdk checks
 
 *freenet-0.7.5_p1404 (17 Sep 2011)
 
diff --git a/net-p2p/freenet/files/strip-openjdk-check.patch b/net-p2p/freenet/files/strip-openjdk-check.patch
deleted file mode 100644
index 15a9e3817999..000000000000
--- a/net-p2p/freenet/files/strip-openjdk-check.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/freenet/node/Node.java	2010-11-10 21:58:45.000000000 +0100
-+++ src/freenet/node/Node.java.new	2010-11-10 21:59:53.000000000 +0100
-@@ -3792,42 +3792,42 @@
- 
- 		boolean isOpenJDK = false;
- 
--		if(jvmName.startsWith("OpenJDK ")) {
--			isOpenJDK = true;
--			if(javaVersion.startsWith("1.6.0")) {
--				String subverString;
--				if(jvmVersion.startsWith("14.0-b"))
--					subverString = jvmVersion.substring("14.0-b".length());
--				else if(jvmVersion.startsWith("1.6.0_0-b"))
--					subverString = jvmVersion.substring("1.6.0_0-b".length());
--				else
--					subverString = null;
--				if(subverString != null) {
--					int subver;
--					try {
--						subver = Integer.parseInt(subverString);
--					} catch (NumberFormatException e) {
--						subver = -1;
--					}
--				if(subver > -1 && subver < 15) {
--					File javaDir = new File(System.getProperty("java.home"));
--
--					// Assume that if the java home dir has been updated since August 11th, we have the fix.
--
--					final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
--					_cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
--					if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
--						System.err.println("Your Java appears to have been updated, we probably do not have the XML bug (http://www.cert.fi/en/reports/2009/vulnerability2009085.html).");
--					} else {
--						System.err.println("Old version of OpenJDK detected. It is possible that your Java may be vulnerable to a remote code execution vulnerability. Please update your operating system ASAP. We will not disable plugins because we cannot be sure whether there is a problem.");
--						System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
--						clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
--					}
--
--				}
--				}
--			}
--		}
-+//		if(jvmName.startsWith("OpenJDK ")) {
-+//			isOpenJDK = true;
-+//			if(javaVersion.startsWith("1.6.0")) {
-+//				String subverString;
-+//				if(jvmVersion.startsWith("14.0-b"))
-+//					subverString = jvmVersion.substring("14.0-b".length());
-+//				else if(jvmVersion.startsWith("1.6.0_0-b"))
-+//					subverString = jvmVersion.substring("1.6.0_0-b".length());
-+//				else
-+//					subverString = null;
-+//				if(subverString != null) {
-+//					int subver;
-+//					try {
-+//						subver = Integer.parseInt(subverString);
-+//					} catch (NumberFormatException e) {
-+//						subver = -1;
-+//					}
-+//				if(subver > -1 && subver < 15) {
-+//					File javaDir = new File(System.getProperty("java.home"));
-+//
-+//					// Assume that if the java home dir has been updated since August 11th, we have the fix.
-+//
-+//					final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-+//					_cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
-+//					if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
-+//						System.err.println("Your Java appears to have been updated, we probably do not have the XML bug (http://www.cert.fi/en/reports/2009/vulnerability2009085.html).");
-+//					} else {
-+//						System.err.println("Old version of OpenJDK detected. It is possible that your Java may be vulnerable to a remote code execution vulnerability. Please update your operating system ASAP. We will not disable plugins because we cannot be sure whether there is a problem.");
-+//						System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
-+//						clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
-+//					}
-+//
-+//				}
-+//				}
-+//			}
-+//		}
- 
- 		if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM name: "+jvmName+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);
- 
diff --git a/net-p2p/freenet/freenet-9999.ebuild b/net-p2p/freenet/freenet-9999.ebuild
index 97b26820df82..91ab4e273fdc 100644
--- a/net-p2p/freenet/freenet-9999.ebuild
+++ b/net-p2p/freenet/freenet-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.22 2011/09/17 18:37:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-9999.ebuild,v 1.23 2011/09/17 18:42:44 tommy Exp $
 
 EAPI="2"
 DATE=20110917
@@ -71,7 +71,6 @@ src_prepare() {
 	cp "${FILESDIR}"/freenet-0.7.5_p1389-wrapper1.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 	epatch "${FILESDIR}"/0.7.5_p1302-ext.patch \
-		"${FILESDIR}"/strip-openjdk-check.patch \
 		"${FILESDIR}"/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch \
 		"${FILESDIR}"/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
 	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \