[gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: 0.7.5_p1245-strip-openjdk-check.patch freenet-0.7.5_p1232-strip-error.patch freenet-0.7.5_p1232-strip-openjdk-warning.patch

[gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: 0.7.5_p1245-strip-openjdk-check.patch freenet-0.7.5_p1232-strip-error.patch freenet-0.7.5_p1232-strip-openjdk-warning.patch

[Thomas Sachau (tommy)]

tommy       10/04/25 19:23:40

  Added:                0.7.5_p1245-strip-openjdk-check.patch
  Removed:              freenet-0.7.5_p1232-strip-error.patch
                        freenet-0.7.5_p1232-strip-openjdk-warning.patch
  Log:
  Version bump
  (Portage version: 2.2_rc67-r4/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch?rev=1.1&content-type=text/plain

Index: 0.7.5_p1245-strip-openjdk-check.patch
===================================================================
--- src/freenet/node/Node.java	2010-04-25 14:54:26.000000000 +0200
+++ src/freenet/node/Node.java.new	2010-04-25 14:55:51.000000000 +0200
@@ -3647,43 +3647,6 @@
 
 		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));
-					}
-
-				}
-				}
-			}
-		}
-
 		boolean isApple;
 
 		if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);