diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-10-10 22:31:16 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2012-10-10 22:31:16 (GMT) |
| commit | a9997a5fac49324fe7e8e1acc8d150eb3cf8c86c (patch) | |
| tree | 958088dda3b44006c8814123b9e46714e28098d6 /src | |
| parent | 12ee1b4bc30f1b03b7466b8c3e06197ebe0b89ff (diff) | |
| download | mxe-a9997a5fac49324fe7e8e1acc8d150eb3cf8c86c.zip mxe-a9997a5fac49324fe7e8e1acc8d150eb3cf8c86c.tar.gz mxe-a9997a5fac49324fe7e8e1acc8d150eb3cf8c86c.tar.bz2 | |
update package curl
Diffstat (limited to 'src')
| -rw-r--r-- | src/curl-1-fixes.patch | 31 | ||||
| -rw-r--r-- | src/curl.mk | 4 |
2 files changed, 2 insertions, 33 deletions
diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch deleted file mode 100644 index 264c53d..0000000 --- a/src/curl-1-fixes.patch +++ /dev/null @@ -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 - diff --git a/src/curl.mk b/src/curl.mk index a50d790..2df48ed 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -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 |