Upgrade openssl to 0.9.8x.

diff --git a/Misc/NEWS b/Misc/NEWS
index 2ab141bad44a1fe4d6aefc3211cc574d02103ad9..1da4cee1b660b7483a1bb1fc7390cb9dc8f12d88 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -157,6 +157,8 @@ Tests
 Build
 -----
 
+- Build against bzip2 1.0.6 and openssl 0.9.8x on Windows.
+
 - Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
 
 - Issue #14437: Fix building the _io module under Cygwin.

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 5d8a8abb0beedd01537601aadfb29e165414a19e..0516d1266b42665914cbec20e700f1a6c0c27975 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-0.9.8l"\r
+               Value="$(externalsDir)\openssl-0.9.8x"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 7135d7e0c012c6e272ed123f136d7e6a55040a7c..0b7fa0faeadbcf909f49468784887ce4409087a1 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-0.9.8l"\r
+               Value="$(externalsDir)\openssl-0.9.8x"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 4412d2ee648db116f489e3a830f73d869736c332..d3c229dc7bd1b500078b4d09c6dcf00ea1eecb00 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-0.9.8l
+    svn export http://svn.python.org/projects/external/openssl-0.9.8x
 
     ** 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 55c46aa211ac8fef95ed681007cc84a8da62c2c8..1bd6b0833d803138d09900f5a8eb7b677390a574 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -15,7 +15,7 @@ cd ..
 @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.7.25.0 rd /s/q db-4.7.25.0
-@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l
+@rem if exist openssl-0.9.8x rd /s/q openssl-0.9.8x
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    
 
 @rem bzip
@@ -29,7 +29,7 @@ if exist db-4.4.20 rd /s/q db-4.4.20
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l
+if not exist openssl-0.9.8x svn export http://svn.python.org/projects/external/openssl-0.9.8x
 
 @rem tcl/tk
 if not exist tcl-8.5.2.1 (