diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-10-17 21:20:15 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-10-17 21:20:15 (GMT) |
| commit | 10229a450f82b5582abe3116bbc8cb73daba3e2f (patch) | |
| tree | 32169b48b898eb202cfd732349bd01a49f5f868f | |
| parent | 80315664bc6a9a947ac3cc000eb8c9ae17fb3626 (diff) | |
| download | cpython-10229a450f82b5582abe3116bbc8cb73daba3e2f.zip cpython-10229a450f82b5582abe3116bbc8cb73daba3e2f.tar.gz cpython-10229a450f82b5582abe3116bbc8cb73daba3e2f.tar.bz2 | |
Issue #22644: Update the Windows build to OpenSSL 1.0.1j
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 5 |
3 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,4 @@ -+++++++++++ ++++++++++++ Python News +++++++++++ @@ -288,7 +288,7 @@ Build Windows ------- -- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i. +- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index f98ca09..1c7cee7 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -82,7 +82,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1i"
+ Value="$(externalsDir)\openssl-1.0.1j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 0994679..51f82e0 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -24,6 +24,7 @@ cd .. @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h @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 sqlite-3.6.21 rd /s/q sqlite-3.6.21 @rem bzip @@ -37,8 +38,8 @@ if exist db-4.4.20 rd /s/q db-4.4.20 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 @rem OpenSSL -if exist openssl-1.0.1h rd /s/q openssl-1.0.1h -if not exist openssl-1.0.1i svn export http://svn.python.org/projects/external/openssl-1.0.1i +if exist openssl-1.0.1i rd /s/q openssl-1.0.1i +if not exist openssl-1.0.1j svn export http://svn.python.org/projects/external/openssl-1.0.1j @rem tcl/tk if not exist tcl-8.5.15.0 ( |