Mercurial > mxe-octave

changeset 2683:3a1c3da5d83a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package curl
author Mark Brand <mabrand@mabrand.nl>
date Sun, 12 Aug 2012 10:46:31 +0200
parents ae4000d48e07
children 14f1e48fe31e
files index.html src/curl-1-fixes.patch src/curl.mk
diffstat 3 files changed, 25 insertions(+), 104 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sat Aug 11 15:25:20 2012 -0700
+++ b/index.html	Sun Aug 12 10:46:31 2012 +0200
@@ -1000,7 +1000,7 @@
     </tr>
     <tr>
         <td id="curl-package">curl</td>
-        <td id="curl-version">7.26.0</td>
+        <td id="curl-version">7.27.0</td>
         <td id="curl-website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td>
     </tr>
     <tr>
--- a/src/curl-1-fixes.patch	Sat Aug 11 15:25:20 2012 -0700
+++ b/src/curl-1-fixes.patch	Sun Aug 12 10:46:31 2012 +0200
@@ -1,109 +1,31 @@
 This file is part of MXE.
 See index.html for further information.
 
-Commits backported (cherry-picked) from upstream.
-http://github.com/bagder/curl
-Also contains MXE specific fixes.
-
-From 07bcce2b2d7b51f2b7aadba8c842cc4b6ca70bb8 Mon Sep 17 00:00:00 2001
-From: Yang Tse <yangsita@gmail.com>
-Date: Fri, 25 May 2012 23:59:38 +0200
-Subject: [PATCH] Fix libcurl.pc and curl-config generation for static MingW*
- cross builds
-
-(cherry picked from commit a379a4c1637cfe266bfa95c2c878f9cc06ce2f6a)
----
- configure.ac   |    3 +++
- curl-config.in |   12 +++++++++---
- libcurl.pc.in  |    4 ++--
- 3 files changed, 14 insertions(+), 5 deletions(-)
+From 29c2441e39372b34dfac348954385d2fecb361d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 6 Aug 2012 15:04:25 +0200
+Subject: [PATCH] gtls: fix build failure by including nettle-specific headers
 
-diff --git a/configure.ac b/configure.ac
-index 2300c8c..db40f18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -240,6 +240,7 @@ AM_CONDITIONAL(MIMPURE, test x$mimpure = xyes)
- AC_MSG_CHECKING([if we need BUILDING_LIBCURL])
- use_cppflag_building_libcurl="no"
- use_cppflag_curl_staticlib="no"
-+CPPFLAG_CURL_STATICLIB=""
- case $host in
-   *-*-mingw*)
-     AC_MSG_RESULT(yes)
-@@ -249,6 +250,7 @@ case $host in
-     then
-       AC_MSG_RESULT(yes)
-       use_cppflag_curl_staticlib="yes"
-+      CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB"
-     else
-       AC_MSG_RESULT(no)
-     fi
-@@ -259,6 +261,7 @@ case $host in
- esac
- AM_CONDITIONAL(USE_CPPFLAG_BUILDING_LIBCURL, test x$use_cppflag_building_libcurl = xyes)
- AM_CONDITIONAL(USE_CPPFLAG_CURL_STATICLIB, test x$use_cppflag_curl_staticlib = xyes)
-+AC_SUBST(CPPFLAG_CURL_STATICLIB)
+Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
+Reported by: Anthony G. Basile
+(cherry picked from commit 986c7949c0638bebb99bd08d63216433254c2185)
+
+diff --git a/lib/gtls.c b/lib/gtls.c
+index d981ef1..c750a6f 100644
+--- a/lib/gtls.c
++++ b/lib/gtls.c
+@@ -34,7 +34,10 @@
  
- # Determine whether all dependent libraries must be specified when linking
- if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
-diff --git a/curl-config.in b/curl-config.in
-index 3d02a03..a3ca8b5 100644
---- a/curl-config.in
-+++ b/curl-config.in
-@@ -6,7 +6,7 @@
- #                            | (__| |_| |  _ <| |___
- #                             \___|\___/|_| \_\_____|
- #
--# Copyright (C) 2001 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
-+# Copyright (C) 2001 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- #
- # This software is licensed as described in the file COPYING, which
- # you should have received as part of this distribution. The terms
-@@ -24,6 +24,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- includedir=@includedir@
-+cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
- 
- usage()
- {
-@@ -128,10 +129,15 @@ while test $# -gt 0; do
- 	;;
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+-#ifndef USE_GNUTLS_NETTLE
++#ifdef USE_GNUTLS_NETTLE
++#include <gnutls/crypto.h>
++#include <nettle/md5.h>
++#else
+ #include <gcrypt.h>
+ #endif
  
-     --cflags)
-+        if test "X$cppflag_curl_staticlib" = "X-DCURL_STATICLIB"; then
-+          CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB "
-+        else
-+          CPPFLAG_CURL_STATICLIB=""
-+        fi
-        	if test "X@includedir@" = "X/usr/include"; then
--          echo ""
-+          echo "$(CPPFLAG_CURL_STATICLIB)"
-         else
--          echo "-I@includedir@"
-+          echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
-         fi
-        	;;
- 
-diff --git a/libcurl.pc.in b/libcurl.pc.in
-index 2ba9c39..6e878c5 100644
---- a/libcurl.pc.in
-+++ b/libcurl.pc.in
-@@ -5,7 +5,7 @@
- #                            | (__| |_| |  _ <| |___
- #                             \___|\___/|_| \_\_____|
- #
--# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
-+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- #
- # This software is licensed as described in the file COPYING, which
- # you should have received as part of this distribution. The terms
-@@ -36,4 +36,4 @@ Description: Library to transfer files with ftp, http, etc.
- Version: @CURLVERSION@
- Libs: -L${libdir} -lcurl @LIBS@
- Libs.private: @LIBCURL_LIBS@ @LIBS@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
 -- 
-1.7.9.2
+1.7.10.4
 
--- a/src/curl.mk	Sat Aug 11 15:25:20 2012 -0700
+++ b/src/curl.mk	Sun Aug 12 10:46:31 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := curl
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := c2e62eaace2407d377bf544d1f808aea6dddf64c
+$(PKG)_CHECKSUM := 51f563587720b71047b6e307412d49ce24ad7bfb
 $(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 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --build="`config.guess`" \