From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 1 May 2014 13:18:43 +0000 (+0200)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1755
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9e71d4a55f968cd713bebe417e9fa4ba1ec12eb;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

b9e71d4a55f968cd713bebe417e9fa4ba1ec12eb
diff --cc Misc/NEWS
index 480f46a9fffd,5d52ce7c9b54..081ea6df64a1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -325,10 -218,8 +325,12 @@@ IDL
  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.
 +
  - Issue #21285: Refactor and fix curses configure check to always search
    in a ncursesw directory.
  
diff --cc PCbuild/pyproject.props
index f37e69d2d23b,2219c95077e9..d9811cc6d9ad
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@@ -20,11 -20,13 +20,11 @@@
      <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>
      <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 -    <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
 -    <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
 -    <tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug>
 -    <tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib>
 -    <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug>
    </PropertyGroup>
    <ItemDefinitionGroup>
      <ClCompile>
diff --cc Tools/buildbot/external-common.bat
index 672357cb3221,53e3dafe6432..48004a720eba
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@@ -14,8 -14,8 +14,8 @@@ cd .
  @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 if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
  
  @rem bzip
  if not exist bzip2-1.0.6 (
@@@ -24,14 -24,14 +24,14 @@@
  )
  
  @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
 +@rem tcl/tk/tix
  if not exist tcl-8.6.1.0 (
 -   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
 +   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0 tix-8.4.3.3
     svn export http://svn.python.org/projects/external/tcl-8.6.1.0
  )
  if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0