[gentoo-commits] gentoo-x86 commit in net-p2p/freenet/files: freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch freenet-0.7.5_p1384-libraryloader-just-try-loading.patch freenet-0.7.5_p1389-wrapper.conf

[Thomas Sachau (tommy)]

tommy       11/07/31 18:45:48

  Added:               
                        freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
                        freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
                        freenet-0.7.5_p1389-wrapper.conf
  Log:
  Version bump, drop old, update live ebuild, fixes bug 376973, bug 376975 and bug 376277
  
  (Portage version: 2.2.0_alpha47-r1/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch?rev=1.1&content-type=text/plain

Index: freenet-0.7.5_p1384-nativebiginteger-no-nativedoublevalue.patch
===================================================================
--- 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();
 	}
 
 	/**



1.1                  net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1384-libraryloader-just-try-loading.patch?rev=1.1&content-type=text/plain

Index: freenet-0.7.5_p1384-libraryloader-just-try-loading.patch
===================================================================
--- 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);



1.1                  net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/freenet/files/freenet-0.7.5_p1389-wrapper.conf?rev=1.1&content-type=text/plain

Index: freenet-0.7.5_p1389-wrapper.conf
===================================================================
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 !