From: Zachary Ware Date: Fri, 17 Oct 2014 21:31:57 +0000 (-0500) Subject: Issue #22644: Update the Windows build to OpenSSL 1.0.1j X-Git-Tag: v3.5.0a1~640 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dc7278546992f1d985dd296fc0c0d884b57f0a5;p=thirdparty%2FPython%2Fcpython.git Issue #22644: Update the Windows build to OpenSSL 1.0.1j --- 4dc7278546992f1d985dd296fc0c0d884b57f0a5 diff --cc Misc/NEWS index f7de6d05e032,80721b0e3cc3..56fd60babc94 --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -1320,16 -939,6 +1320,15 @@@ Tools/Demo - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. Patch by Arfrever Frehtes Taifersar Arahesis. +Windows +------- + +- Issue #21907: Improved the batch scripts provided for building Python. + - - Issue #21671, #22160, CVE-2014-0224: The bundled version of OpenSSL has been - updated to 1.0.1i. ++- Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. + +- Issue #10747: Use versioned labels in the Windows start menu. + Patch by Olive Kilburn. What's New in Python 3.4.0? =========================== diff --cc PCbuild/get_externals.bat index 783df5c14abb,000000000000..84360517f80b mode 100644,000000..100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@@ -1,100 -1,0 +1,100 @@@ +@echo off +setlocal +rem Simple script to fetch source for external libraries + +pushd "%~dp0..\.." + +if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ + +rem Optionally clean up first. Be warned that this can be very destructive! +if not "%1"=="" ( + for %%c in (-c --clean --clean-only) do ( + if "%1"=="%%c" goto clean + ) + goto usage +) +goto fetch + +:clean +echo.Cleaning up external libraries. +for /D %%d in ( + bzip2-* + db-* + openssl-* + tcl-* + tcltk* + tk-* + tix-* + sqlite-* + xz-* + ) do ( + echo.Removing %%d + rmdir /s /q %%d +) +if "%1"=="--clean-only" ( + goto end +) + +:fetch +rem Fetch current versions + +svn --version > nul 2>&1 +if ERRORLEVEL 9009 ( + echo.svn.exe must be on your PATH. + echo.Try TortoiseSVN (http://tortoisesvn.net/^) and be sure to check the + echo.command line tools option. + popd + exit /b 1 +) + +echo.Fetching external libraries... + +for %%e in ( + bzip2-1.0.6 - openssl-1.0.1i ++ openssl-1.0.1j + tcl-8.6.1.0 + tk-8.6.1.0 + tix-8.4.3.4 + sqlite-3.8.3.1 + xz-5.0.5 + ) do ( + if exist %%e ( + echo.%%e already exists, skipping. + ) else ( + echo.Fetching %%e... + svn export %SVNROOT%%%e + ) +) + +goto end + +:usage +echo.invalid argument: %1 +echo.usage: %~n0 [[ -c ^| --clean ] ^| --clean-only ] +echo. +echo.Pull all sources necessary for compiling optional extension modules +echo.that rely on external libraries. Requires svn.exe to be on your PATH +echo.and pulls sources from %SVNROOT%. +echo. +echo.Use the -c or --clean option to clean up all external library sources +echo.before pulling in the current versions. +echo. +echo.Use the --clean-only option to do the same cleaning, without pulling in +echo.anything new. +echo. +echo.Only the first argument is checked, all others are ignored. +echo. +echo.**WARNING**: the cleaning options unconditionally remove any directory +echo.that is a child of +echo. %CD% +echo.and matches wildcard patterns beginning with bzip2-, db-, openssl-, tcl-, +echo.tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential to be +echo.very destructive if you are not aware of what it is doing. Use with +echo.caution! +popd +exit /b -1 + + +:end +echo Finished. +popd diff --cc PCbuild/pyproject.props index e566cdc550d4,d1e9dc02a0af..9f2b0e5a4286 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@@ -20,11 -20,13 +20,11 @@@ $(externalsDir)\sqlite-3.8.3.1 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.5 - $(externalsDir)\openssl-1.0.1i + $(externalsDir)\openssl-1.0.1j + $(externalsDir)\tcl-8.6.1.0 + $(externalsDir)\tk-8.6.1.0 + $(externalsDir)\tix-8.4.3.4 $(externalsDir)\tcltk - $(externalsDir)\tcltk64 - $(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib - $(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib - $(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib - $(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib diff --cc Tools/buildbot/build.bat index d37ec7b31c47,be79b10726d7..f68b88fde922 --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@@ -1,17 -1,7 +1,17 @@@ @rem Used by the buildbot "compile" step. -cmd /c Tools\buildbot\external.bat -call "%VS100COMNTOOLS%vsvars32.bat" -cmd /c Tools\buildbot\clean.bat -msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32 +@rem Clean up +call "%~dp0clean.bat" +@rem If you need the buildbots to start fresh (such as when upgrading to +@rem a new version of an external library, especially Tcl/Tk): +@rem 1) uncomment the following line: + - @rem call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only ++call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only + +@rem 2) commit and push +@rem 3) wait for all Windows bots to start a build with that changeset +@rem 4) re-comment, commit and push again + +@rem Do the build +call "%~dp0..\..\PCbuild\build.bat" -e -d %*