[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4
martin.v.loewis
python-checkins at python.org
Thu May 1 15:19:46 CEST 2014
http://hg.python.org/cpython/rev/3cf9bd0a25ce
changeset: 90532:3cf9bd0a25ce
parent: 90530:4ed1b6c7e2f3
parent: 90531:94f4cad7d541
user: Martin v. Löwis <martin at v.loewis.de>
date: Thu May 01 15:18:43 2014 +0200
summary:
Merge with 3.4
files:
Misc/NEWS | 2 ++
PC/VS9.0/pyproject.vsprops | 2 +-
PCbuild/pyproject.props | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 8 ++++----
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -325,6 +325,8 @@
Build
-----
+- The Windows build now includes OpenSSL 1.0.1g
+
- Issue #19962: The Windows build process now creates "python.bat" in the
root of the source tree, which passes all arguments through to the most
recently built interpreter.
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
@@ -62,7 +62,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.1e"
+ Value="$(externalsDir)\openssl-1.0.1g"
/>
<UserMacro
Name="tcltkDir"
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.1e</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.1g</opensslDir>
<tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
<tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
<tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -168,7 +168,7 @@
Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.1e of the OpenSSL secure sockets
+ Python wrapper for version 1.0.1g 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 tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
- at rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
+ at rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1g
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@@ -24,9 +24,9 @@
)
@rem OpenSSL
-if not exist openssl-1.0.1e (
- rd /s/q openssl-1.0.1d
- svn export http://svn.python.org/projects/external/openssl-1.0.1e
+if not exist openssl-1.0.1g (
+ rd /s/q openssl-1.0.1e
+ svn export http://svn.python.org/projects/external/openssl-1.0.1g
)
@rem tcl/tk/tix
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list