reanimate curl-7.43.0 and add the upstream fix for

http://curl.haxx.se/mail/lib-2015-06/0122.html found in
https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094

9 files changed, 76 insertions, 56 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 450ceb7632a..8b0ea6ec9b5 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.152 2015/06/30 23:00:21 spz Exp $
+# $NetBSD: Makefile,v 1.153 2015/08/08 02:44:16 spz Exp $
 
-DISTNAME=	curl-7.42.1
-PKGREVISION=	2
+DISTNAME=	curl-7.43.0
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/PLIST b/www/curl/PLIST
index fd6a0314447..978d66a91dd 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2015/06/30 23:00:21 spz Exp $
+@comment $NetBSD: PLIST,v 1.52 2015/08/08 02:44:16 spz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -140,6 +140,7 @@ man/man3/CURLOPT_OPENSOCKETFUNCTION.3
 man/man3/CURLOPT_PASSWORD.3
 man/man3/CURLOPT_PATH_AS_IS.3
 man/man3/CURLOPT_PINNEDPUBLICKEY.3
+man/man3/CURLOPT_PIPEWAIT.3
 man/man3/CURLOPT_PORT.3
 man/man3/CURLOPT_POST.3
 man/man3/CURLOPT_POSTFIELDS.3
@@ -160,6 +161,7 @@ man/man3/CURLOPT_PROXYPORT.3
 man/man3/CURLOPT_PROXYTYPE.3
 man/man3/CURLOPT_PROXYUSERNAME.3
 man/man3/CURLOPT_PROXYUSERPWD.3
+man/man3/CURLOPT_PROXY_SERVICE_NAME.3
 man/man3/CURLOPT_PROXY_TRANSFER_MODE.3
 man/man3/CURLOPT_PUT.3
 man/man3/CURLOPT_QUOTE.3
@@ -181,6 +183,7 @@ man/man3/CURLOPT_RTSP_TRANSPORT.3
 man/man3/CURLOPT_SASL_IR.3
 man/man3/CURLOPT_SEEKDATA.3
 man/man3/CURLOPT_SEEKFUNCTION.3
+man/man3/CURLOPT_SERVICE_NAME.3
 man/man3/CURLOPT_SHARE.3
 man/man3/CURLOPT_SOCKOPTDATA.3
 man/man3/CURLOPT_SOCKOPTFUNCTION.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index d70a1462d02..d56f535f6b5 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.107 2015/06/30 23:00:21 spz Exp $
+$NetBSD: distinfo,v 1.108 2015/08/08 02:44:16 spz Exp $
 
-SHA1 (curl-7.42.1.tar.bz2) = f65708915875b8cb35edb51d8dd31440dc02fbd3
-RMD160 (curl-7.42.1.tar.bz2) = 76d5b23fae60356342e2bac2e4c706ed544d4adf
-Size (curl-7.42.1.tar.bz2) = 3327304 bytes
-SHA1 (patch-aa) = 59ec0be3ac90470fdc5935881da6a14dbab9d378
-SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e
-SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2
-SHA1 (patch-lib_http2.c) = 4ba0164ffdba714c620daccbf80eedd51562acf4
+SHA1 (curl-7.43.0.tar.bz2) = d821ea39610b7f1122f1f574a4d8e20e81b3c561
+RMD160 (curl-7.43.0.tar.bz2) = 404481695a8f79cbf9a245bfa9c06140d1cdbf11
+Size (curl-7.43.0.tar.bz2) = 3363770 bytes
+SHA1 (patch-aa) = 89e33ed9492522af7bee22cdfaf6c4b0731f1510
+SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
+SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
+SHA1 (patch-lib_multi.c) = 00770c93a6b482103e9bbeadba081581cef640eb
+SHA1 (patch-lib_transfer.c) = 8a608ff01ee7c3cd8dbc0090589826fe9a2b1474
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index 5dd9c050bfa..790578ad599 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.32 2015/06/30 23:00:21 spz Exp $
+$NetBSD: patch-aa,v 1.33 2015/08/08 02:44:16 spz Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
---- configure.orig	2015-04-21 07:21:35.000000000 +0000
+--- configure.orig	2015-06-15 21:31:47.000000000 +0000
 +++ configure
 @@ -3703,6 +3703,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
@@ -13,7 +13,7 @@ the gssapi option, and need an explicit -lgss
    if test $xc_bad_var_cflags = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -16682,7 +16683,7 @@ squeeze() {
+@@ -16689,7 +16690,7 @@ squeeze() {
  
  
        #
@@ -22,19 +22,20 @@ the gssapi option, and need an explicit -lgss
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -21131,6 +21132,11 @@ $as_echo "yes" >&6; }
+@@ -21137,7 +21138,11 @@ $as_echo "yes" >&6; }
+      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
          GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
