mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
gh-107565: Update Windows build to use OpenSSL 3.0.10 (GH-108928)
Also clean up some intermediate NEWS entries about previous versions.
This commit is contained in:
parent
ad1d6a1c20
commit
deea7c8268
|
@ -1,2 +0,0 @@
|
|||
The version of OpenSSL used in our binary builds has been upgraded to 1.1.1u
|
||||
to address several CVEs.
|
|
@ -1 +0,0 @@
|
|||
Update Windows build to use OpenSSL 3.0.9
|
|
@ -0,0 +1 @@
|
|||
Update Windows build to use OpenSSL 3.0.10.
|
|
@ -1 +0,0 @@
|
|||
Update macOS installer to use OpenSSL 1.1.1u.
|
|
@ -53,7 +53,7 @@ echo.Fetching external libraries...
|
|||
set libraries=
|
||||
set libraries=%libraries% bzip2-1.0.8
|
||||
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
|
||||
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.9
|
||||
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.10
|
||||
set libraries=%libraries% sqlite-3.42.0.0
|
||||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0
|
||||
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
|
||||
|
@ -76,7 +76,7 @@ echo.Fetching external binaries...
|
|||
|
||||
set binaries=
|
||||
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
|
||||
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.9
|
||||
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.10
|
||||
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
|
||||
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
|
||||
|
||||
|
|
|
@ -74,8 +74,8 @@
|
|||
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
|
||||
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
|
||||
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
|
||||
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir>
|
||||
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir>
|
||||
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.10\</opensslDir>
|
||||
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.10\$(ArchName)\</opensslOutDir>
|
||||
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
|
||||
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
|
||||
|
|
Loading…
Reference in a new issue