From: Steve Dower Date: Tue, 28 Jul 2015 18:09:40 +0000 (-0700) Subject: Issue #19450: Update Windows builds to use SQLite 3.8.11.0 X-Git-Tag: v3.6.0a1~1895^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e167ca7c1a299e8847d6b48067cdaa670d6a64f;p=python Issue #19450: Update Windows builds to use SQLite 3.8.11.0 --- 4e167ca7c1a299e8847d6b48067cdaa670d6a64f diff --cc Misc/NEWS index 4a7aca46b6,4cf7d6d0ec..01628d3734 --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -10,34 -10,58 +10,36 @@@ Release date: 2015-08-0 Core and Builtins ----------------- -- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray - object now always allocates place for trailing null byte and it's buffer now - is always null-terminated. - -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(), - PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains() - to check for and handle errors correctly. - -- Issue #24257: Fixed system error in the comparison of faked - types.SimpleNamespace. - -- Issue #22939: Fixed integer overflow in iterator object. Patch by - Clement Rouault. - -- Issue #23985: Fix a possible buffer overrun when deleting a slice from - the front of a bytearray and then appending some other bytes data. - -- Issue #24102: Fixed exception type checking in standard error handlers. +Library +------- -- Issue #23757: PySequence_Tuple() incorrectly called the concrete list API - when the data was a list subclass. ++- Issue #19450: Update Windows builds to use SQLite 3.8.11.0 + -- Issue #24407: Fix crash when dict is mutated while being updated. +- Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella. -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the - warnings.filters list. -- Issue #23996: Avoid a crash when a delegated generator raises an - unnormalized StopIteration exception. Patch by Stefan Behnel. +What's New in Python 3.5.0 beta 4? +================================== -- Issue #24022: Fix tokenizer crash when processing undecodable source code. +Release date: 2015-07-26 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted - while it is holding a lock to a buffered I/O object, and the main thread - tries to use the same I/O object (typically stdout or stderr). A fatal - error is emitted instead. +Core and Builtins +----------------- -- Issue #22977: Fixed formatting Windows error messages on Wine. - Patch by Martin Panter. +- Issue #23573: Restored optimization of bytes.rfind() and bytearray.rfind() + for single-byte argument on Linux. -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator - is wider then partitioned string. +- Issue #24569: Make PEP 448 dictionary evaluation more consistent. -- Issue #23192: Fixed generator lambdas. Patch by Bruno Cauet. +- Issue #24583: Fix crash when set is mutated while being updated. -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized - objects. +- Issue #24407: Fix crash when dict is mutated while being updated. -- Issue #24044: Fix possible null pointer dereference in list.sort in out of - memory conditions. +- Issue #24619: New approach for tokenizing async/await. As a consequence, + is is now possible to have one-line 'async def foo(): await ..' functions. -- Issue #21354: PyCFunction_New function is exposed by python DLL again. +- Issue #24687: Plug refleak on SyntaxError in function parameters + annotations. Library ------- diff --cc PCbuild/get_externals.bat index 95b0879bd7,0b8f0b85f9..3037326129 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@@ -55,10 -55,10 +55,10 @@@ for %%e in bzip2-1.0.6 nasm-2.11.06 openssl-1.0.2d - tcl-8.6.1.0 - tk-8.6.1.0 + tcl-core-8.6.4.1 + tk-8.6.4.1 tix-8.4.3.4 - sqlite-3.8.3.1 + sqlite-3.8.11.0 xz-5.0.5 ) do ( if exist %%e ( diff --cc PCbuild/python.props index c87ad80acb,0000000000..25d6d92010 mode 100644,000000..100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@@ -1,152 -1,0 +1,152 @@@ + + + + Win32 + Release + + v140 + v120 + v110 + v100 + + + amd64 + win32 + $(ArchName)-pgo + + + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\)) + $(PySourcePath)\ + + + $(PySourcePath)PCBuild\$(ArchName)\ + $(PyBuildPath) + $(BuildPath)\ + + + $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`)) - $(ExternalsDir)sqlite-3.8.3.1\ ++ $(ExternalsDir)sqlite-3.8.11.0\ + $(ExternalsDir)bzip2-1.0.6\ + $(ExternalsDir)xz-5.0.5\ + $(ExternalsDir)openssl-1.0.2d\ + $(ExternalsDir)\nasm-2.11.06\ + + + _d + + + $(BuildPath)python$(PyDebugExt).exe + + + + + <_PatchLevelContent>$([System.IO.File]::ReadAllText(`$(PySourcePath)Include\patchlevel.h`)) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MAJOR_VERSION\s+(\d+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MINOR_VERSION\s+(\d+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MICRO_VERSION\s+(\d+)`).Groups[1].Value) + <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_LEVEL\s+PY_RELEASE_LEVEL_(\w+)`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_SERIAL\s+(\d+)`).Groups[1].Value) + 15 + 10 + 11 + 12 + a$(ReleaseSerial) + b$(ReleaseSerial) + rc$(ReleaseSerial) + + + + + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[1].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[2].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[3].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[4].Value) + <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[5].Value) + $([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[6].Value) + 0 + 15 + 10 + 11 + 12 + + + + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber) + $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)$(ReleaseLevelName) + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MajorVersionNumber), 16777216)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MinorVersionNumber), 65536)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(MicroVersionNumber), 256)), + $([msbuild]::BitwiseOr( + $([msbuild]::Multiply($(ReleaseLevelNumber), 16)), + $(ReleaseSerial) + )) + )) + )) + )) + $([msbuild]::Add( + $(ReleaseSerial), + $([msbuild]::Add( + $([msbuild]::Multiply($(ReleaseLevelNumber), 10)), + $([msbuild]::Multiply($(MicroVersionNumber), 1000)) + )) + )) + + + python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt) + + + .cp$(MajorVersionNumber)$(MinorVersionNumber)-win32 + .cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64 + + + $(MajorVersionNumber).$(MinorVersionNumber) + $(SysWinVer)-32 + + + + + + + + + + diff --cc PCbuild/readme.txt index b045ed1eb8,74a79c1d6f..9d5f342e9e --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@@ -210,29 -184,37 +210,29 @@@ _ss you should first try to update NASM and do a full rebuild of OpenSSL. If you use the PCbuild\get_externals.bat method for getting sources, it also downloads a version of NASM which the - ssl build script will add to PATH. + libeay/ssleay sub-projects use. + + The libeay/ssleay sub-projects expect your OpenSSL sources to have + already been configured and be ready to build. If you get your sources + from svn.python.org as suggested in the "Getting External Sources" + section below, the OpenSSL source will already be ready to go. If + you want to build a different version, you will need to run - If you like to use the official sources instead of the files from - python.org's subversion repository, Perl is required to build the - necessary makefiles and assembly files. ActivePerl is available - from + PCbuild\prepare_ssl.py path\to\openssl-source-dir + + That script will prepare your OpenSSL sources in the same way that + those available on svn.python.org have been prepared. Note that + Perl must be installed and available on your PATH to configure + OpenSSL. ActivePerl is recommended and is available from http://www.activestate.com/activeperl/ - The svn.python.org version contains pre-built makefiles and assembly - files. - - The build process makes sure that no patented algorithms are - included. For now RC5, MDC2 and IDEA are excluded from the build. - You may have to manually remove $(OBJ_D)\i_*.obj from ms\nt.mak if - using official sources; the svn.python.org-hosted version is already - fixed. - - The ssl.vcxproj sub-project simply invokes PCbuild/build_ssl.py, - which locates and builds OpenSSL. - - build_ssl.py attempts to catch the most common errors (such as not - being able to find OpenSSL sources, or not being able to find a Perl - that works with OpenSSL) and give a reasonable error message. If - you have a problem that doesn't seem to be handled correctly (e.g., - you know you have ActivePerl but we can't find it), please take a - peek at build_ssl.py and suggest patches. Note that build_ssl.py - should be able to be run directly from the command-line. - - The ssl sub-project does not have the ability to clean the OpenSSL - build; if you need to rebuild, you'll have to clean it by hand. + + The libeay and ssleay sub-projects will build the modules of OpenSSL + required by _ssl and _hashlib and may need to be manually updated when + upgrading to a newer version of OpenSSL or when adding new + functionality to _ssl or _hashlib. They will not clean up their output + with the normal Clean target; CleanAll should be used instead. _sqlite3 - Wraps SQLite 3.8.3.1, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.8.11.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter