From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 6 Jun 2014 06:27:34 +0000 (-0500)
Subject: Issue #21671: Merge with 3.4
X-Git-Tag: v3.5.0a1~1505
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3266a8fa5910e941e3f640cb9e2804294d42ceca;p=python

Issue #21671: Merge with 3.4
---

3266a8fa5910e941e3f640cb9e2804294d42ceca
diff --cc Misc/NEWS
index 8e5fb3ad75,acc76b4f63..caf6c1819f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -475,20 -380,7 +475,18 @@@ IDL
  Build
  -----
  
 -- The Windows build now includes OpenSSL 1.0.1g
 +- Issue #21141: The Windows build process no longer attempts to find Perl,
 +  instead relying on OpenSSL source being configured and ready to build.  The
 +  ``PCbuild\build_ssl.py`` script has been re-written and re-named to
 +  ``PCbuild\prepare_ssl.py``, and takes care of configuring OpenSSL source
 +  for both 32 and 64 bit platforms.  OpenSSL sources obtained from
 +  svn.python.org will always be pre-configured and ready to build.
 +
 +- Issue #21037: Add a build option to enable AddressSanitizer support.
 +
- - The Windows build now includes OpenSSL 1.0.1g
- 
 +- Issue #19962: The Windows build process now creates "python.bat" in the
 +  root of the source tree, which passes all arguments through to the most
 +  recently built interpreter.
  
  - Issue #21285: Refactor and fix curses configure check to always search
    in a ncursesw directory.
@@@ -607,6 -463,6 +605,12 @@@ Tools/Demo
  - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
    Patch by Arfrever Frehtes Taifersar Arahesis.
  
++Windows
++-------
++
++- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
++  updated to 1.0.1h.
++
  
  What's New in Python 3.4.0?
  ===========================
diff --cc PCbuild/pyproject.props
index d9811cc6d9,4bc68fb0ad..20b63fcb70
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@@ -20,11 -20,13 +20,11 @@@
      <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
      <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
      <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
-     <opensslDir>$(externalsDir)\openssl-1.0.1g</opensslDir>
+     <opensslDir>$(externalsDir)\openssl-1.0.1h</opensslDir>
 +    <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
 +    <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
 +    <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>
      <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 -    <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
 -    <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
 -    <tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug>
 -    <tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib>
 -    <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug>
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>
diff --cc Tools/buildbot/external-common.bat
index 8e62cf7fed,ebee25a517..acc2b02056
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@@ -10,8 -10,8 +10,8 @@@ cd .
  @rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0
  @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0
  @rem if exist db-4.4.20 rd /s/q db-4.4.20
- @rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1g
+ @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
 -@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
 +@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
  
  @rem bzip
  if not exist bzip2-1.0.6 (
@@@ -20,14 -20,14 +20,14 @@@
  )
  
  @rem OpenSSL
- if not exist openssl-1.0.1g (
-     rd /s/q openssl-1.0.1e
-     svn export http://svn.python.org/projects/external/openssl-1.0.1g
+ if not exist openssl-1.0.1h (
+     rd /s/q openssl-1.0.1g
+     svn export http://svn.python.org/projects/external/openssl-1.0.1h
  )
  
 -@rem tcl/tk
 +@rem tcl/tk/tix
  if not exist tcl-8.6.1.0 (
 -   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
 +   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0 tix-8.4.3.3
     svn export http://svn.python.org/projects/external/tcl-8.6.1.0
  )
  if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0