Upgrade Windows build to zlib 1.2.3 (a security fix)

diff --git a/Misc/NEWS b/Misc/NEWS
index 8fd301597c5cade64994ff2ca99969b0141aaf70..1c99a82d9424154220699277758ff6154300d0f5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,14 @@ Library
   line ending. Remove the special handling of a "\r\n" that has been split
   between two lines.
 
+
+Build
+-----
+
+- Upgrade Windows build to zlib 1.2.3 which eliminates a potential security
+  vulnerability in zlib 1.2.1 and 1.2.2.
+
+
 Documentation
 -------------
 

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 697a602bf4731a67b0508102d93db36a114526be..aed1c9c876dee208e8db7e33267e080367f34fac 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -126,15 +126,15 @@ _tkinter
 
 zlib
     Python wrapper for the zlib compression library.  Get the source code
-    for version 1.2.1 from a convenient mirror at:
+    for version 1.2.3 from a convenient mirror at:
         http://www.gzip.org/zlib/
-    Unpack into dist\zlib-1.2.1.
+    Unpack into dist\zlib-1.2.3.
     A custom pre-link step in the zlib project settings should manage to
-    build zlib-1.2.1\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+    build zlib-1.2.3\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.2.1\ when you do a clean, so if you want to rebuild zlib.lib
-    you need to clean up zlib-1.2.1\ by hand.
+    zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
+    you need to clean up zlib-1.2.3\ by hand.
 
 bz2
     Python wrapper for the libbz2 compression library.  Homepage

diff --git a/PCbuild/zlib.vcproj b/PCbuild/zlib.vcproj
index 4ad457cb0742232c90fe6fcc61dd2d4c28475f9f..63e06ffa02df26bdb0dadbfd9188762226998fd9 100644 (file)
--- a/PCbuild/zlib.vcproj
+++ b/PCbuild/zlib.vcproj
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
@@ -37,7 +37,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+                               AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
                                OutputFile="./zlib_d.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -63,7 +63,7 @@
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Checking static zlib has been built"
-                               CommandLine="cd ..\..\zlib-1.2.1
+                               CommandLine="cd ..\..\zlib-1.2.3
 nmake -nologo -f win32\Makefile.msc zlib.lib
 "/>
                        <Tool
@@ -92,7 +92,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -110,7 +110,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+                               AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
                                OutputFile="./zlib.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -136,7 +136,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Checking static zlib has been built"
-                               CommandLine="cd ..\..\zlib-1.2.1
+                               CommandLine="cd ..\..\zlib-1.2.3
 nmake -nologo -f win32\Makefile.msc zlib.lib
 "/>
                        <Tool
@@ -166,7 +166,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                                AdditionalOptions=" /USECL:MS_ITANIUM"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.1"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.3"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
@@ -188,7 +188,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+                               AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
                                OutputFile="./zlib.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -214,7 +214,7 @@ nmake -nologo -f win32\Makefile.msc zlib.lib
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Checking static zlib has been built"
-                               CommandLine="cd ..\..\zlib-1.2.1
+                               CommandLine="cd ..\..\zlib-1.2.3
 nmake -nologo -f win32\Makefile.msc zlib.lib
 "/>
                        <Tool