diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2017-03-03 22:28:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 22:28:39 (GMT) |
| commit | f9a6516117f96397aa9c5bd58ea13b111b86b257 (patch) | |
| tree | dabafd6d4e204f0930883f7fc15ca307d76a770e | |
| parent | fc59e5c7073af4d9255644a83933dd5b14c7f722 (diff) | |
| download | cpython-f9a6516117f96397aa9c5bd58ea13b111b86b257.zip cpython-f9a6516117f96397aa9c5bd58ea13b111b86b257.tar.gz cpython-f9a6516117f96397aa9c5bd58ea13b111b86b257.tar.bz2 | |
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-444)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PC/VS9.0/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
6 files changed, 7 insertions, 5 deletions
@@ -112,6 +112,8 @@ Documentation Build ----- +- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k. + - Issue #28768: Fix implicit declaration of function _setmode. Patch by Masayuki Yamamoto diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index 8b06f0c..41aebaf 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -82,7 +82,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.2j"
+ Value="$(externalsDir)\openssl-1.0.2k"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt index 10bfd99..55dda78 100644 --- a/PC/VS9.0/readme.txt +++ b/PC/VS9.0/readme.txt @@ -132,7 +132,7 @@ _ssl Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.2j
+ svn export http://svn.python.org/projects/external/openssl-1.0.2k
** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 387d9ae..21dcaa4 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -58,7 +58,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
diff --git a/PCbuild/python.props b/PCbuild/python.props index 21ea5fa..486a7c9 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -35,7 +35,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 67adb7f..9438b39 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -183,7 +183,7 @@ _bz2 Homepage:
http://www.bzip.org/
_ssl
- Python wrapper for version 1.0.2j of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2k of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|