diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-07-22 04:28:28 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-07-22 04:28:28 (GMT) |
| commit | bdaaf49ceac963547356723c559aedefcdacc6c3 (patch) | |
| tree | 110434f41d490bd86e07d10d76b23b2aae9709a6 /PCbuild | |
| parent | cafc34fa3d511e87056b532d7ba01961c5476152 (diff) | |
| parent | 80acc3ebbc4c81f9c1bff864eca076d6bdbe9ec6 (diff) | |
| download | cpython-bdaaf49ceac963547356723c559aedefcdacc6c3.zip cpython-bdaaf49ceac963547356723c559aedefcdacc6c3.tar.gz cpython-bdaaf49ceac963547356723c559aedefcdacc6c3.tar.bz2 | |
Issue #24603: Merge with 3.5
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7817691..95b0879 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... for %%e in (
bzip2-1.0.6
nasm-2.11.06
- openssl-1.0.2c
+ openssl-1.0.2d
tcl-core-8.6.4.1
tk-8.6.4.1
tix-8.4.3.4
diff --git a/PCbuild/python.props b/PCbuild/python.props index 857b8f8..22faf44 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -34,7 +34,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.2c\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2d\</opensslDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <!-- Suffix for all binaries when building for debug --> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 256cb7b..b045ed1 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -197,7 +197,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.2c of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2d of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|