Mercurial > mxe-octave
changeset 2799:7d4c8f2179f6
update package curl
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Thu, 11 Oct 2012 00:31:16 +0200 |
parents | d7570a06e60e |
children | 2334fd921073 |
files | index.html src/curl-1-fixes.patch src/curl.mk |
diffstat | 3 files changed, 3 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Tue Oct 09 00:12:26 2012 +0200 +++ b/index.html Thu Oct 11 00:31:16 2012 +0200 @@ -1005,7 +1005,7 @@ </tr> <tr> <td id="curl-package">curl</td> - <td id="curl-version">7.27.0</td> + <td id="curl-version">7.28.0</td> <td id="curl-website"><a href="http://curl.haxx.se/libcurl/">cURL</a></td> </tr> <tr>
--- a/src/curl-1-fixes.patch Tue Oct 09 00:12:26 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -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 - -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 @@ - - #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 - --- -1.7.10.4 -
--- a/src/curl.mk Tue Oct 09 00:12:26 2012 +0200 +++ b/src/curl.mk Thu Oct 11 00:31:16 2012 +0200 @@ -3,9 +3,9 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 51f563587720b71047b6e307412d49ce24ad7bfb +$(PKG)_CHECKSUM := f75cdcd81ae3cb1eef1b5ff9e736a46cb1d6d2c9 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) -$(PKG)_FILE := curl-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc gnutls libidn libssh2