| 1 |
tommy 10/04/25 19:23:40 |
| 2 |
|
| 3 |
Added: 0.7.5_p1245-strip-openjdk-check.patch |
| 4 |
Removed: freenet-0.7.5_p1232-strip-error.patch |
| 5 |
freenet-0.7.5_p1232-strip-openjdk-warning.patch |
| 6 |
Log: |
| 7 |
Version bump |
| 8 |
(Portage version: 2.2_rc67-r4/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-p2p/freenet/files/0.7.5_p1245-strip-openjdk-check.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: 0.7.5_p1245-strip-openjdk-check.patch |
| 17 |
=================================================================== |
| 18 |
--- src/freenet/node/Node.java 2010-04-25 14:54:26.000000000 +0200 |
| 19 |
+++ src/freenet/node/Node.java.new 2010-04-25 14:55:51.000000000 +0200 |
| 20 |
@@ -3647,43 +3647,6 @@ |
| 21 |
|
| 22 |
boolean isOpenJDK = false; |
| 23 |
|
| 24 |
- if(jvmName.startsWith("OpenJDK ")) { |
| 25 |
- isOpenJDK = true; |
| 26 |
- if(javaVersion.startsWith("1.6.0")) { |
| 27 |
- String subverString; |
| 28 |
- if(jvmVersion.startsWith("14.0-b")) |
| 29 |
- subverString = jvmVersion.substring("14.0-b".length()); |
| 30 |
- else if(jvmVersion.startsWith("1.6.0_0-b")) |
| 31 |
- subverString = jvmVersion.substring("1.6.0_0-b".length()); |
| 32 |
- else |
| 33 |
- subverString = null; |
| 34 |
- if(subverString != null) { |
| 35 |
- int subver; |
| 36 |
- try { |
| 37 |
- subver = Integer.parseInt(subverString); |
| 38 |
- } catch (NumberFormatException e) { |
| 39 |
- subver = -1; |
| 40 |
- } |
| 41 |
- if(subver > -1 && subver < 15) { |
| 42 |
- File javaDir = new File(System.getProperty("java.home")); |
| 43 |
- |
| 44 |
- // Assume that if the java home dir has been updated since August 11th, we have the fix. |
| 45 |
- |
| 46 |
- final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT")); |
| 47 |
- _cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0); |
| 48 |
- if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) { |
| 49 |
- 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)."); |
| 50 |
- } else { |
| 51 |
- 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."); |
| 52 |
- System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html"); |
| 53 |
- clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR)); |
| 54 |
- } |
| 55 |
- |
| 56 |
- } |
| 57 |
- } |
| 58 |
- } |
| 59 |
- } |
| 60 |
- |
| 61 |
boolean isApple; |
| 62 |
|
| 63 |
if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion); |
Archives