diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java index 619b7ec29..40b6a2cab 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java @@ -682,6 +682,8 @@ public class RemoteArchiveBean { if (remoteBlogs.contains(blog)) { //System.err.println("Remote index has " + blog.toBase64()); continue; + } else if (ignoreBlog(user, blog)) { + continue; } entries.clear(); diff --git a/apps/syndie/jsp/post.jsp b/apps/syndie/jsp/post.jsp index a22be401f..0b9b048fd 100644 --- a/apps/syndie/jsp/post.jsp +++ b/apps/syndie/jsp/post.jsp @@ -146,8 +146,8 @@ for (Iterator iter = names.iterator(); iter.hasNext(); ) { * [link schema="eep" location="http://forum.i2p"]text[/link] = offer a link to an external resource (accessible with the given schema) * [archive name="name" description="they have good stuff" schema="eep" location="http://syndiemedia.i2p/archive/archive.txt"]foo![/archive] = offer an easy way to sync up with a new Syndie archive -SML headers are newline delimited key=value pairs. Example keys are: -* bgcolor = background color of the post (e.g. bgcolor=#ffccaa or bgcolor=red) +SML headers are newline delimited key:value pairs. Example keys are: +* bgcolor = background color of the post (e.g. bgcolor:#ffccaa or bgcolor=red) * bgimage = attachment number to place as the background image for the post (only shown if images are enabled) (e.g. bgimage=1) * textfont = font to put most text into
diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java index 6293a30b3..20b5244b2 100644 --- a/core/java/src/net/i2p/util/NativeBigInteger.java +++ b/core/java/src/net/i2p/util/NativeBigInteger.java @@ -127,6 +127,10 @@ public class NativeBigInteger extends BigInteger { * @return A string containing the CPU-type or null if CPU type is unknown */ private static String resolveCPUType() { + boolean is64 = (-1 != System.getProperty("os.arch").indexOf("64")); + if (is64) + return JBIGI_OPTIMIZATION_ATHLON64; + try { CPUInfo c = CPUID.getInfo(); if (c instanceof AMDCPUInfo) { diff --git a/history.txt b/history.txt index ebf15720d..7dc84e2ef 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,10 @@ -$Id: history.txt,v 1.258 2005/09/18 00:41:46 ragnarok Exp $ +$Id: history.txt,v 1.259 2005/09/18 03:50:57 ragnarok Exp $ + +2005-09-18 jrandom + * Added support for pure 64bit linux with jbigi and the java service + wrapper (no need for jcpuid if we're on os.arch=amd64). Thanks mule + et al for help testing! + * UI cleanup in Syndie (thanks gloin and bar!) 2005-09-17 Ragnarok * Implemented a naming service using Syndie's petname db. It's not enabled diff --git a/installer/lib/jbigi/README.txt b/installer/lib/jbigi/README.txt index a669b3d2f..02d76b0a7 100644 --- a/installer/lib/jbigi/README.txt +++ b/installer/lib/jbigi/README.txt @@ -5,3 +5,7 @@ was optimized for a variety of CPU architectures. On Sep 16, 2005, libjbigi-osx-none.jnilib was added to jbigi.jar after being compiled by jrandom on osx/ppc with GMP-4.1.4. + +On Sep 18, 2005, libjbigi-linux-athlon64.so was added to jbigi.jar after +being compiled by jrandom on linux/p4 (cross compiled to --host=x86_64) +with GMP-4.1.4. diff --git a/installer/lib/jbigi/jbigi.jar b/installer/lib/jbigi/jbigi.jar index fd4cd236f..bad9acd2d 100644 Binary files a/installer/lib/jbigi/jbigi.jar and b/installer/lib/jbigi/jbigi.jar differ diff --git a/installer/lib/jbigi/jbigi.jar.sig b/installer/lib/jbigi/jbigi.jar.sig index 30942d2fd..463a96b80 100644 Binary files a/installer/lib/jbigi/jbigi.jar.sig and b/installer/lib/jbigi/jbigi.jar.sig differ diff --git a/installer/lib/wrapper/linux64/i2psvc b/installer/lib/wrapper/linux64/i2psvc new file mode 100644 index 000000000..b193016fe Binary files /dev/null and b/installer/lib/wrapper/linux64/i2psvc differ diff --git a/installer/lib/wrapper/linux64/libwrapper.so b/installer/lib/wrapper/linux64/libwrapper.so new file mode 100644 index 000000000..583b4dce6 Binary files /dev/null and b/installer/lib/wrapper/linux64/libwrapper.so differ diff --git a/installer/lib/wrapper/linux64/wrapper.jar b/installer/lib/wrapper/linux64/wrapper.jar new file mode 100644 index 000000000..0bbe9a471 Binary files /dev/null and b/installer/lib/wrapper/linux64/wrapper.jar differ diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh index 998e49348..ffc79ba32 100644 --- a/installer/resources/postinstall.sh +++ b/installer/resources/postinstall.sh @@ -31,10 +31,18 @@ if [ "X$HOST_OS" = "X" -o $HOST_OS = "unknown" ]; then exit 1 fi +OS_ARCH=`uname -m` +X86_64=`echo "$OS_ARCH" | grep x86_64` + case $HOST_OS in debian | fedora | gentoo | linux | mandrake | redhat | suse ) - wrapperpath="./lib/wrapper/linux" - cp $wrapperpath/libwrapper.so ./lib/ + if [ "X$X86_64" = "X" ]; then + wrapperpath="./lib/wrapper/linux" + cp $wrapperpath/libwrapper.so ./lib/ + else + wrapperpath="./lib/wrapper/linux64" + cp $wrapperpath/libwrapper.so ./lib + fi ;; freebsd ) wrapperpath="./lib/wrapper/freebsd" diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e8d88f703..c72e30e09 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.240 $ $Date: 2005/09/17 18:01:44 $"; + public final static String ID = "$Revision: 1.241 $ $Date: 2005/09/17 20:29:59 $"; public final static String VERSION = "0.6.0.6"; - public final static long BUILD = 0; + public final static long BUILD = 1; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);