summaryrefslogtreecommitdiff
path: root/net-p2p/freenet/files
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2010-12-24 11:59:57 +0000
committerdakkar <dakkar@thenautilus.net>2010-12-24 11:59:57 +0000
commit78befd106593c52e8b47324fbeb76f85b3580036 (patch)
tree9502070f7a15f81cb26c1034253a224dceaefd1e /net-p2p/freenet/files
parentdamn unreliable mirrors (diff)
downloadgentoo-overlay-78befd106593c52e8b47324fbeb76f85b3580036.tar.gz
gentoo-overlay-78befd106593c52e8b47324fbeb76f85b3580036.tar.bz2
gentoo-overlay-78befd106593c52e8b47324fbeb76f85b3580036.zip
patches…
Diffstat (limited to 'net-p2p/freenet/files')
-rw-r--r--net-p2p/freenet/files/0.7.5_p1297-ext.patch43
-rw-r--r--net-p2p/freenet/files/0.7.5_p1302-ext.patch22
-rw-r--r--net-p2p/freenet/files/strip-openjdk-check.patch45
3 files changed, 105 insertions, 5 deletions
diff --git a/net-p2p/freenet/files/0.7.5_p1297-ext.patch b/net-p2p/freenet/files/0.7.5_p1297-ext.patch
new file mode 100644
index 0000000..8e23c76
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1297-ext.patch
@@ -0,0 +1,43 @@
+--- src/freenet-old/node/NodeStarter.java 2010-05-10 21:19:25.000000000 +0200
++++ src/freenet/node/NodeStarter.java 2010-05-10 21:35:30.000000000 +0200
+@@ -168,37 +168,8 @@
+ }
+
+ private void getExtBuild() {
+- try {
+- extBuildNumber = ExtVersion.buildNumber;
+- extRevisionNumber = ExtVersion.cvsRevision;
+- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " r" + extRevisionNumber;
+- Logger.normal(this, builtWithMessage);
+- System.out.println(builtWithMessage);
+- extBuildNumber = ExtVersion.buildNumber();
+- if(extBuildNumber == -42) {
+- extBuildNumber = ExtVersion.extBuildNumber();
+- extRevisionNumber = ExtVersion.extRevisionNumber();
+- }
+- if(extBuildNumber == 0) {
+- String buildMessage = "extBuildNumber is 0; perhaps your freenet-ext.jar file is corrupted?";
+- Logger.error(this, buildMessage);
+- System.err.println(buildMessage);
+- extBuildNumber = -1;
+- }
+- if(extRevisionNumber == null) {
+- String revisionMessage = "extRevisionNumber is null; perhaps your freenet-ext.jar file is corrupted?";
+- Logger.error(this, revisionMessage);
+- System.err.println(revisionMessage);
+- extRevisionNumber = "INVALID";
+- }
+- } catch(Throwable t) {
+- // Compatibility code ... will be removed
+- Logger.error(this, "Unable to get the version of your freenet-ext file : it's probably corrupted!");
+- System.err.println("Unable to get the version of your freenet-ext file : it's probably corrupted!");
+- System.err.println(t.getMessage());
+- extRevisionNumber = "INVALID";
+- extBuildNumber = -1;
+- }
++ extRevisionNumber = "";
++ extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
+ }
+
+ /**
+
diff --git a/net-p2p/freenet/files/0.7.5_p1302-ext.patch b/net-p2p/freenet/files/0.7.5_p1302-ext.patch
new file mode 100644
index 0000000..035b4e6
--- /dev/null
+++ b/net-p2p/freenet/files/0.7.5_p1302-ext.patch
@@ -0,0 +1,22 @@
+--- src/freenet/node/NodeStarter.java 2010-11-10 21:46:10.000000000 +0100
++++ src/freenet/node/NodeStarter.java.new 2010-11-10 21:50:12.000000000 +0100
+@@ -49,8 +49,8 @@
+ public static final String extRevisionNumber;
+
+ static {
+- extBuildNumber = ExtVersion.extBuildNumber();
+- extRevisionNumber = ExtVersion.extRevisionNumber();
++ extBuildNumber = RECOMMENDED_EXT_BUILD_NUMBER;
++ extRevisionNumber = "";
+ }
+
+ private FreenetFilePersistentConfig cfg;
+@@ -86,7 +86,7 @@
+ return Integer.valueOf(-1);
+ }
+
+- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
++ String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber + " running with ext build "+extBuildNumber;
+ Logger.normal(this, builtWithMessage);
+ System.out.println(builtWithMessage);
+
diff --git a/net-p2p/freenet/files/strip-openjdk-check.patch b/net-p2p/freenet/files/strip-openjdk-check.patch
index 08e0015..15a9e38 100644
--- a/net-p2p/freenet/files/strip-openjdk-check.patch
+++ b/net-p2p/freenet/files/strip-openjdk-check.patch
@@ -1,6 +1,6 @@
---- src/freenet/node/Node.java 2010-07-17 02:53:39.633185065 +0200
-+++ src/freenet/node/Node.java.new 2010-07-17 02:58:31.246061950 +0200
-@@ -3726,43 +3726,6 @@
+--- 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;
@@ -40,7 +40,42 @@
- }
- }
- }
--
++// 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);
- if((!isOpenJDK) && (jvmVendor.startsWith("Sun ") || (jvmVendor.startsWith("The FreeBSD Foundation") && jvmSpecVendor.startsWith("Sun ")) || (jvmVendor.startsWith("Apple ")))) {