Kaydet (Commit) 3d5c9e2c authored tarafından Martin v. Löwis's avatar Martin v. Löwis

Update to 1.0.1g

üst d8ea56d2
...@@ -218,6 +218,8 @@ IDLE ...@@ -218,6 +218,8 @@ IDLE
Build Build
----- -----
- The Windows build now includes OpenSSL 1.0.1g
- Issue #21285: Refactor and fix curses configure check to always search - Issue #21285: Refactor and fix curses configure check to always search
in a ncursesw directory. in a ncursesw directory.
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.1e" Value="$(externalsDir)\openssl-1.0.1g"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> <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> <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
......
...@@ -168,7 +168,7 @@ _lzma ...@@ -168,7 +168,7 @@ _lzma
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _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 library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/
......
...@@ -14,7 +14,7 @@ cd .. ...@@ -14,7 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16 @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 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 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 @rem bzip
...@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 ( ...@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
) )
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.1e ( if not exist openssl-1.0.1g (
rd /s/q openssl-1.0.1d rd /s/q openssl-1.0.1e
svn export http://svn.python.org/projects/external/openssl-1.0.1e svn export http://svn.python.org/projects/external/openssl-1.0.1g
) )
@rem tcl/tk @rem tcl/tk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment