bpo-41837: Update macOS installer build to use OpenSSL 1.1.1i. (GH-24080)
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2afdc32..4d7bc10 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,15 +242,12 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.1.1g",
- url="https://www.openssl.org/source/openssl-1.1.1g.tar.gz",
- checksum='76766e98997660138cdaf13a187bd234',
+ name="OpenSSL 1.1.1i",
+ url="https://www.openssl.org/source/openssl-1.1.1i.tar.gz",
+ checksum='08987c3cf125202e2b0840035efb392c',
buildrecipe=build_universal_openssl,
configure=None,
install=None,
- patches=[
- "openssl-mac-arm64.patch",
- ],
),
])
diff --git a/Mac/BuildScript/openssl-mac-arm64.patch b/Mac/BuildScript/openssl-mac-arm64.patch
deleted file mode 100644
index 11267fb..0000000
--- a/Mac/BuildScript/openssl-mac-arm64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur openssl-1.1.1g-orig/Configurations/10-main.conf openssl-1.1.1g/Configurations/10-main.conf
---- openssl-1.1.1g-orig/Configurations/10-main.conf 2020-04-21 14:22:39.000000000 +0200
-+++ openssl-1.1.1g/Configurations/10-main.conf 2020-07-26 12:21:32.000000000 +0200
-@@ -1557,6 +1557,14 @@
- bn_ops => "SIXTY_FOUR_BIT_LONG",
- perlasm_scheme => "macosx",
- },
-+ "darwin64-arm64-cc" => {
-+ inherit_from => [ "darwin-common", asm("aarch64_asm") ],
-+ CFLAGS => add("-Wall"),
-+ cflags => add("-arch arm64"),
-+ lib_cppflags => add("-DL_ENDIAN"),
-+ bn_ops => "SIXTY_FOUR_BIT_LONG",
-+ perlasm_scheme => "ios64",
-+ },
-
- ##### GNU Hurd
- "hurd-x86" => {
-diff -ur openssl-1.1.1g-orig/config openssl-1.1.1g/config
---- openssl-1.1.1g-orig/config 2020-04-21 14:22:39.000000000 +0200
-+++ openssl-1.1.1g/config 2020-07-26 12:21:59.000000000 +0200
-@@ -255,6 +255,9 @@
- ;;
- x86_64)
- echo "x86_64-apple-darwin${VERSION}"
-+ ;;
-+ arm64)
-+ echo "arm64-apple-darwin${VERSION}"
- ;;
- *)
- echo "i686-apple-darwin${VERSION}"
-@@ -497,6 +500,9 @@
- else
- OUT="darwin64-x86_64-cc"
- fi ;;
-+ x86_64-apple-darwin*)
-+ OUT="darwin64-arm64-cc"
-+ ;;
- armv6+7-*-iphoneos)
- __CNF_CFLAGS="$__CNF_CFLAGS -arch armv6 -arch armv7"
- __CNF_CXXFLAGS="$__CNF_CXXFLAGS -arch armv6 -arch armv7"