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

Issue #23686: Update Windows build to use OpenSSL 1.0.2a

This commit is contained in:
Zachary Ware 2015-04-07 20:33:54 -05:00
parent 928b3fff8a
commit 563e7c6cd5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -248,7 +248,8 @@ Build
- Issue #23032: Fix installer build failures on OS X 10.4 Tiger - Issue #23032: Fix installer build failures on OS X 10.4 Tiger
by disabling assembly code in the OpenSSL build. by disabling assembly code in the OpenSSL build.
- 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.
C API C API
----- -----

2
PCbuild/pyproject.vsprops
View File

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

2
PCbuild/readme.txt
View File

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

5
Tools/buildbot/external-common.bat
View File

@ -29,6 +29,7 @@ cd externals
@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i @rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j @rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
@rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l @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.6.21 rd /s/q sqlite-3.6.21 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip @rem bzip
@ -46,8 +47,8 @@ if not exist db-4.7.25.0 svn export %SVNROOT%db-4.7.25.0
if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06 if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
@rem OpenSSL @rem OpenSSL
if exist openssl-1.0.1j rd /s/q openssl-1.0.1j if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
if not exist openssl-1.0.1l svn export %SVNROOT%openssl-1.0.1l if not exist openssl-1.0.2a svn export %SVNROOT%openssl-1.0.2a
@rem tcl/tk @rem tcl/tk
if not exist tcl-8.5.15.0 ( if not exist tcl-8.5.15.0 (