From a3c7219c3e59a4ae7922fceac751f31733a74167 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 13 Apr 2016 19:42:37 +0200 Subject: curl: fix with latest libressl --- package/curl/Makefile | 2 +- package/curl/patches/patch-lib_vtls_openssl_c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 package/curl/patches/patch-lib_vtls_openssl_c (limited to 'package/curl') diff --git a/package/curl/Makefile b/package/curl/Makefile index 2bc67792d..c9a985d86 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl PKG_VERSION:= 7.48.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= d248f3f9288ae20b8a7e462cb1909a6e67ad5c585040bca64fa2a71d993f3b1b PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http diff --git a/package/curl/patches/patch-lib_vtls_openssl_c b/package/curl/patches/patch-lib_vtls_openssl_c new file mode 100644 index 000000000..7f76222e4 --- /dev/null +++ b/package/curl/patches/patch-lib_vtls_openssl_c @@ -0,0 +1,12 @@ +--- curl-7.48.0.orig/lib/vtls/openssl.c 2016-03-22 08:15:38.000000000 +0100 ++++ curl-7.48.0/lib/vtls/openssl.c 2016-04-10 10:45:18.637693023 +0200 +@@ -95,7 +95,8 @@ + + #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) + /* OpenSSL 1.1.0-pre4 removed the argument! */ + #define HAVE_ERR_REMOVE_THREAD_STATE_NOARG 1 + #endif -- cgit v1.2.3