net-p2p/freenet/files/strip-openjdk-check.patch

   1 --- src/freenet/node/Node.java  2010-11-10 21:58:45.000000000 +0100
   2 +++ src/freenet/node/Node.java.new      2010-11-10 21:59:53.000000000 +0100
   3 @@ -3792,42 +3792,42 @@
   4
   5                 boolean isOpenJDK = false;
   6
   7 -               if(jvmName.startsWith("OpenJDK ")) {
   8 -                       isOpenJDK = true;
   9 -                       if(javaVersion.startsWith("1.6.0")) {
  10 -                               String subverString;
  11 -                               if(jvmVersion.startsWith("14.0-b"))
  12 -                                       subverString = jvmVersion.substring("14.0-b".length());
  13 -                               else if(jvmVersion.startsWith("1.6.0_0-b"))
  14 -                                       subverString = jvmVersion.substring("1.6.0_0-b".length());
  15 -                               else
  16 -                                       subverString = null;
  17 -                               if(subverString != null) {
  18 -                                       int subver;
  19 -                                       try {
  20 -                                               subver = Integer.parseInt(subverString);
  21 -                                       } catch (NumberFormatException e) {
  22 -                                               subver = -1;
  23 -                                       }
  24 -                               if(subver > -1 && subver < 15) {
  25 -                                       File javaDir = new File(System.getProperty("java.home"));
  26 -
  27 -                                       // Assume that if the java home dir has been updated since August 11th, we have the fix.
  28 -
  29 -                                       final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
  30 -                                       _cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
  31 -                                       if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
  32 -                                               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).");
  33 -                                       } else {
  34 -                                               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.");
  35 -                                               System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
  36 -                                               clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
  37 -                                       }
  38 -
  39 -                               }
  40 -                               }
  41 -                       }
  42 -               }
  43 +//             if(jvmName.startsWith("OpenJDK ")) {
  44 +//                     isOpenJDK = true;
  45 +//                     if(javaVersion.startsWith("1.6.0")) {
  46 +//                             String subverString;
  47 +//                             if(jvmVersion.startsWith("14.0-b"))
  48 +//                                     subverString = jvmVersion.substring("14.0-b".length());
  49 +//                             else if(jvmVersion.startsWith("1.6.0_0-b"))
  50 +//                                     subverString = jvmVersion.substring("1.6.0_0-b".length());
  51 +//                             else
  52 +//                                     subverString = null;
  53 +//                             if(subverString != null) {
  54 +//                                     int subver;
  55 +//                                     try {
  56 +//                                             subver = Integer.parseInt(subverString);
  57 +//                                     } catch (NumberFormatException e) {
  58 +//                                             subver = -1;
  59 +//                                     }
  60 +//                             if(subver > -1 && subver < 15) {
  61 +//                                     File javaDir = new File(System.getProperty("java.home"));
  62 +//
  63 +//                                     // Assume that if the java home dir has been updated since August 11th, we have the fix.
  64 +//
  65 +//                                     final Calendar _cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
  66 +//                                     _cal.set(2009, Calendar.AUGUST, 11, 0, 0, 0);
  67 +//                                     if(javaDir.exists() && javaDir.isDirectory() && javaDir.lastModified() > _cal.getTimeInMillis()) {
  68 +//                                             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).");
  69 +//                                     } else {
  70 +//                                             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.");
  71 +//                                             System.err.println("See here: http://www.cert.fi/en/reports/2009/vulnerability2009085.html");
  72 +//                                             clientCore.alerts.register(new SimpleUserAlert(false, l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), l10n("openJDKMightBeVulnerableXML"), UserAlert.ERROR));
  73 +//                                     }
  74 +//
  75 +//                             }
  76 +//                             }
  77 +//                     }
  78 +//             }
  79
  80                 if(logMINOR) Logger.minor(this, "JVM vendor: "+jvmVendor+", JVM name: "+jvmName+", JVM version: "+javaVersion+", OS name: "+osName+", OS version: "+osVersion);
  81