diff --git a/history.txt b/history.txt index 441cc8be94..de2fb2c506 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,13 @@ +2011-09-30 kytv + * fix umask bug by upgrading to wrapper v3.5.12. Binaries are from Tanuki's + delta pack for the community edition, except: + - Win64: not available from Tanuki--compiled with VS2010 + - FreeBSD: Tanuki's binaries are compiled in FBSD v6. I compiled the + wrapper in FreeBSD 7.4 to eliminate the dependency on the compat6x port. + - Linux ARM: not available from Tanuki + - OSX: Tanuki offers separate binaries for 32bit VS 64bit. Our + wrapper is quad-fat supporting PPC32/PPC64 and x86/x86_64. + 2011-09-29 zzz * Bandwidth refiller: Reinitialize at restart, avoid issues from clock skews diff --git a/installer/lib/wrapper/all/wrapper.jar b/installer/lib/wrapper/all/wrapper.jar index fa77ea9304..e233fcff9d 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 efb7dcb831..8aa27cc9bd 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 0922eeb8e7..528dd726e8 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 977a9c84ab..e7d67a09ee 100755 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 1a1581e287..251632be60 100755 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 b0a930c955..6329b0a450 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 45e47f590a..fd507afd75 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 7ab423429c..42af66d97f 100755 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 59c3a25fbe..12c753f985 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 7bfaa0e364..e729a67b2a 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 47c4b7fef9..a67f60c2e9 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 a72f2f5094..885c601efc 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 331c37665a..9ab884fd83 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 b/installer/lib/wrapper/macosx/i2psvc index ba98eb3155..baefc28585 100644 Binary files a/installer/lib/wrapper/macosx/i2psvc and b/installer/lib/wrapper/macosx/i2psvc differ diff --git a/installer/lib/wrapper/macosx/libwrapper.jnilib b/installer/lib/wrapper/macosx/libwrapper.jnilib index 1ee47ce278..f111c09220 100644 Binary files a/installer/lib/wrapper/macosx/libwrapper.jnilib and b/installer/lib/wrapper/macosx/libwrapper.jnilib differ diff --git a/installer/lib/wrapper/solaris/i2psvc b/installer/lib/wrapper/solaris/i2psvc index d6edd393d6..503c094bdd 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 f63c88e83f..2c710d084e 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 e6a0096a85..207d69c37d 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 d1418f4af7..7d597a5019 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 6d6b610356..4357dc29d5 100755 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 e7f3279dc0..086e57d67b 100644 --- a/installer/lib/wrapper/win64/README-x64-win.txt +++ b/installer/lib/wrapper/win64/README-x64-win.txt @@ -1,5 +1,5 @@ -Changes will probably be needed for newer versions than 3.5.9. - -To use the patch in this directory, copy Makefile-windows-x86-32.nmake to -Makefile-windows-x86-64.nmake then "patch < x64-win.patch". Compiles cleanly -using VS2010. +Changes will probably be needed for newer versions than 3.5.12. + +To use the patch in this directory, copy Makefile-windows-x86-32.nmake to +Makefile-windows-x86-64.nmake then "patch < x64-win.patch". Compiles cleanly +using VS2010. diff --git a/installer/lib/wrapper/win64/wrapper.dll b/installer/lib/wrapper/win64/wrapper.dll index 9f27992fae..31577c94e3 100644 Binary files a/installer/lib/wrapper/win64/wrapper.dll and b/installer/lib/wrapper/win64/wrapper.dll differ diff --git a/installer/lib/wrapper/win64/x64-win.patch b/installer/lib/wrapper/win64/x64-win.patch index 4679c6cd5b..0ceac6ea4a 100644 --- a/installer/lib/wrapper/win64/x64-win.patch +++ b/installer/lib/wrapper/win64/x64-win.patch @@ -1,5 +1,5 @@ ---- Makefile-windows-x86-64.nmake 2011-05-28 21:12:05.383721860 +0000 -+++ Makefile-windows-x86-64.nmake 2011-06-09 19:43:59.349132461 +0000 +--- Makefile-windows-x86-32.nmake 2011-09-29 20:34:25.447939000 +0000 ++++ Makefile-windows-x86-64.nmake 2011-09-29 20:51:57.297170000 +0000 @@ -9,19 +9,19 @@ PROJ = wrapper @@ -14,7 +14,7 @@ -EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release +EXE_OUTDIR = $(PROJ)32_VC8__Win64_Release EXE_OBJS = $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapperinfo.obj - EXE_LIBS = mpr.lib shell32.lib wsock32.lib shlwapi.lib advapi32.lib user32.lib Crypt32.lib Wintrust.lib pdh.lib + EXE_LIBS = mpr.lib shell32.lib netapi32.lib wsock32.lib shlwapi.lib advapi32.lib user32.lib Crypt32.lib Wintrust.lib pdh.lib EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE" EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /LTCG diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a85b0c8aa2..9535f12e9f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 22; + public final static long BUILD = 23; /** for example "-test" */ public final static String EXTRA = "-rc";