update package curl

index.html

@@ -1000,7 +1000,7 @@ USE_OSGPLUGIN(<plugin2>)
     </tr>
     <tr>
         <td id="curl-package">curl</td>
-        <td id="curl-version">7.25.0</td>
+        <td id="curl-version">7.26.0</td>
         <td id="curl-website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td>
     </tr>
     <tr>

src/curl-1-fixes.patch

@@ -5,29 +5,25 @@ Commits backported (cherry-picked) from upstream.
 http://github.com/bagder/curl
 Also contains MXE specific fixes.
 
-From ee69c33117cf616c19e9cd288f08eb4c91bf190d Mon Sep 17 00:00:00 2001
+From ed729805781e366b68105f074f9e3c17fb81df27 Mon Sep 17 00:00:00 2001
-From: Volker Grabsch <vog@notjusthosting.com>
+From: Mark Brand <mabrand@mabrand.nl>
-Date: Fri, 28 Oct 2011 13:48:04 +0200
+Date: Thu, 24 May 2012 20:45:36 +0200
-Subject: [PATCH] static linking for MXE
+Subject: [PATCH] define CURL_STATICLIB via pkg-config
 
 ---
- include/curl/curlbuild.h.in |    3 +++
+ libcurl.pc.in |    2 +-
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/include/curl/curlbuild.h.in b/include/curl/curlbuild.h.in
+diff --git a/libcurl.pc.in b/libcurl.pc.in
-index fe348f4..c428273 100644
+index 2ba9c39..e0ddd8d 100644
---- a/include/curl/curlbuild.h.in
+--- a/libcurl.pc.in
-+++ b/include/curl/curlbuild.h.in
++++ b/libcurl.pc.in
-@@ -111,6 +111,9 @@
+@@ -36,4 +36,4 @@ Description: Library to transfer files with ftp, http, etc.
- /*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+ Version: @CURLVERSION@
- /* ================================================================ */
+ Libs: -L${libdir} -lcurl @LIBS@
- 
+ Libs.private: @LIBCURL_LIBS@ @LIBS@
-+/* Configure process defines this to 1 when static linking is requested. */
+-Cflags: -I${includedir}
-+#undef CURL_STATICLIB
++Cflags: -DCURL_STATICLIB -I${includedir}
-+
- /* Configure process defines this to 1 when it finds out that system  */
- /* header file ws2tcpip.h must be included by the external interface. */
- #undef CURL_PULL_WS2TCPIP_H
 -- 
-1.7.8.3
+1.7.9.2
 

src/curl.mk

@@ -3,7 +3,7 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := f6016a24051d98806ca3ddf754592701cb66e00c
+$(PKG)_CHECKSUM := c2e62eaace2407d377bf544d1f808aea6dddf64c
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://curl.haxx.se/download/$($(PKG)_FILE)
@@ -16,7 +16,6 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \