mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 06:06:43 +00:00
curl: update to curl-7.48.0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
ad6f0bde0c
commit
a6589782c6
@ -25,7 +25,7 @@
|
|||||||
# there: http://forum.xbmc.org/showthread.php?tid=177557
|
# there: http://forum.xbmc.org/showthread.php?tid=177557
|
||||||
|
|
||||||
PKG_NAME="curl"
|
PKG_NAME="curl"
|
||||||
PKG_VERSION="7.47.1"
|
PKG_VERSION="7.48.0"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="MIT"
|
PKG_LICENSE="MIT"
|
||||||
|
27
packages/web/curl/patches/curl-01-upstream.patch
Normal file
27
packages/web/curl/patches/curl-01-upstream.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 240cd84b494e0ffee8ad261c43b927d246cf6be1 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
|
Loading…
x
Reference in New Issue
Block a user