Issue #17425: Build against openssl 0.9.8y on Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index 1f3601cd1fc70a43a5937b66e01853426d4fc23d..4138632e45238ccdb982e61912e8d1a232a1136a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -908,6 +908,8 @@ Tests
 Build
 -----
 
+- Issue #17425: Build against openssl 0.9.8y on Windows.
+
 - Issue #16004: Add `make touch`.
 
 - Issue #5033: Fix building of the sqlite3 extension module when the

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 0516d1266b42665914cbec20e700f1a6c0c27975..5a5fff666c428a0f636d5cc02c75b70f53a4786d 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.8x"\r
+               Value="$(externalsDir)\openssl-0.9.8y"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 0b7fa0faeadbcf909f49468784887ce4409087a1..024bfa82b2d67df018e7c55b0759fe774767f197 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.8x"\r
+               Value="$(externalsDir)\openssl-0.9.8y"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index d3c229dc7bd1b500078b4d09c6dcf00ea1eecb00..3395aac1bbd22ed95f6894fc7fcfa1ff003ca364 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.8x
+    svn export http://svn.python.org/projects/external/openssl-0.9.8y
 
     ** 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 1bd6b0833d803138d09900f5a8eb7b677390a574..9668e2c1d3d4b7b45692a4e54ad744f78c06d72c 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.8x rd /s/q openssl-0.9.8x
+@rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
 @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.8x svn export http://svn.python.org/projects/external/openssl-0.9.8x
+if not exist openssl-0.9.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y
 
 @rem tcl/tk
 if not exist tcl-8.5.2.1 (