From e01eb4cc808873461baaed549454edbe1e38055c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Fri, 18 May 2012 16:29:33 +0200
Subject: Upgrade OpenSSL to 1.0.1c

---
 Misc/NEWS                          | 2 ++
 PC/VC6/readme.txt                  | 4 ++--
 PC/VS8.0/pyproject.vsprops         | 2 +-
 PC/VS9.0/pyproject.vsprops         | 2 +-
 PCbuild/pyproject.props            | 2 +-
 PCbuild/readme.txt                 | 2 +-
 Tools/buildbot/external-common.bat | 7 +++++--
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index c83d3d3..3e11956 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -135,6 +135,8 @@ Tools/Demos
 Build
 -----
 
+- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c.
+
 - Issue #14693: Under non-Windows platforms, hashlib's fallback modules are
   always compiled, even if OpenSSL is present at build time.
 
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index b6fa5d2..d6ec6e6 100644
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,9 +153,9 @@ _ssl
 
     Unpack into the "dist" directory, retaining the folder name from
     the archive - for example, the latest stable OpenSSL will install as
-        dist/openssl-1.0.0j
+        dist/openssl-1.0.1c
 
-    You need to use version 1.0.0j of OpenSSL.
+    You need to use version 1.0.1c of OpenSSL.
 
     You can install the NASM assembler from
         http://www.nasm.us/
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index c311820..f86cdec 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.0j"
+		Value="$(externalsDir)\openssl-1.0.1c"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
index fa3dad7..01c7ca7 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.0j"
+		Value="$(externalsDir)\openssl-1.0.1c"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 522ac88..f466a07 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -7,7 +7,7 @@
     <sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
-    <opensslDir>$(externalsDir)\openssl-1.0.0j</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1c</opensslDir>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
     <tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index a45ed17..fe22929 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -148,7 +148,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-1.0.0j
+    svn export http://svn.python.org/projects/external/openssl-1.0.1c
 
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 39c316a..9757c20 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@ 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.0j rd /s/q openssl-1.0.0j
+@rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
 
 @rem bzip
@@ -24,7 +24,10 @@ if not exist bzip2-1.0.6 (
 )
 
 @rem OpenSSL
-if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
+if not exist openssl-1.0.0c (
+    rd /s/q openssl-1.0.0j
+    svn export http://svn.python.org/projects/external/openssl-1.0.0c
+)
 
 @rem tcl/tk
 if not exist tcl-8.5.11.0 (
-- 
cgit v0.12