diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-08 00:59:37 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-08 00:59:37 (GMT) |
| commit | 9f3109c4594b8f321edb1241c023f0e6c3eb5082 (patch) | |
| tree | d6f5fa034e30a80370d7f5d04a2fce1360478908 | |
| parent | fe5ac52c2bc1489c16652795bbdf2b21ae9a10f2 (diff) | |
| download | cpython-9f3109c4594b8f321edb1241c023f0e6c3eb5082.zip cpython-9f3109c4594b8f321edb1241c023f0e6c3eb5082.tar.gz cpython-9f3109c4594b8f321edb1241c023f0e6c3eb5082.tar.bz2 | |
Issue #23686: Update Windows build to use OpenSSL 1.0.2a.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 8 |
4 files changed, 8 insertions, 7 deletions
@@ -178,7 +178,8 @@ Build - Issue #23445: pydebug builds now use "gcc -Og" where possible, to make the resulting executable faster. -- Issue #23686: Update OS X 10.5 installer build to use OpenSSL 1.0.2a. +- Issue #23686: Update OS X 10.5 installer and Windows builds to use + OpenSSL 1.0.2a. What's New in Python 3.4.3? diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index e8f3138..7e6c7dd 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,7 @@ <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.1l</opensslDir> + <opensslDir>$(externalsDir)\openssl-1.0.2a</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 018bdf0..d5b0dfe 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -171,7 +171,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.0.1j of the OpenSSL secure sockets + Python wrapper for version 1.0.2a of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/ diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index b49b498..4b902d5 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -14,7 +14,7 @@ cd externals @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0 @rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4 @rem if exist db-4.4.20 rd /s/q db-4.4.20 -@rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l +@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 @rem bzip @@ -28,9 +28,9 @@ if not exist bzip2-1.0.6 ( if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06 @rem OpenSSL -if not exist openssl-1.0.1l ( - rd /s/q openssl-1.0.1j - svn export %SVNROOT%openssl-1.0.1l +if not exist openssl-1.0.2a ( + rd /s/q openssl-1.0.1l + svn export %SVNROOT%openssl-1.0.2a ) @rem tcl/tk |