Move to zlib 1.1.4 on Windows (the new version that squashes the "double

free" glitch).
Bugfix candidate -- I'll backpatch this into 2.2.1 later this week.

2 files changed, 12 insertions, 13 deletions

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index efec1bb..082f31a 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -77,17 +77,16 @@ _tkinter
     Be sure to install everything, including the Tcl/Tk header files.
 
 zlib
-    NOTE: This procedure is new (& simpler, & safer) for 2.1a2.
     Python wrapper for the zlib compression library.  Get the source code
-    for version 1.1.3 from a convenient mirror at:
-        http://www.info-zip.org/pub/infozip/zlib/
-    Unpack into dist\zlib-1.1.3.
+    for version 1.1.4 from a convenient mirror at:
+        http://www.gzip.org/zlib/
+    Unpack into dist\zlib-1.1.4.
     A custom pre-link step in the zlib project settings should manage to
-    build zlib-1.1.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+    build zlib-1.1.4\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
     linked in PCbuild\.
     However, the zlib project is not smart enough to remove anything under
-    zlib-1.1.3\ when you do a clean, so if you want to rebuild zlib.lib
-    you need to clean up zlib-1.1.3\ by hand.
+    zlib-1.1.4\ when you do a clean, so if you want to rebuild zlib.lib
+    you need to clean up zlib-1.1.4\ by hand.
 
 bsddb
     Python wrapper for the BSD database 1.85.  Requires db.1.85.win32.zip,
diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index 0304228..13e4849 100644
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""

 F90=df.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib

+# ADD LINK32 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

 PreLink_Desc=Checking static zlib has been built

-PreLink_Cmds=cd ..\..\zlib-1.1.3	nmake -nologo -f msdos\makefile.w32 zlib.lib

+PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"

@@ -77,7 +77,7 @@ PreLink_Cmds=cd ..\..\zlib-1.1.3	nmake -nologo -f msdos\makefile.w32 zlib.lib
 # PROP Target_Dir ""

 F90=df.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib

+# ADD LINK32 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

 SOURCE="$(InputPath)"

 PreLink_Desc=Checking static zlib has been built

-PreLink_Cmds=cd ..\..\zlib-1.1.3	nmake -nologo -f msdos\makefile.w32 zlib.lib

+PreLink_Cmds=cd ..\..\zlib-1.1.4	nmake -nologo -f msdos\makefile.w32 zlib.lib

 # End Special Build Tool

 

 !ENDIF