Update to 1.0.1g
diff --git a/Misc/NEWS b/Misc/NEWS
index 93d3631..5d52ce7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -218,6 +218,8 @@
Build
-----
+- The Windows build now includes OpenSSL 1.0.1g
+
- Issue #21285: Refactor and fix curses configure check to always search
in a ncursesw directory.
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index 88af242..a909875 100644
--- 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
index 5f40b15..2219c95 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.1e</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.1g</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
index 9ecf911..b8184bf 100644
--- 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
index c63e889..53e3daf 100644
--- 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
-@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
+@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