diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2010-11-10 21:08:56 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2010-11-10 21:08:56 +0000 |
| commit | 48db42c88b441d2fd9ba3347ebb9527ea19596be (patch) | |
| tree | a06047c576156edc686d84e0aa52f2656de1310a /net-p2p/freenet/files | |
| parent | Initial import, bug #194137. Ebuild imported from sunrise, where it was maint... (diff) | |
| download | historical-48db42c88b441d2fd9ba3347ebb9527ea19596be.tar.gz historical-48db42c88b441d2fd9ba3347ebb9527ea19596be.tar.bz2 historical-48db42c88b441d2fd9ba3347ebb9527ea19596be.zip | |
Version bump, drop old versions
Package-Manager: portage-2.2.0_alpha2-r1/cvs/Linux x86_64
Diffstat (limited to 'net-p2p/freenet/files')
| -rw-r--r-- | net-p2p/freenet/files/0.7.5_p1302-ext.patch | 22 | ||||
| -rw-r--r-- | net-p2p/freenet/files/build.xml | 2 | ||||
| -rw-r--r-- | net-p2p/freenet/files/strip-openjdk-check.patch | 45 |
3 files changed, 63 insertions, 6 deletions
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 000000000000..035b4e638cc6 --- /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/build.xml b/net-p2p/freenet/files/build.xml index e80b23c59fef..a522e98471cd 100644 --- a/net-p2p/freenet/files/build.xml +++ b/net-p2p/freenet/files/build.xml @@ -121,7 +121,7 @@ <javac target="1.5" destdir="${build}" source="1.5" debug="on" srcdir="${src}" optimize="on" classpath="${gentoo.classpath}" > - <compilerarg value="-Xlint" ></compilerarg> +<!-- <compilerarg value="-Xlint" ></compilerarg> --> <sourcepath > <pathelement path="${build}" ></pathelement> diff --git a/net-p2p/freenet/files/strip-openjdk-check.patch b/net-p2p/freenet/files/strip-openjdk-check.patch index 08e00152c6ea..15a9e3817999 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 ")))) { |