Commit d8903416 authored by Steve Dower's avatar Steve Dower Committed by GitHub

bpo-38117: Updates bundled OpenSSL to 1.0.2t (GH-16178)

parent 68d8c122
#!/usr/bin/env python3 #!/usr/bin/env python3
# We do not need to import built modules from PCbuild (duh), so
# filter those out here to save Steve from debugging it yet again.
import sys
sys.path[:] = [p for p in sys.path if p and 'PCbuild' not in p]
import argparse import argparse
import os import os
import pathlib import pathlib
import zipfile import zipfile
from urllib.request import urlretrieve from urllib.request import urlretrieve
def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose): def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose):
repo = f'cpython-{"bin" if binary else "source"}-deps' repo = f'cpython-{"bin" if binary else "source"}-deps'
url = f'https://github.com/{org}/{repo}/archive/{commit_hash}.zip' url = f'https://github.com/{org}/{repo}/archive/{commit_hash}.zip'
......
...@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0 ...@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2s if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2t
set libraries=%libraries% sqlite-3.28.0.0 set libraries=%libraries% sqlite-3.28.0.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir> <bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2s\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2t\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment