diff options
| author | Michael Forney <mforney@mforney.org> | 2016-06-03 21:12:32 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-06-03 21:12:32 -0700 |
| commit | d9a6f9664b1f8afde88ec2a781ff6786b08eb3a3 (patch) | |
| tree | 8238289ece1a3f61025a101939048492322967bf | |
| parent | 3ae526ce4b7e1854fd00fe629098991155d7fd0b (diff) | |
curl: Remove obsolete patch
| -rw-r--r-- | core/curl/patch/0001-openssl-fix-ERR_remove_thread_state-for-boringssl-li.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/core/curl/patch/0001-openssl-fix-ERR_remove_thread_state-for-boringssl-li.patch b/core/curl/patch/0001-openssl-fix-ERR_remove_thread_state-for-boringssl-li.patch deleted file mode 100644 index 84f03145..00000000 --- a/core/curl/patch/0001-openssl-fix-ERR_remove_thread_state-for-boringssl-li.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 06a345cf2003e431c6c075b1a97738457609b6b7 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Wed, 23 Mar 2016 10:04:48 +0100 -Subject: [PATCH] openssl: fix ERR_remove_thread_state() for boringssl/libressl - -The removed arg is only done in OpenSSL - -Bug: https://twitter.com/xtraemeat/status/712564874098917376 ---- - lib/vtls/openssl.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c -index cbf2d21..b7e4462 100644 ---- a/lib/vtls/openssl.c -+++ b/lib/vtls/openssl.c -@@ -95,7 +95,9 @@ - - #if (OPENSSL_VERSION_NUMBER >= 0x10000000L) - #define HAVE_ERR_REMOVE_THREAD_STATE 1 --#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100004L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) && \ -+ !defined(OPENSSL_IS_BORINGSSL) - /* OpenSSL 1.1.0-pre4 removed the argument! */ - #define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1 - #endif --- -2.8.1 - |