[Python-checkins] cpython (3.4): Issue #23686: Update Windows build to use OpenSSL 1.0.2a.
zach.ware
python-checkins at python.org
Thu Apr 9 21:46:31 CEST 2015
https://hg.python.org/cpython/rev/404e4adf492c
changeset: 95497:404e4adf492c
branch: 3.4
parent: 95492:283036fe48e2
user: Zachary Ware <zachary.ware at gmail.com>
date: Tue Apr 07 19:59:37 2015 -0500
summary:
Issue #23686: Update Windows build to use OpenSSL 1.0.2a.
files:
Misc/NEWS | 3 ++-
PCbuild/pyproject.props | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 8 ++++----
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -178,7 +178,8 @@
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster.
-- 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.
What's New in Python 3.4.3?
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- 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.1l</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.2a</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -171,7 +171,7 @@
Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.1j of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2a of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@
@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
- at rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
+ at rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@@ -28,9 +28,9 @@
if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
@rem OpenSSL
-if not exist openssl-1.0.1l (
- rd /s/q openssl-1.0.1j
- svn export %SVNROOT%openssl-1.0.1l
+if not exist openssl-1.0.2a (
+ rd /s/q openssl-1.0.1l
+ svn export %SVNROOT%openssl-1.0.2a
)
@rem tcl/tk
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list