traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #28248: Update Windows build to use OpenSSL 1.0.2j

This commit is contained in:
Zachary Ware 2016-10-10 21:57:04 -05:00
parent 829d4fbbf9
commit 8fb09ada55
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -230,6 +230,8 @@ Tests
Build
-----
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
- Issue #28258: Fixed build with Estonian locale (distclean target in
Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.

2
PC/VS9.0/pyproject.vsprops
View File

@ -82,7 +82,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.2h"
Value="$(externalsDir)\openssl-1.0.2j"
/>
<UserMacro
Name="tcltkDir"

2
PC/VS9.0/readme.txt
View File

@ -132,7 +132,7 @@ _ssl
Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.2h
svn export http://svn.python.org/projects/external/openssl-1.0.2j
** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source

2
PCbuild/get_externals.bat
View File

@ -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.2h
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
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

2
PCbuild/python.props
View File

@ -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.2h\</opensslDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

2
PCbuild/readme.txt
View File

@ -183,7 +183,7 @@ _bz2
Homepage:
http://www.bzip.org/
_ssl
Python wrapper for version 1.0.2h of the OpenSSL secure sockets
Python wrapper for version 1.0.2j of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/