diff options
| author | wiz <wiz@pkgsrc.org> | 2018-07-31 09:34:49 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2018-07-31 09:34:49 +0000 |
| commit | d4c60fbda4e7b4f38ce75d0dbe3a58a1cdecbca8 (patch) | |
| tree | 06af3dbdaa4231ada1c6836f639908cd4cd5972f /www/curl | |
| parent | 77bc077910248d59432b5729bc28cbe8f9ad3e42 (diff) | |
| download | pkgsrc-d4c60fbda4e7b4f38ce75d0dbe3a58a1cdecbca8.tar.gz | |
curl: fix a regression with -O -J in 7.61.0 using upstream patch.
Bump PKGREVISION.
Diffstat (limited to 'www/curl')
| -rw-r--r-- | www/curl/Makefile | 3 | ||||
| -rw-r--r-- | www/curl/distinfo | 3 | ||||
| -rw-r--r-- | www/curl/patches/patch-src_tool__cb__hdr.c | 29 |
3 files changed, 33 insertions, 2 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 4ed950db59f..9d52429cd5f 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -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 diff --git a/www/curl/distinfo b/www/curl/distinfo index 01636cdf950..c659a308c79 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -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 bytes SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308 +SHA1 (patch-src_tool__cb__hdr.c) = ac3b75a7d8702e25f4eb0596f615a8d60d4066f7 diff --git a/www/curl/patches/patch-src_tool__cb__hdr.c b/www/curl/patches/patch-src_tool__cb__hdr.c new file mode 100644 index 00000000000..e132a39c4b9 --- /dev/null +++ b/www/curl/patches/patch-src_tool__cb__hdr.c @@ -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 && |