Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Ned Deily 2022-09-05 14:37:24 -04:00 committed by GitHub
parent 200c9a8da0
commit 991b3712a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mac/BuildScript/build-installer.py
View File

@ -249,6 +249,7 @@ def library_recipes():
name="OpenSSL 1.1.1q", name="OpenSSL 1.1.1q",
url="https://www.openssl.org/source/openssl-1.1.1q.tar.gz", url="https://www.openssl.org/source/openssl-1.1.1q.tar.gz",
checksum='d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca', checksum='d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca',
patches=['openssl1.1.1q-pr-18719.patch'],
buildrecipe=build_universal_openssl, buildrecipe=build_universal_openssl,
configure=None, configure=None,
install=None, install=None,

17
Mac/BuildScript/openssl1.1.1q-pr-18719.patch Normal file
View File

@ -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>