From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 11 Oct 2016 03:22:27 +0000 (-0500)
Subject: Issue #28248: Merge with 3.5
X-Git-Tag: v3.6.0b3~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c08bb6c63a780d5558200f2fbf8619f31114f378;p=thirdparty%2FPython%2Fcpython.git

Issue #28248: Merge with 3.5
---

c08bb6c63a780d5558200f2fbf8619f31114f378
diff --cc Misc/NEWS
index 70dac5ae02ae,44e63d42f2d2..1b45dbfe0041
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,22 -2,10 +2,27 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.5.3 release candidate 1?
 -===============================================
 +What's New in Python 3.6.0 beta 3
 +=================================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
++Build
++-----
++
++- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
++
 +
 +What's New in Python 3.6.0 beta 2
 +=================================
  
 -Release date: TBA
 +*Release date: 2016-10-10*
  
  Core and Builtins
  -----------------
diff --cc PCbuild/get_externals.bat
index 91a2a6dca69e,1c3cdee2c4bd..de85402b8139
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@@ -54,12 -54,12 +54,12 @@@ echo.Fetching external libraries..
  set libraries=
  set libraries=%libraries%                                    bzip2-1.0.6
  if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06
- if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h
+ if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2j
 -set libraries=%libraries%                                    sqlite-3.8.11.0
 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
 +set libraries=%libraries%                                    sqlite-3.14.1.0
 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
  if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
 -set libraries=%libraries%                                    xz-5.0.5
 +set libraries=%libraries%                                    xz-5.2.2
  
  for %%e in (%libraries%) do (
      if exist %%e (
diff --cc PCbuild/python.props
index 2b9b903cc5d1,1553731d1fec..fd7c4add8ae1
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@@ -42,10 -43,10 +42,10 @@@
      
      <!-- Directories of external projects. tcltk is handled in tcltk.props -->
      <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
 -    <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
 +    <sqlite3Dir>$(ExternalsDir)sqlite-3.14.1.0\</sqlite3Dir>
      <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
 -    <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
 +    <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-     <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+     <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
      <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
      <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
      <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>