From 6d83b9e15d95c43c729b60b835cca36d7053eb09 Mon Sep 17 00:00:00 2001
From: Chilledheart <rwindz0@gmail.com>
Date: Thu, 23 Apr 2015 10:21:03 +0800
Subject: [PATCH] curl: Update to 7.42.0

---
 mingw-w64-curl/0001-curl-relocation.patch | 17 ++++++++---------
 mingw-w64-curl/PKGBUILD                   |  6 +++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/mingw-w64-curl/0001-curl-relocation.patch b/mingw-w64-curl/0001-curl-relocation.patch
index 7531ec1df8..78b9664075 100644
--- a/mingw-w64-curl/0001-curl-relocation.patch
+++ b/mingw-w64-curl/0001-curl-relocation.patch
@@ -22,10 +22,10 @@ diff -urN curl-7.37.1.orig/lib/curl_config.h.in curl-7.37.1/lib/curl_config.h.in
  /* to disable cookies support */
  #undef CURL_DISABLE_COOKIES
  
-diff -urN curl-7.37.1.orig/lib/Makefile.inc curl-7.37.1/lib/Makefile.inc
---- curl-7.37.1.orig/lib/Makefile.inc	2014-06-11 18:52:29.000000000 +0100
-+++ curl-7.37.1/lib/Makefile.inc	2014-08-28 21:19:37.748635000 +0100
-@@ -46,7 +46,7 @@
+diff --git a/lib/Makefile.inc b/lib/Makefile.inc
+--- a/lib/Makefile.inc
++++ b/lib/Makefile.inc
+@@ -46,7 +46,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \
    curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c        \
    hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c      \
    http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c curl_endian.c       \
@@ -34,13 +34,12 @@ diff -urN curl-7.37.1.orig/lib/Makefile.inc curl-7.37.1/lib/Makefile.inc
  
  LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
    formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h         \
-@@ -64,7 +64,8 @@
-   curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h             \
+@@ -65,7 +65,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
    curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h   \
    conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h    \
--  dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h
-+  dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h  \
-+  pathtools.h
+   dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h  \
+-  curl_printf.h
++  curl_printf.h pathtools.h
  
  LIB_RCFILES = libcurl.rc
  
diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD
index 16164f3960..999c4d703f 100644
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@@ -5,7 +5,7 @@ _variant=-openssl
 
 _realname=curl
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=7.41.0
+pkgver=7.42.0
 pkgrel=1
 pkgdesc="An URL retrival utility and library. (mingw-w64)"
 arch=('any')
@@ -29,9 +29,9 @@ options=('staticlibs')
 source=("$url/download/${_realname}-$pkgver.tar.bz2"{,.asc}
         "0001-curl-relocation.patch"
         "0002-curl-mingw-enable-static.patch")
-md5sums=('87e36f88b7a0f9683fa56f1334562c3a'
+md5sums=('0a10174a0ea5105c46e92b51e1b311f8'
          'SKIP'
-         '430527b6ecaf41a3023565b3a88ca59c'
+         '58520051c4ed77781d233c3fa40a5435'
          'eac9e212e619490966ae47004bec547b')
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg