From 17ce8dd5336d5423abd82951300905bbd86bbf13 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Tue, 27 Jun 2023 15:15:56 -0700 Subject: [PATCH] (PA-4553) Remove OpenSSL patch This reverts commit 6c5acb1, which was a patch for OpenSSL on macOS that affected OpenSSL 1.1.1q, but was fixed in 1.1.1s. The OpenSSL Vanagon component used by projects uses OpenSSL 1.1.1t, so we no longer need this patch. --- configs/components/openssl-1.1.1.rb | 7 ------- .../openssl/openssl_1.1.1q_fix_c_include.patch | 12 ------------ 2 files changed, 19 deletions(-) delete mode 100644 resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch diff --git a/configs/components/openssl-1.1.1.rb b/configs/components/openssl-1.1.1.rb index 77ac5da01..2b57053fe 100644 --- a/configs/components/openssl-1.1.1.rb +++ b/configs/components/openssl-1.1.1.rb @@ -110,13 +110,6 @@ end end - # OpenSSL 1.1.1q has a bug with a test not including a required library that caueses - # packing failures on macos. Probably safe to look at the 1.1.1r release to see if - # this can be removed. - if platform.is_macos? - pkg.apply_patch 'resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch' - end - # OpenSSL Configure doesn't honor CFLAGS or LDFLAGS as environment variables. # Instead, those should be passed to Configure at the end of its options, as # any unrecognized options are passed straight through to ${CC}. Defining diff --git a/resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch b/resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch deleted file mode 100644 index e7088e5e1..000000000 --- a/resources/patches/openssl/openssl_1.1.1q_fix_c_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/test/v3ext.c b/test/v3ext.c -index 7a240cd706..6cec6f1a9b 100644 ---- a/test/v3ext.c -+++ b/test/v3ext.c -@@ -15,6 +15,7 @@ - #include - #include "internal/nelem.h" - -+#include - #include "testutil.h" - - static const char *infile;