From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 5 Sep 2022 18:56:21 +0000 (-0700)
Subject: Add upstream openssl 1.1.1q patch for trivial build error on macOS (GH-96594)
X-Git-Tag: v3.10.8~147^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75c3a4ccaff2ed581be67c5f48c3ca8a9fed23b7;p=thirdparty%2FPython%2Fcpython.git

Add upstream openssl 1.1.1q patch for trivial build error on macOS (GH-96594)

(cherry picked from commit 991b3712a11a705efc6e45d22643bb2ccfb3eca5)

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

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 668667c00729..67a6e4b2cf77 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -249,6 +249,7 @@ def library_recipes():
               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'],
               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
new file mode 100644
index 000000000000..6b4b1883159f
--- /dev/null
+++ b/Mac/BuildScript/openssl1.1.1q-pr-18719.patch
@@ -0,0 +1,17 @@
+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>