From a09ef0389badf6646e1d470d722880e6d5d65f33 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 3 Jul 2015 15:13:48 -0700 Subject: [PATCH 1/4] Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. --- Misc/NEWS | 2 ++ PCbuild/get_externals.bat | 2 +- PCbuild/pyproject.props | 2 +- PCbuild/readme.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index becb9ef1937..95a1237c349 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -343,6 +343,8 @@ Build - Issue #23686: Update OS X 10.5 installer and Windows builds to use OpenSSL 1.0.2a. +- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. + C API ----- diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 3836ee468cd..8ece4e32c50 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... for %%e in ( bzip2-1.0.6 nasm-2.11.06 - openssl-1.0.2a + openssl-1.0.2c tcl-8.6.1.0 tk-8.6.1.0 tix-8.4.3.4 diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 7e6c7dd0eb7..26fd569fc4b 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,7 @@ $(externalsDir)\sqlite-3.8.3.1 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.5 - $(externalsDir)\openssl-1.0.2a + $(externalsDir)\openssl-1.0.2c $(externalsDir)\tcltk $(externalsDir)\tcltk64 $(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index c27af9989b7..5b3e9809096 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -171,7 +171,7 @@ _lzma Homepage: http://tukaani.org/xz/ _ssl - Python wrapper for version 1.0.2a of the OpenSSL secure sockets + Python wrapper for version 1.0.2c of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/ From 0454d48e0213d0187e63f78673b31639e3ea94ea Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 3 Jul 2015 23:35:00 -0700 Subject: [PATCH 2/4] Issue #24432: Update OS X 10.5+ installer builds to use OpenSSL 1.0.2c. --- Mac/BuildScript/build-installer.py | 6 +++--- Mac/BuildScript/openssl_sdk_makedepend.patch | 2 +- Misc/NEWS | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 872828967ea..7fe5512af58 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -237,9 +237,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.2a", - url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz", - checksum='a06c547dac9044161a477211049f60ef', + name="OpenSSL 1.0.2c", + url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz", + checksum='8c8d81a9ae7005276e486702edbcd4b6', patches=[ "openssl_sdk_makedepend.patch", ], diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch index 5903afdbff1..74d712115bd 100644 --- a/Mac/BuildScript/openssl_sdk_makedepend.patch +++ b/Mac/BuildScript/openssl_sdk_makedepend.patch @@ -2,7 +2,7 @@ # Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43 # openssl_sdk_makedepend.patch # -# using openssl 1.0.2a +# using openssl 1.0.2c # # - support building with an OS X SDK # - allow "make depend" to use compilers with names other than "gcc" diff --git a/Misc/NEWS b/Misc/NEWS index 95a1237c349..3d4694fa258 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -340,10 +340,8 @@ Build - Issue #23445: pydebug builds now use "gcc -Og" where possible, to make the resulting executable faster. -- Issue #23686: Update OS X 10.5 installer and Windows builds to use - OpenSSL 1.0.2a. - -- Issue #24432: Update Windows builds to use OpenSSL 1.0.2c. +- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL + 1.0.2c. C API ----- From a1005ed1aa6a4aa749aadaac090189ffcef587c3 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 4 Jul 2015 15:44:14 -0400 Subject: [PATCH 3/4] #24584: replace dead link with pointer to archive.org. --- Doc/library/unittest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index bdb18bc41fa..e7e3262f9e1 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -47,7 +47,7 @@ test runner Module :mod:`doctest` Another test-support module with a very different flavor. - `Simple Smalltalk Testing: With Patterns `_ + `Simple Smalltalk Testing: With Patterns `_ Kent Beck's original paper on testing frameworks using the pattern shared by :mod:`unittest`. From f1ce6deb4111267ab8de5cd6430c1bcebe1084bc Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 4 Jul 2015 15:05:07 -0700 Subject: [PATCH 4/4] =?UTF-8?q?Issue=20#24330:=20Update=20IDLE=20doc=20and?= =?UTF-8?q?=20help=20to=20note=20"Configure=20IDLE"=20difference=20on=20OS?= =?UTF-8?q?=20X.=20=20Original=20patch=20by=20Andr=C3=A9=20Freitas.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/library/idle.rst | 3 ++- Lib/idlelib/help.txt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index c842b2639cc..24e22c103de 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -248,7 +248,8 @@ Configure IDLE help sources can be specified. Non-default user setting are saved in a .idlerc directory in the user's home directory. Problems caused by bad user configuration files are solved by editing or deleting one or more of the - files in .idlerc. + files in .idlerc. On OS X, open the configuration dialog by selecting + Preferences in the application menu. Configure Extensions Open a configuration dialog for setting preferences for extensions diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt index 7eff3700405..95401734984 100644 --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -129,7 +129,9 @@ Options Menu (Shell and Editor): Configure IDLE -- Open a configuration dialog. Fonts, indentation, keybindings, and color themes may be altered. Startup Preferences may be set, and additional Help - sources can be specified. + sources can be specified. On OS X, open the + configuration dialog by selecting Preferences + in the application menu. --- Code Context (toggle) -- Open a pane at the top of the edit window