From a6589782c6d1f2a3c0276024e343b7f1d68ea9cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 Mar 2016 04:50:57 +0200 Subject: [PATCH] curl: update to curl-7.48.0 Signed-off-by: Stephan Raue --- packages/web/curl/package.mk | 2 +- .../web/curl/patches/curl-01-upstream.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/web/curl/patches/curl-01-upstream.patch diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 67d2ec6689..744a217830 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -25,7 +25,7 @@ # there: http://forum.xbmc.org/showthread.php?tid=177557 PKG_NAME="curl" -PKG_VERSION="7.47.1" +PKG_VERSION="7.48.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/web/curl/patches/curl-01-upstream.patch b/packages/web/curl/patches/curl-01-upstream.patch new file mode 100644 index 0000000000..07922fdefe --- /dev/null +++ b/packages/web/curl/patches/curl-01-upstream.patch @@ -0,0 +1,27 @@ +From 240cd84b494e0ffee8ad261c43b927d246cf6be1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +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