]> granicus.if.org Git - python/commitdiff
Issue #23212: Update Windows copy of OpenSSL to 1.0.1l
authorSteve Dower <steve.dower@microsoft.com>
Sat, 31 Jan 2015 20:19:10 +0000 (12:19 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 31 Jan 2015 20:19:10 +0000 (12:19 -0800)
PCbuild/pyproject.props
Tools/buildbot/external-common.bat

index 52ff2c518d1b8ce44595c437a9596c0ab00afb01..e8f3138d2eaf8fdddb96a7e2cdecd3eb0adefeef 100644 (file)
@@ -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.1j</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1l</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
     <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
index dca7151827f1b411f5d750144471e7aee56438aa..b49b4983fee233d6e7e6568c9d34830d570f5f35 100644 (file)
@@ -14,7 +14,7 @@ cd externals
 @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0
 @rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
+@rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
 
 @rem bzip
@@ -28,9 +28,9 @@ if not exist bzip2-1.0.6 (
 if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
 
 @rem OpenSSL
-if not exist openssl-1.0.1j (
-    rd /s/q openssl-1.0.1i
-    svn export %SVNROOT%openssl-1.0.1j
+if not exist openssl-1.0.1l (
+    rd /s/q openssl-1.0.1j
+    svn export %SVNROOT%openssl-1.0.1l
 )
 
 @rem tcl/tk