net-p2p/freenet: Version bump to 1475

Package-Manager: portage-2.2.27

6 files changed, 2 insertions, 137 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
deleted file mode 100644
index 035b4e638cc6..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1302-ext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
deleted file mode 100644
index ffe9354dc846..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java.orig	2011-07-29 17:32:37.000000000 +0200
-+++ freenet-0.7.5_p1384/src/freenet/support/LibraryLoader.java	2011-07-29 17:35:02.000000000 +0200
-@@ -48,12 +48,11 @@
- 		final String libraryNameWithPrefixAndArchAndSuffix = libraryNameWithPrefixAndArch + prefix;
- 		String resourceName = path + libraryNameWithPrefixAndArchAndSuffix;
- 
--		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
--		if (nativeLib.exists()) {
-+		try {
- 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
- 			System.loadLibrary(libraryName);
- 			success = true;
--		} else {
-+		} catch(UnsatisfiedLinkError ule) {
- 			try {
- 				// Get the resource
- 				URL resource = LibraryLoader.class.getResource(resourceName);
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch b/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
deleted file mode 100644
index 5300fb196235..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java.orig	2011-07-29 16:48:36.000000000 +0200
-+++ freenet-0.7.5_p1384/src/net/i2p/util/NativeBigInteger.java	2011-07-29 16:50:20.000000000 +0200
-@@ -193,12 +193,6 @@
- 	 */
- 	public native static byte[] nativeModPow(byte base[], byte exponent[], byte modulus[]);
- 
--	/**
--	 * Converts a BigInteger byte-array to a 'double'
--	 * @param ba Big endian twos complement representation of the BigInteger to convert to a double
--	 * @return The plain double-value represented by 'ba'
--	 */
--	public native static double nativeDoubleValue(byte ba[]);
- 	private byte[] cachedBa = null;
- 
-         /**
-@@ -286,11 +280,7 @@
- 
- 	@Override
- 	public double doubleValue() {
--		// TODO Recent tests show that Java version is quicker. Maybe drop?
--		if(_nativeOk)
--			return nativeDoubleValue(toByteArray());
--		else
--			return super.doubleValue();
-+		return super.doubleValue();
- 	}
- 
- 	/**
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
deleted file mode 100644
index 066f62474293..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-wrapper.java.command=java
-wrapper.working.dir=/var/freenet/
-wrapper.java.mainclass=freenet.node.NodeStarter
-wrapper.java.library.path.1=/usr/lib
-wrapper.java.initmemory=60
-wrapper.java.maxmemory=128
-wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
-wrapper.java.additional.3=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=256M
-
-wrapper.app.parameter.1=freenet.ini
-wrapper.console.format=PM
-wrapper.console.loglevel=INFO
-wrapper.logfile=wrapper.log
-wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
-wrapper.logfile.maxsize=2M
-wrapper.logfile.maxfiles=3
-wrapper.syslog.loglevel=NONE
-wrapper.console.title=Freenet 0.7
-wrapper.jvm_exit.timeout=120
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-
-# Name of the service
-wrapper.ntservice.name=freenet-darknet
-
-# Display name of the service
-wrapper.ntservice.displayname=Freenet 0.7 darknet
-
-# Description of the service
-wrapper.ntservice.description=The Free Network Project daemon
-
-# Service dependencies.  Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed.  AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
-
-wrapper.ntservice.process_priority=BELOW_NORMAL
-
-# Start services with a different user than SYSTEM
-# SEE http://wrapper.tanukisoftware.org/doc/english/prop-ntservice-account.html BEFORE PROCEEDING !
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1422-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
index a8176aaadb76..7ec6cd01bcad 100644
--- a/net-p2p/freenet/files/freenet-0.7.5_p1422-wrapper.conf
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
@@ -3,12 +3,12 @@ wrapper.working.dir=/var/freenet/
 wrapper.java.mainclass=freenet.node.NodeStarter
 wrapper.java.library.path.1=/usr/lib
 wrapper.java.initmemory=60
-wrapper.java.maxmemory=256
+wrapper.java.maxmemory=1024
 wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
 wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
 wrapper.java.additional.3=-enableassertions:freenet
 # You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=256M
+wrapper.java.additional.4=-XX:MaxPermSize=1024M
 
 wrapper.app.parameter.1=freenet.ini
 wrapper.console.format=PM
diff --git a/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch b/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
deleted file mode 100644
index e252aed003d5..000000000000
--- a/net-p2p/freenet/files/libraryloader-revert-using-of-absolute-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit bad37bf86798d30292769581aca7e71471c34485
-Author: Matthew Toseland <toad@amphibian.dyndns.org>
-Date:   Fri Nov 5 23:30:43 2010 +0000
-
-    Use the specific, absolute path, rather than loading from path, for NativeBigInteger library.
-
-diff --git a/src/freenet/support/LibraryLoader.java b/src/freenet/support/LibraryLoader.java
-index d4a22a0..2470d40 100644
---- a/src/freenet/support/LibraryLoader.java
-+++ b/src/freenet/support/LibraryLoader.java
-@@ -45,7 +45,7 @@ public class LibraryLoader {
- 		File nativeLib = new File((System.getProperty("java.library.path")) + "/lib" + libraryName + prefix);
- 		if (nativeLib.exists()) {
- 			System.out.println("Attempting to load the NativeThread library ["+libraryName+']');
--			System.loadLibrary(libraryName);
-+			System.loadLibrary(nativeLib.getAbsolutePath());
- 			success = true;
- 		} else {
- 			try {