-      elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-         GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-+        if $GSSAPI_ROOT/bin/krb5-config --cflags gssapi 2>&1 | grep "Unknown option" >/dev/null; then
-+            GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags`
+      elif test -f "$KRB5CONFIG"; then
+-        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++        if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
++           GSSAPI_INCS=`$KRB5CONFIG --cflags`
 +        else
-+            GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
++           GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
 +        fi
-      elif test -f "$KRB5CONFIG"; then
-         GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
       elif test "$GSSAPI_ROOT" != "yes"; then
-@@ -21305,7 +21311,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+      fi
+@@ -21310,7 +21315,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)
@@ -43,12 +44,3 @@ the gssapi option, and need an explicit -lgss
          ;;
       esac
    fi
-@@ -24264,7 +24270,7 @@ _ACEOF
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $capath (capath)" >&5
- $as_echo "$capath (capath)" >&6; }
-   fi
--  if test "x$ca" == "xno" && test "x$capath" == "xno"; then
-+  if test "x$ca" = "xno" && test "x$capath" = "xno"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-   fi
diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in
index fc3476a6aea..723caa8b4e9 100644
--- a/www/curl/patches/patch-curl-config.in
+++ b/www/curl/patches/patch-curl-config.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-curl-config.in,v 1.6 2015/06/30 23:00:21 spz Exp $
+$NetBSD: patch-curl-config.in,v 1.7 2015/08/08 02:44:16 spz Exp $
 
 - make "curl-config --libs" return proper ldflags for shared libraries
 
---- curl-config.in.orig	2014-01-05 22:07:54.000000000 +0000
+--- curl-config.in.orig	2015-06-03 07:38:20.000000000 +0000
 +++ curl-config.in
 @@ -148,9 +148,9 @@ while test $# -gt 0; do
             CURLLIBDIR=""
diff --git a/www/curl/patches/patch-lib_hostcheck.c b/www/curl/patches/patch-lib_hostcheck.c
index d0480af87b3..1ac2251f5e4 100644
--- a/www/curl/patches/patch-lib_hostcheck.c
+++ b/www/curl/patches/patch-lib_hostcheck.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_hostcheck.c,v 1.3 2015/06/30 23:00:21 spz Exp $
+$NetBSD: patch-lib_hostcheck.c,v 1.4 2015/08/08 02:44:16 spz Exp $
 
 Add missing header for DragonflyBSD.
 PR 48691 by David Shao.
 
---- lib/hostcheck.c.orig	2014-03-25 22:01:37.000000000 +0000
+--- lib/hostcheck.c.orig	2015-06-03 07:38:20.000000000 +0000
 +++ lib/hostcheck.c
-@@ -31,6 +31,13 @@
+@@ -34,6 +34,13 @@
  #include "inet_pton.h"
  
  #include "curl_memory.h"
diff --git a/www/curl/patches/patch-lib_http2.c b/www/curl/patches/patch-lib_http2.c
deleted file mode 100644
index 72e400298b7..00000000000
--- a/www/curl/patches/patch-lib_http2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-lib_http2.c,v 1.3 2015/06/30 23:00:21 spz Exp $
-
-Update compatibility for nghttp2 1.0. This patch should become obsolete
-with curl-7.43.
-
---- lib/http2.c.orig	2015-04-29 06:06:52.000000000 +0000
-+++ lib/http2.c
-@@ -1019,8 +1019,8 @@ CURLcode Curl_http2_switched(struct conn
- 
-   rv = (int) ((Curl_send*)httpc->send_underlying)
-     (conn, FIRSTSOCKET,
--     NGHTTP2_CLIENT_CONNECTION_PREFACE,
--     NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN,
-+     NGHTTP2_CLIENT_MAGIC,
-+     NGHTTP2_CLIENT_MAGIC_LEN,
-      &result);
-   if(result)
-     /* TODO: This may get CURLE_AGAIN */
diff --git a/www/curl/patches/patch-lib_multi.c b/www/curl/patches/patch-lib_multi.c
new file mode 100644
index 00000000000..8ac73899785
--- /dev/null
+++ b/www/curl/patches/patch-lib_multi.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_multi.c,v 1.3 2015/08/08 02:44:16 spz Exp $
+
+part of
+https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+fixing
+http://curl.haxx.se/mail/lib-2015-06/0122.html
+
+--- lib/multi.c.orig	2015-06-15 21:14:25.000000000 +0000
++++ lib/multi.c
+@@ -402,11 +402,6 @@ CURLMcode curl_multi_add_handle(CURLM *m
+   /* Point to the multi's connection cache */
+   data->state.conn_cache = &multi->conn_cache;
+ 
+-  if(data->set.httpreq == HTTPREQ_PUT)
+-    data->state.infilesize = data->set.filesize;
+-  else
+-    data->state.infilesize = data->set.postfieldsize;
+-
+   /* This adds the new entry at the 'end' of the doubly-linked circular
+      list of SessionHandle structs to try and maintain a FIFO queue so
+      the pipelined requests are in order. */
diff --git a/www/curl/patches/patch-lib_transfer.c b/www/curl/patches/patch-lib_transfer.c
new file mode 100644
index 00000000000..c99b0df5134
--- /dev/null
+++ b/www/curl/patches/patch-lib_transfer.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_transfer.c,v 1.1 2015/08/08 02:44:16 spz Exp $
+
+part of
+https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+fixing
+http://curl.haxx.se/mail/lib-2015-06/0122.html
+
+--- lib/transfer.c.orig	2015-06-14 21:31:01.000000000 +0000
++++ lib/transfer.c
+@@ -1315,6 +1315,11 @@ CURLcode Curl_pretransfer(struct Session
+   Curl_safefree(data->info.wouldredirect);
+   data->info.wouldredirect = NULL;
+ 
++  if(data->set.httpreq == HTTPREQ_PUT)
++    data->state.infilesize = data->set.filesize;
++  else
++    data->state.infilesize = data->set.postfieldsize;
++
+   /* If there is a list of cookie files to read, do it now! */
+   if(data->change.cookielist)
+     Curl_cookie_loadfiles(data);