From 1b5e519a61ddfbac786989f92b79d2611cc9622f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 23 Feb 2017 10:25:59 +0100 Subject: update: curl --- src/curl-1-fixes.patch | 30 ++++++++++++++++++++++++++++++ src/curl.mk | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/curl-1-fixes.patch diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch new file mode 100644 index 0000000..cacc70d --- /dev/null +++ b/src/curl-1-fixes.patch @@ -0,0 +1,30 @@ +From a893a953217ad8c8041de64049e133c12eb5ee54 Mon Sep 17 00:00:00 2001 +From: Viktor Szakats +Date: Tue, 21 Feb 2017 23:01:37 -0500 +Subject: [PATCH] urldata: include curl_sspi.h when Windows SSPI is enabled + +f77dabe broke builds in Windows using Windows SSPI but not Windows SSL. + +Bug: https://github.com/curl/curl/issues/1276 +Reported-by: jveazey@users.noreply.github.com +(cherry picked from commit f4739f639fc481a7bec7da73041dfcb3d26ed220) + +diff --git a/lib/urldata.h b/lib/urldata.h +index 648b3e8..7f87913 100644 +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -136,8 +136,10 @@ + #undef realloc + #endif /* USE_AXTLS */ + +-#ifdef USE_SCHANNEL ++#if defined(USE_SCHANNEL) || defined(USE_WINDOWS_SSPI) + #include "curl_sspi.h" ++#endif ++#ifdef USE_SCHANNEL + #include + #include + #endif +-- +2.9.3 + diff --git a/src/curl.mk b/src/curl.mk index 6f48776..4774793 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -4,8 +4,8 @@ PKG := curl $(PKG)_WEBSITE := http://curl.haxx.se/libcurl/ $(PKG)_DESCR := cURL $(PKG)_IGNORE := -$(PKG)_VERSION := 7.52.1 -$(PKG)_CHECKSUM := 44286d4b825936e2430fc44ad730ce899afb736a5d328cbb8b5d42462f3f2365 +$(PKG)_VERSION := 7.53.0 +$(PKG)_CHECKSUM := 38bf7820a72ae476a7637d55ec1e794cb3bb78b111521a0c2300ade77b1811cc $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) -- cgit v0.12