diff options
author | Steve Dower <steve.dower@microsoft.com> | 2015-01-31 20:19:10 (GMT) |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2015-01-31 20:19:10 (GMT) |
commit | 6b8997391b3fe70daf897944a91c9bb753c7b82a (patch) | |
tree | b523112c49a2a7724a8b3c5a74aea4cbb5fbb1a3 | |
parent | 26f7b8acdc010801a8fe877376488e0b69a89dad (diff) | |
download | cpython-6b8997391b3fe70daf897944a91c9bb753c7b82a.zip cpython-6b8997391b3fe70daf897944a91c9bb753c7b82a.tar.gz cpython-6b8997391b3fe70daf897944a91c9bb753c7b82a.tar.bz2 |
Issue #23212: Update Windows copy of OpenSSL to 1.0.1l
-rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
-rw-r--r-- | Tools/buildbot/external-common.bat | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 52ff2c5..e8f3138 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,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.1j</opensslDir> + <opensslDir>$(externalsDir)\openssl-1.0.1l</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index dca7151..b49b498 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -14,7 +14,7 @@ cd externals @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0 @rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4 @rem if exist db-4.4.20 rd /s/q db-4.4.20 -@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 sqlite-3.7.12 rd /s/q sqlite-3.7.12 @rem bzip @@ -28,9 +28,9 @@ if not exist bzip2-1.0.6 ( if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06 @rem OpenSSL -if not exist openssl-1.0.1j ( - rd /s/q openssl-1.0.1i - svn export %SVNROOT%openssl-1.0.1j +if not exist openssl-1.0.1l ( + rd /s/q openssl-1.0.1j + svn export %SVNROOT%openssl-1.0.1l ) @rem tcl/tk |