Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d8903416
Commit
d8903416
authored
Sep 16, 2019
by
Steve Dower
Committed by
GitHub
Sep 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-38117: Updates bundled OpenSSL to 1.0.2t (GH-16178)
parent
68d8c122
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
Misc/NEWS.d/next/Windows/2019-09-16-12-47-12.bpo-38117.JaiB0X.rst
...S.d/next/Windows/2019-09-16-12-47-12.bpo-38117.JaiB0X.rst
+1
-0
PCbuild/get_external.py
PCbuild/get_external.py
+5
-1
PCbuild/get_externals.bat
PCbuild/get_externals.bat
+1
-1
PCbuild/python.props
PCbuild/python.props
+1
-1
No files found.
Misc/NEWS.d/next/Windows/2019-09-16-12-47-12.bpo-38117.JaiB0X.rst
0 → 100644
View file @
d8903416
Updates bundled OpenSSL to 1.0.2t
PCbuild/get_external.py
View file @
d8903416
#!/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'
...
...
PCbuild/get_externals.bat
View file @
d8903416
...
@@ -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.2
s
if
NOT
"
%IncludeSSL%
"
==
"false"
set
libraries
=
%libraries%
openssl
-
1
.0.2
t
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
...
...
PCbuild/python.props
View file @
d8903416
...
@@ -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.2
s
\
</opensslDir>
<opensslDir>
$(ExternalsDir)openssl-1.0.2
t
\
</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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment