From 3a1b8699b6bf96fc5b61da97b7e589a013b93882 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 11 Jun 2014 15:43:24 +0000
Subject: curl: move to core packages

SVN-Revision: 41143
---
 ...001-cyassl-Use-error-ssl.h-when-available.patch | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 package/network/utils/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch

(limited to 'package/network/utils/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch')

diff --git a/package/network/utils/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch b/package/network/utils/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch
new file mode 100644
index 0000000000..d7190af3ad
--- /dev/null
+++ b/package/network/utils/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch
@@ -0,0 +1,45 @@
+From 0204e17bc656e6c59b4010283e67f9251eb12c41 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Wed, 23 Apr 2014 11:01:30 +0200
+Subject: [PATCH] cyassl: Use error-ssl.h when available
+
+Versions since at least 2.9.4 renamed error.h to error-ssl.h, so use
+whichever one is available.
+---
+ configure.ac      |    3 +++
+ lib/vtls/cyassl.c |    9 +++++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2003,6 +2003,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
+       dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
+       AC_CHECK_SIZEOF(long long)
+ 
++      dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h
++      AC_CHECK_HEADERS(cyassl/error-ssl.h)
++
+       LIBS="-lcyassl -lm $LIBS"
+ 
+       if test -n "$cyassllib"; then
+--- a/lib/vtls/cyassl.c
++++ b/lib/vtls/cyassl.c
+@@ -47,11 +47,16 @@
+ #define _MPRINTF_REPLACE /* use our functions only */
+ #include <curl/mprintf.h>
+ #include "curl_memory.h"
+-/* The last #include file should be: */
+-#include "memdebug.h"
++
+ #include <cyassl/ssl.h>
++#ifdef HAVE_CYASSL_ERROR_SSL_H
++#include <cyassl/error-ssl.h>
++#else
+ #include <cyassl/error.h>
++#endif
+ 
++/* The last #include file should be: */
++#include "memdebug.h"
+ 
+ static Curl_recv cyassl_recv;
+ static Curl_send cyassl_send;
-- 
cgit v1.2.3