diff options
| -rw-r--r-- | src/curl-1-fixes.patch | 32 | ||||
| -rw-r--r-- | src/curl.mk | 4 |
2 files changed, 4 insertions, 32 deletions
diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch index 9435211..4405e8c 100644 --- a/src/curl-1-fixes.patch +++ b/src/curl-1-fixes.patch @@ -5,10 +5,10 @@ Commits backported (cherry-picked) from upstream. http://github.com/bagder/curl Also contains mingw-cross-env specific fixes. -From 292b5d892f8858a6e9a6f0c94e08c4b15e547e87 Mon Sep 17 00:00:00 2001 +From 017b42a86ec4cac8a4cd71cc607d0a4d201ff4fd Mon Sep 17 00:00:00 2001 From: Volker Grabsch <vog@notjusthosting.com> Date: Fri, 28 Oct 2011 13:48:04 +0200 -Subject: [PATCH 1/2] static linking for mingw-cross-env +Subject: [PATCH] static linking for mingw-cross-env --- include/curl/curlbuild.h.in | 3 +++ @@ -31,31 +31,3 @@ index fe348f4..c428273 100644 -- 1.7.7.3 - -From b24211a59e4ce52a08c0caff24b9456f64c55c3f Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Thu, 17 Nov 2011 09:12:20 +0100 -Subject: [PATCH 2/2] fix for curl wanting .crt for insecure URLs - -Taken from: -http://curl.haxx.se/mail/lib-2011-11/0181.html ---- - src/tool_doswin.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/tool_doswin.c b/src/tool_doswin.c -index b23b50a..ef3899e 100644 ---- a/src/tool_doswin.c -+++ b/src/tool_doswin.c -@@ -285,8 +285,6 @@ CURLcode FindWin32CACert(struct Configurable *config, const char *bundle_file) - if(!config->cacert) - result = CURLE_OUT_OF_MEMORY; - } -- else -- result = CURLE_SSL_CACERT; - - Curl_safefree(buf); - } --- -1.7.7.3 - diff --git a/src/curl.mk b/src/curl.mk index db83443..3cd57d8 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -4,8 +4,8 @@ # cURL PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.23.0 -$(PKG)_CHECKSUM := 026cbf70672174f96ac719d96025a505e00e3f6b +$(PKG)_VERSION := 7.23.1 +$(PKG)_CHECKSUM := 9bac69696446ead85e59d8488098ee84cf897b7e $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://curl.haxx.se/libcurl/ |