Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1533029689166450"
MIME-Version: 1.0
Date: Tue, 31 Jul 2018 09:34:49 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/www/curl
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20180731093449.A726CFBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1533029689166450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Jul 31 09:34:49 UTC 2018

Modified Files:
	pkgsrc/www/curl: Makefile distinfo
Added Files:
	pkgsrc/www/curl/patches: patch-src_tool__cb__hdr.c

Log Message:
curl: fix a regression with -O -J in 7.61.0 using upstream patch.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/www/curl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/curl/patches/patch-src_tool__cb__hdr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1533029689166450
Content-Disposition: inline
Content-Length: 2549
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.197 pkgsrc/www/curl/Makefile:1.198
--- pkgsrc/www/curl/Makefile:1.197	Wed Jul 11 18:13:26 2018
+++ pkgsrc/www/curl/Makefile	Tue Jul 31 09:34:49 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.197 2018/07/11 18:13:26 adam Exp $
+# $NetBSD: Makefile,v 1.198 2018/07/31 09:34:49 wiz Exp $
 
 DISTNAME=	curl-7.61.0
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.bz2

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.144 pkgsrc/www/curl/distinfo:1.145
--- pkgsrc/www/curl/distinfo:1.144	Wed Jul 11 18:13:26 2018
+++ pkgsrc/www/curl/distinfo	Tue Jul 31 09:34:49 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.144 2018/07/11 18:13:26 adam Exp $
+$NetBSD: distinfo,v 1.145 2018/07/31 09:34:49 wiz Exp $
 
 SHA1 (curl-7.61.0.tar.bz2) = ddebde47541b514f6ba6ea03a488f053ae95af1a
 RMD160 (curl-7.61.0.tar.bz2) = 6101f3a189c5a7cc7b0bdd56fc6e80dc37ccdaa8
@@ -7,3 +7,4 @@ Size (curl-7.61.0.tar.bz2) = 2949354 byt
 SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902
 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
+SHA1 (patch-src_tool__cb__hdr.c) = ac3b75a7d8702e25f4eb0596f615a8d60d4066f7

Added files:

Index: pkgsrc/www/curl/patches/patch-src_tool__cb__hdr.c
diff -u /dev/null pkgsrc/www/curl/patches/patch-src_tool__cb__hdr.c:1.1
--- /dev/null	Tue Jul 31 09:34:49 2018
+++ pkgsrc/www/curl/patches/patch-src_tool__cb__hdr.c	Tue Jul 31 09:34:49 2018
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_tool__cb__hdr.c,v 1.1 2018/07/31 09:34:49 wiz Exp $
+
+curl: use Content-Disposition before the "URL end" for -OJ
+
+Regression introduced in 7.61.0
+
+https://github.com/curl/curl/commit/e78f2cfe56c39a6c32191c207aae683de0e9a042
+
+--- src/tool_cb_hdr.c.orig	2018-07-09 06:42:12.000000000 +0000
++++ src/tool_cb_hdr.c
+@@ -103,9 +103,6 @@ size_t tool_header_cb(char *ptr, size_t 
+      (protocol & (CURLPROTO_HTTPS|CURLPROTO_HTTP))) {
+     const char *p = str + 20;
+ 
+-    if(!outs->stream && !tool_create_output_file(outs, FALSE))
+-      return failure;
+-
+     /* look for the 'filename=' parameter
+        (encoded filenames (*=) are not supported) */
+     for(;;) {
+@@ -153,6 +150,8 @@ size_t tool_header_cb(char *ptr, size_t 
+       }
+       break;
+     }
++    if(!outs->stream && !tool_create_output_file(outs, FALSE))
++      return failure;
+   }
+ 
+   if(hdrcbdata->config->show_headers &&


--_----------=_1533029689166450--