mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #21671: Merge with 3.4

Browse source
This commit is contained in:
Zachary Ware 2014-06-06 01:27:34 -05:00
commit 3266a8fa59
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Misc/NEWS
View file

@ -484,8 +484,6 @@ Build
- Issue #21037: Add a build option to enable AddressSanitizer support. - 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 - 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 root of the source tree, which passes all arguments through to the most
recently built interpreter. recently built interpreter.
@ -607,6 +605,12 @@ Tools/Demos
- Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
Patch by Arfrever Frehtes Taifersar Arahesis. 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? What's New in Python 3.4.0?
=========================== ===========================

2
PCbuild/pyproject.props
View file

@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> <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> <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
<tkDir>$(externalsDir)\tk-8.6.1.0</tkDir> <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
<tixDir>$(externalsDir)\tix-8.4.3.4</tixDir> <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>

2
PCbuild/readme.txt
View file

@ -168,7 +168,7 @@ _lzma
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _ssl
Python wrapper for version 1.0.1g of the OpenSSL secure sockets Python wrapper for version 1.0.1h of the OpenSSL secure sockets
library, which is built by ssl.vcxproj library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/

8
Tools/buildbot/external-common.bat
View file

@ -10,7 +10,7 @@ cd ..
@rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0 @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 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 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 @rem bzip
@ -20,9 +20,9 @@ if not exist bzip2-1.0.6 (
) )
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.1g ( if not exist openssl-1.0.1h (
rd /s/q openssl-1.0.1e rd /s/q openssl-1.0.1g
svn export http://svn.python.org/projects/external/openssl-1.0.1g svn export http://svn.python.org/projects/external/openssl-1.0.1h
) )
@rem tcl/tk/tix @rem tcl/tk/tix