diff --git a/history.txt b/history.txt index 1c7ca0292..184f32de7 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,14 @@ +2012-11-21 kytv + * Update Java Service Wrapper to v3.5.16. + - Windows: Self-compiled with VS2010 in Windows 7. The icon has been + changed from Tanuki's default to Itoopie. + - FreeBSD: Self-compiled in FreeBSD 7.4 to eliminate the dependency on the + compat6x port. + - Linux PPC32: Self-compiled in Debian Squeeze + - Linux x86, Linux x64, Linux ARMv5, MacOSX & Solaris: Binares are from the + "community edition" deltapack offered by Tanuki. The Linux binaries have + been stripped. + 2012-11-20 zzz * Transport: Fix bug that inadvertently reduced default max SSU connections in 0.9.2, thus reducing tunnel build success rates diff --git a/installer/lib/wrapper/README.txt b/installer/lib/wrapper/README.txt index f938d8303..4fec682f5 100644 --- a/installer/lib/wrapper/README.txt +++ b/installer/lib/wrapper/README.txt @@ -12,14 +12,14 @@ to xxx/librapper.so, libwrapper.jnilib, or wrapper.dll for the following directo Don't forget to disable the execute bit. linux (x86-32) linux64 (x86-64) + linux-armv5 (armv5) solaris (sparc-32) - win32 From the delta pack, strip the binaries in bin/ and copy to xxx/i2psvc for the same directories as above. Don't forget to disable the execute bit. -For armv5 and armv7, build from source following the instructions +For armv7, build from source following the instructions in linux-armv7/README.txt. Don't forget to strip the binaries and disable the execute bit. We use a trimslice for armv7 building. @@ -31,14 +31,14 @@ Don't forget to strip the binaries and disable the execute bit. A walkthrough can be found in freebsd/README.txt. For linux-ppc, we don't use the Tanuki binaires because they're (mistakenly) -ppc64 compiles (TODO: File bug with Tanuki). Compile the arch-dependent bits -with "ant -Dbits=32 compile-c-unix". +ppc64 compiles. Compile the arch-dependent bits with +"ant -Dbits=32 compile-c-unix". For macosx, combine (if possible) the universal-32 and universal-64 files from the delta pack (each is a 2-architecture fat file) into a "quad-fat" binary. Instructions can be found in macos/README.txt -For win64, build from source following the instructions +For windows, build from source following the instructions in win64/README-x64-win.txt. Don't forget to strip the binaries and disable the execute bit. diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar index 717c7504a..0ba41b36d 100644 Binary files a/installer/lib/wrapper/all/wrapper.jar and b/installer/lib/wrapper/all/wrapper.jar differ diff --git a/installer/lib/wrapper/freebsd/i2psvc b/installer/lib/wrapper/freebsd/i2psvc index 47f26b1f4..b2355f408 100644 Binary files a/installer/lib/wrapper/freebsd/i2psvc and b/installer/lib/wrapper/freebsd/i2psvc differ diff --git a/installer/lib/wrapper/freebsd/libwrapper.so b/installer/lib/wrapper/freebsd/libwrapper.so index f98aad7b3..15541dbca 100644 Binary files a/installer/lib/wrapper/freebsd/libwrapper.so and b/installer/lib/wrapper/freebsd/libwrapper.so differ diff --git a/installer/lib/wrapper/freebsd64/i2psvc b/installer/lib/wrapper/freebsd64/i2psvc index 3bc0ea502..b327670a1 100644 Binary files a/installer/lib/wrapper/freebsd64/i2psvc and b/installer/lib/wrapper/freebsd64/i2psvc differ diff --git a/installer/lib/wrapper/freebsd64/libwrapper.so b/installer/lib/wrapper/freebsd64/libwrapper.so index 495db0c89..9adb50aae 100644 Binary files a/installer/lib/wrapper/freebsd64/libwrapper.so and b/installer/lib/wrapper/freebsd64/libwrapper.so differ diff --git a/installer/lib/wrapper/linux-armv5/i2psvc b/installer/lib/wrapper/linux-armv5/i2psvc index ba0eefdf8..16fc9cb30 100644 Binary files a/installer/lib/wrapper/linux-armv5/i2psvc and b/installer/lib/wrapper/linux-armv5/i2psvc differ diff --git a/installer/lib/wrapper/linux-armv5/libwrapper.so b/installer/lib/wrapper/linux-armv5/libwrapper.so index 8e1274e55..47e89e281 100644 Binary files a/installer/lib/wrapper/linux-armv5/libwrapper.so and b/installer/lib/wrapper/linux-armv5/libwrapper.so differ diff --git a/installer/lib/wrapper/linux-ppc/i2psvc b/installer/lib/wrapper/linux-ppc/i2psvc index a2ab7512d..8890b3d69 100644 Binary files a/installer/lib/wrapper/linux-ppc/i2psvc and b/installer/lib/wrapper/linux-ppc/i2psvc differ diff --git a/installer/lib/wrapper/linux-ppc/libwrapper.so b/installer/lib/wrapper/linux-ppc/libwrapper.so index cbe517d0a..bca5bbdcf 100644 Binary files a/installer/lib/wrapper/linux-ppc/libwrapper.so and b/installer/lib/wrapper/linux-ppc/libwrapper.so differ diff --git a/installer/lib/wrapper/linux/i2psvc b/installer/lib/wrapper/linux/i2psvc index 155b887b2..e375028f3 100644 Binary files a/installer/lib/wrapper/linux/i2psvc and b/installer/lib/wrapper/linux/i2psvc differ diff --git a/installer/lib/wrapper/linux/libwrapper.so b/installer/lib/wrapper/linux/libwrapper.so index 4438a20ba..6284a7eaa 100644 Binary files a/installer/lib/wrapper/linux/libwrapper.so and b/installer/lib/wrapper/linux/libwrapper.so differ diff --git a/installer/lib/wrapper/linux64/i2psvc b/installer/lib/wrapper/linux64/i2psvc index 771285974..0d6ca7b9f 100644 Binary files a/installer/lib/wrapper/linux64/i2psvc and b/installer/lib/wrapper/linux64/i2psvc differ diff --git a/installer/lib/wrapper/linux64/libwrapper.so b/installer/lib/wrapper/linux64/libwrapper.so index b3c58161e..c58ab8df6 100644 Binary files a/installer/lib/wrapper/linux64/libwrapper.so and b/installer/lib/wrapper/linux64/libwrapper.so differ diff --git a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 index 16b1479ba..da6b19e16 100644 Binary files a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 and b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-32 differ diff --git a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 index 4669457cc..0768a795c 100644 Binary files a/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 and b/installer/lib/wrapper/macosx/i2psvc-macosx-universal-64 differ diff --git a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib index 404218071..238e5dac0 100644 Binary files a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib and b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-32.jnilib differ diff --git a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib index 8bdcf0968..c1c6e26f8 100644 Binary files a/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib and b/installer/lib/wrapper/macosx/libwrapper-macosx-universal-64.jnilib differ diff --git a/installer/lib/wrapper/solaris/i2psvc b/installer/lib/wrapper/solaris/i2psvc index e18d52b67..34f260fd2 100644 Binary files a/installer/lib/wrapper/solaris/i2psvc and b/installer/lib/wrapper/solaris/i2psvc differ diff --git a/installer/lib/wrapper/solaris/libwrapper.so b/installer/lib/wrapper/solaris/libwrapper.so index d5f6795ef..7dfef878d 100644 Binary files a/installer/lib/wrapper/solaris/libwrapper.so and b/installer/lib/wrapper/solaris/libwrapper.so differ diff --git a/installer/lib/wrapper/win32/I2Psvc.exe b/installer/lib/wrapper/win32/I2Psvc.exe index e7d3530e1..64e621120 100644 Binary files a/installer/lib/wrapper/win32/I2Psvc.exe and b/installer/lib/wrapper/win32/I2Psvc.exe differ diff --git a/installer/lib/wrapper/win32/wrapper.dll b/installer/lib/wrapper/win32/wrapper.dll index 26a8d64ae..6485468bc 100644 Binary files a/installer/lib/wrapper/win32/wrapper.dll and b/installer/lib/wrapper/win32/wrapper.dll differ diff --git a/installer/lib/wrapper/win64/I2Psvc.exe b/installer/lib/wrapper/win64/I2Psvc.exe index 5730b35d8..f585ff4b4 100644 Binary files a/installer/lib/wrapper/win64/I2Psvc.exe and b/installer/lib/wrapper/win64/I2Psvc.exe differ diff --git a/installer/lib/wrapper/win64/README-x64-win.txt b/installer/lib/wrapper/win64/README-x64-win.txt index 45a9ad367..9920aa631 100644 --- a/installer/lib/wrapper/win64/README-x64-win.txt +++ b/installer/lib/wrapper/win64/README-x64-win.txt @@ -1,8 +1,10 @@ -Changes may be needed for newer versions than 3.5.13. +Changes may be needed for newer versions than 3.5.16. To use the patch in this directory, copy Makefile-windows-x86-32.nmake to Makefile-windows-x86-64.nmake then "patch < x64-win.patch". +Copy the itoopie icon to src\c\wrapper.ico. + Configure your environment per the apache-ant instructions (i.e., set ANT_HOME and JAVA_HOME). Then in the wrapper source directory, run build64.bat. diff --git a/installer/lib/wrapper/win64/wrapper.dll b/installer/lib/wrapper/win64/wrapper.dll index d9d526b3d..e56003b7a 100644 Binary files a/installer/lib/wrapper/win64/wrapper.dll and b/installer/lib/wrapper/win64/wrapper.dll differ