Sfoglia il codice sorgente

curl: fix with latest libressl

Waldemar Brodkorb 8 anni fa
parent
commit
a3c7219c3e
2 ha cambiato i file con 13 aggiunte e 1 eliminazioni
  1. 1 1
      package/curl/Makefile
  2. 12 0
      package/curl/patches/patch-lib_vtls_openssl_c

+ 1 - 1
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

+ 12 - 0
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