wrapper upgrade to 3.5.12 / 23-rc

Upgrading our wrapper to 3.5.12 to fix the upstream wrapper's umask bug. All
binaries are from the delta pack except for Win64, FreeBSD, Linux ARM, and OSX
(See history.txt for more info).
This commit is contained in:
kytv
2011-09-29 22:35:18 +00:00
parent 6b0fe83989
commit b96ee4efa2
25 changed files with 19 additions and 9 deletions

View File

@ -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 2011-09-29 zzz
* Bandwidth refiller: Reinitialize at restart, avoid * Bandwidth refiller: Reinitialize at restart, avoid
issues from clock skews issues from clock skews

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
Changes will probably be needed for newer versions than 3.5.9. 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 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 Makefile-windows-x86-64.nmake then "patch < x64-win.patch". Compiles cleanly
using VS2010. using VS2010.

View File

@ -1,5 +1,5 @@
--- Makefile-windows-x86-64.nmake 2011-05-28 21:12:05.383721860 +0000 --- Makefile-windows-x86-32.nmake 2011-09-29 20:34:25.447939000 +0000
+++ Makefile-windows-x86-64.nmake 2011-06-09 19:43:59.349132461 +0000 +++ Makefile-windows-x86-64.nmake 2011-09-29 20:51:57.297170000 +0000
@@ -9,19 +9,19 @@ @@ -9,19 +9,19 @@
PROJ = wrapper PROJ = wrapper
@ -14,7 +14,7 @@
-EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release -EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release
+EXE_OUTDIR = $(PROJ)32_VC8__Win64_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_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_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 EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /LTCG

View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 22; public final static long BUILD = 23;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";