Skip to content

Commit aa02ab1

Browse files
[2.7] bpo-34405: Update to OpenSSL 1.0.2p for macOS installer builds (GH-9191) (GH-9196)
(cherry picked from commit 31912b4) Co-authored-by: Ned Deily <[email protected]> <!-- issue-number: [bpo-34405](https://www.bugs.python.org/issue34405) --> https://bugs.python.org/issue34405 <!-- /issue-number -->
1 parent d919c60 commit aa02ab1

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

‎Mac/BuildScript/build-installer.py‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ def library_recipes():
211211

212212
result.extend([
213213
dict(
214-
name="OpenSSL 1.0.2o",
215-
url="https://www.openssl.org/source/openssl-1.0.2o.tar.gz",
216-
checksum='44279b8557c3247cbe324e2322ecd114',
214+
name="OpenSSL 1.0.2p",
215+
url="https://www.openssl.org/source/openssl-1.0.2p.tar.gz",
216+
checksum='ac5eb30bf5798aa14b1ae6d0e7da58df',
217217
buildrecipe=build_universal_openssl,
218218
configure=None,
219219
install=None,
@@ -824,6 +824,13 @@ def build_openssl_arch(archbase, arch):
824824
]
825825
if no_asm:
826826
configure_opts.append("no-asm")
827+
# OpenSSL 1.0.2o broke the Configure test for whether the compiler
828+
# in use supports dependency rule generation (cc -M) with gcc-4.2
829+
# used for the 10.6+ installer builds. Patch Configure here to
830+
# force use of "cc -M" rather than "makedepend".
831+
runCommand(
832+
"""sed -i "" 's|my $cc_as_makedepend = 0|my $cc_as_makedepend = 1|g' Configure""")
833+
827834
runCommand(" ".join(["perl", "Configure"]
828835
+ arch_opts[arch] + configure_opts))
829836
runCommand("make depend")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update to OpenSSL 1.0.2p for macOS installer builds.

0 commit comments

Comments
 (0)