gh-100180: Update macOS installer to OpenSSL 1.1.1s (GH-100908)

(cherry picked from commit 57a5259a438c717755fc667fcbedb515ef8e0c85)

Co-authored-by: Ned Deily <nad@python.org>

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 86eed5ff9569923e7e04517129e28d378641eb94..f756a994375904e98347dd946bca0a699494196d 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -246,10 +246,9 @@ def library_recipes():
 
     result.extend([
           dict(
-              name="OpenSSL 1.1.1q",
-              url="https://www.openssl.org/source/openssl-1.1.1q.tar.gz",
-              checksum='d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca',
-              patches=['openssl1.1.1q-pr-18719.patch'],
+              name="OpenSSL 1.1.1s",
+              url="https://www.openssl.org/source/openssl-1.1.1s.tar.gz",
+              checksum='c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa',
               buildrecipe=build_universal_openssl,
               configure=None,
               install=None,

diff --git a/Mac/BuildScript/openssl1.1.1q-pr-18719.patch b/Mac/BuildScript/openssl1.1.1q-pr-18719.patch
deleted file mode 100644 (file)
index 6b4b188..0000000
--- a/Mac/BuildScript/openssl1.1.1q-pr-18719.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/openssl/openssl/commit/60f011f584d80447e86cae1d1bd3ae24bc13235b
-This fixes a regression in 1.1.1q:
-
-test/v3ext.c:201:24: error: implicitly declaring library function 'memcmp' with type 'int (const void *, const void *, unsigned long)' [-Werror,-Wimplicit-function-declaration]
-        if (!TEST_true(memcmp(ip1->data, ip2->data, ip1->length) <= 0))
-
-diff -Naur openssl-1.1.1q/test/v3ext.c openssl-1.1.1q-patched/test/v3ext.c
---- openssl-1.1.1q/test/v3ext.c        2022-07-05 09:08:33.000000000 +0000
-+++ openssl-1.1.1q-patched/test/v3ext.c        2022-09-05 16:54:45.740859256 +0000
-@@ -8,6 +8,7 @@
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include <openssl/x509.h>
- #include <openssl/x509v3.h>
- #include <openssl/pem.h>

diff --git a/Misc/NEWS.d/next/macOS/2023-01-09-22-04-21.gh-issue-100180.WVhCny.rst b/Misc/NEWS.d/next/macOS/2023-01-09-22-04-21.gh-issue-100180.WVhCny.rst
new file mode 100644 (file)
index 0000000..b7d94a0
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2023-01-09-22-04-21.gh-issue-100180.WVhCny.rst
@@ -0,0 +1 @@
+Update macOS installer to OpenSSL 1.1.1s