[Python-checkins] cpython (2.7): Issue #26930: Update Windows build to OpenSSL 1.0.2h
benjamin.peterson
python-checkins at python.org
Wed Jun 22 02:13:55 EDT 2016
https://hg.python.org/cpython/rev/ad037bba60bb
changeset: 102121:ad037bba60bb
branch: 2.7
parent: 101899:5811fcfe1043
user: Zachary Ware <zachary.ware at gmail.com>
date: Wed Jun 15 17:12:38 2016 -0500
summary:
Issue #26930: Update Windows build to OpenSSL 1.0.2h
files:
Misc/NEWS | 9 +++++++++
PC/VS9.0/pyproject.vsprops | 2 +-
PC/VS9.0/readme.txt | 2 +-
PCbuild/get_externals.bat | 2 +-
PCbuild/python.props | 2 +-
PCbuild/readme.txt | 2 +-
6 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,15 @@
Python News
+++++++++++
+What's New in Python 2.7.12?
+============================
+
+Build
+-----
+
+- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
+
+
What's New in Python 2.7.12 release candidate 1?
================================================
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -82,7 +82,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.2g"
+ Value="$(externalsDir)\openssl-1.0.2h"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS9.0/readme.txt b/PC/VS9.0/readme.txt
--- a/PC/VS9.0/readme.txt
+++ b/PC/VS9.0/readme.txt
@@ -132,7 +132,7 @@
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.2g
+ svn export http://svn.python.org/projects/external/openssl-1.0.2h
** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -58,7 +58,7 @@
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.2g
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
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
diff --git a/PCbuild/python.props b/PCbuild/python.props
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -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.2g\</opensslDir>
+ <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -183,7 +183,7 @@
Homepage:
http://www.bzip.org/
_ssl
- Python wrapper for version 1.0.2g of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2h of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list