Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_159312000575060"
MIME-Version: 1.0
Date: Thu, 25 Jun 2020 21:20:05 +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: <20200625212005.2F20FFB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Jun 25 21:20:05 UTC 2020

Modified Files:
	pkgsrc/www/curl: Makefile PLIST distinfo
	pkgsrc/www/curl/patches: patch-curl-config.in

Log Message:
curl: update to 7.71.0.

freeze ok: gdt, leot

curl and libcurl 7.71.0

 Public curl releases:         192
 Command line options:         232
 curl_easy_setopt() options:   277
 Public functions in libcurl:  82
 Contributors:                 2202

This release includes the following changes:

 o CURLOPT_SSL_OPTIONS: optional use of Windows' CA store (with openssl) [10]
 o setopt: add CURLOPT_PROXY_ISSUERCERT(_BLOB) for coherency [31]
 o setopt: support certificate options in memory with struct curl_blob [41]
 o tool: Add option --retry-all-errors to retry on any error [27]

This release includes the following bugfixes:

 o CVE-2020-8177: curl overwrite local file with -J [111]
 o CVE-2020-8169: Partial password leak over DNS on HTTP redirect [48]
 o *_sspi: fix bad uses of CURLE_NOT_BUILT_IN [21]
 o all: fix codespell errors [75]
 o altsvc: bump to h3-29 [114]
 o altsvc: fix 'dsthost' may be used uninitialized in this function
 o altsvc: fix parser for lines ending with CRLF [74]
 o altsvc: remove the num field from the altsvc struct [109]
 o appveyor: add non-debug plain autotools-based build [90]
 o appveyor: disable flaky test 1501 and ignore broken 1056
 o appveyor: disable test 1139 instead of ignoring it
 o asyn-*: remove support for never-used NULL entry pointers [19]
 o azure: use matrix strategy to avoid configuration redundancy [83]
 o build: disable more code/data when built without proxy support [84]
 o buildconf: remove -print from the find command that removes files
 o checksrc: enhance the ASTERISKSPACE and update code accordingly [52]
 o CI/macos: fix 'is already installed' errors by using bundle [94]
 o cirrus: disable SFTP and SCP tests [7]
 o CMake: add ENABLE_ALT_SVC option
 o CMake: add HTTP/3 support (ngtcp2+nghttp3, quiche) [34]
 o CMake: add libssh build support [37]
 o CMake: do not build test programs by default [30]
 o CMake: fix runtests.pl with CMake, add new test targets [29]
 o CMake: ignore INTERFACE_LIBRARY targets for pkg-config file [112]
 o CMake: rebuild Makefile.inc.cmake when Makefile.inc changes [58]
 o CODE_REVIEW.md: how to do code reviews in curl [108]
 o configure: fix pthread check with static boringssl
 o configure: for wolfSSL, check for the DES func needed for NTLM
 o configure: only strip first -L from LDFLAGS [89]
 o configure: repair the check if argv can be written to [47]
 o configure: the wolfssh backend does not provide SCP [57]
 o connect: improve happy eyeballs handling [118]
 o connect: make happy eyeballs work for QUIC (again) [16]
 o curl.1: Quote globbed URLs [51]
 o curl: remove -J "informational" written on stdout [36]
 o Curl_addrinfo: use one malloc instead of three [97]
 o CURLINFO_ACTIVESOCKET.3: clarify the description [87]
 o doc: add missing closing parenthesis in CURLINFO_SSL_VERIFYRESULT.3 [5]
 o doc: Rename VERSIONS to VERSIONS.md as it already has Markdown syntax [20]
 o docs/HTTP3: add qlog to the quiche build instruction
 o docs/options-in-versions: which version added each cmdline option [53]
 o docs: unify protocol lists [54]
 o dynbuf: introduce internal generic dynamic buffer functions [17]
 o easy: fix dangling pointer on easy_perform fail [26]
 o examples/ephiperfifo: turn off interval when setting timerfd [79]
 o examples/http2-down/upload: add error checks [78]
 o examples: remove asiohiper.cpp [4]
 o FILEFORMAT: add more features that tests can depend on
 o FILEFORMAT: describe verify/stderr
 o ftp: make domore_getsock() return the secondary socket properly
 o ftp: mark return-ignoring calls to Curl_GetFTPResponse with (void) [64]
 o ftp: shut down the secondary connection properly when SSL is used [43]
 o GnuTLS: Backend support for CURLINFO_SSL_VERIFYRESULT [9]
 o hostip: make Curl_printable_address not return anything [63]
 o hostip: on macOS avoid DoH when given a numerical IP address [69]
 o http2: keep trying to send pending frames after req.upload_done [40]
 o http2: simplify and clean up trailer handling [6]
 o HTTP3.md: clarify cargo build directory [77]
 o http: move header storage to Curl_easy from connectdata [107]
 o libcurl.pc: Merge Libs.private into Libs for static-only builds [28]
 o libssh2: improved error output for wrong quote syntax [39]
 o libssh2: keep sftp errors as 'unsigned long' [103]
 o libssh2: set the expected total size in SCP upload init [2]
 o libtest/cmake: Remove commented code [13]
 o list-only.d: this option existed already in 4.0
 o manpage: add three missing environment variables [121]
 o multi: add defensive check on data->multi->num_alive [96]
 o multi: implement wait using winsock events [120]
 o ngtcp2: cleanup memory when failing to connect [70]
 o ngtcp2: fix build with current ngtcp2 master implementing draft 28 [76]
 o ngtcp2: fix happy eyeballs quic connect crash [118]
 o ngtcp2: introduce qlog support [23]
 o ngtcp2: never call fprintf() in lib code in release version
 o ngtcp2: update with recent API changes [100]
 o ntlm: enable NTLM support with wolfSSL [81]
 o OpenSSL: have CURLOPT_CRLFILE imply CURLSSLOPT_NO_PARTIALCHAIN [55]
 o openssl: set FLAG_TRUSTED_FIRST unconditionally [105]
 o projects: Add crypt32.lib to dependencies for all OpenSSL configs [93]
 o quiche: clean up memory properly when failing to connect [71]
 o quiche: enable qlog output [14]
 o quiche: update SSLKEYLOGFILE support [98]
 o Revert "buildconf: use find -execdir" [38]
 o Revert "ssh: ignore timeouts during disconnect" [67]
 o runtests: remove sleep calls [18]
 o runtests: show elapsed test time with higher precision (ms)
 o select: always use Sleep in Curl_wait_ms on Win32 [82]
 o select: fix overflow protection in Curl_socket_check [22]
 o sendf: make failf() use the mvsnprintf() return code [62]
 o server/sws: fix asan warning on use of uninitialized variable
 o server/util: fix logmsg format using curl_off_t argument [106]
 o sha256: fixed potentially uninitialized variable [61]
 o share: don't set the share flag it something fails [116]
 o sockfilt: make select_ws stop waiting on exit signal event
 o socks: detect connection close during handshake [95]
 o socks: fix expected length of SOCKS5 reply [68]
 o socks: remove unreachable breaks in socks.c and mime.c [101]
 o source cleanup: remove all custom typedef structs [42]
 o test1167: fixes in badsymbols.pl [73]
 o test1177: look for curl.h in source directory [1]
 o test1238: avoid tftpd being busy for tests shortly following [33]
 o test613.pl: make tests 613 and 614 work with OpenSSH for Windows [8]
 o test75: Remove precheck test
 o tests: add https-proxy support to the test suite [49]
 o tests: add support for SSH server variant specific transfer paths [24]
 o tests: add two simple tests for --login-options [99]
 o tests: make test 1248 + 1249 use %NOLISTENPORT [3]
 o tests: pick a random port number for SSH [12]
 o tests: run stunnel for HTTPS and FTPS on dynamic ports [11]
 o timeouts: change millisecond timeouts to timediff_t from time_t [86]
 o timeouts: move ms timeouts to timediff_t from int and long [104]
 o tool: fixup a few --help descriptions [56]
 o tool: support UTF-16 command line on Windows [46]
 o tool_cfgable: free login_options at exit [102]
 o tool_getparam: fix memory leak in parse_args
 o tool_operate: fixed potentially uninitialized variables [60]
 o tool_paramhlp: fixed potentially uninitialized strtol() variable [59]
 o transfer: close connection after excess data has been read [66]
 o travis: add "qlog" as feature in the quiche build
 o travis: Add ngtcp2 and quiche tests for CMake
 o travis: upgrade to bionic, clang-9, improve readability [35]
 o typecheck-gcc.h: CURLINFO_PRIVATE does not need a 'char *' [44]
 o unit1604.c: fix implicit conv from 'SANITIZEcode' to 'CURLcode' [88]
 o url: accept "any length" credentials for proxy auth [72]
 o url: alloc the download buffer at transfer start [85]
 o url: reject too long input when parsing credentials [25]
 o url: sort the protocol schemes in rough popularity order [32]
 o urlapi: accept :: as a valid IPv6 address [15]
 o urldata: leave the HTTP method untouched in the set.* struct [45]
 o urlglob: treat literal IPv6 addresses with zone IDs as a host name [115]
 o user-agent.d: spell out what happens given a blank argument [80]
 o vauth/cleartext: fix theoretical integer overflow [50]
 o version.d: expanded and alpha-sorted [110]
 o vtls: Extract and simplify key log file handling from OpenSSL
 o wolfssl: add SSLKEYLOGFILE support [65]
 o wording: avoid blacklist/whitelist stereotypes [92]
 o write-out.d: added "response_code"


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/curl/PLIST
cvs rdiff -u -r1.162 -r1.163 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/curl/patches/patch-curl-config.in

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


--_----------=_159312000575060
Content-Disposition: inline
Content-Length: 4656
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.228 pkgsrc/www/curl/Makefile:1.229
--- pkgsrc/www/curl/Makefile:1.228	Fri May 22 10:55:52 2020
+++ pkgsrc/www/curl/Makefile	Thu Jun 25 21:20:04 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.228 2020/05/22 10:55:52 adam Exp $
+# $NetBSD: Makefile,v 1.229 2020/06/25 21:20:04 wiz Exp $
 
-DISTNAME=	curl-7.70.0
-PKGREVISION=	2
+DISTNAME=	curl-7.71.0
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/www/curl/PLIST
diff -u pkgsrc/www/curl/PLIST:1.79 pkgsrc/www/curl/PLIST:1.80
--- pkgsrc/www/curl/PLIST:1.79	Wed Mar  4 18:19:26 2020
+++ pkgsrc/www/curl/PLIST	Thu Jun 25 21:20:04 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.79 2020/03/04 18:19:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.80 2020/06/25 21:20:04 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -190,6 +190,7 @@ man/man3/CURLOPT_IOCTLDATA.3
 man/man3/CURLOPT_IOCTLFUNCTION.3
 man/man3/CURLOPT_IPRESOLVE.3
 man/man3/CURLOPT_ISSUERCERT.3
+man/man3/CURLOPT_ISSUERCERT_BLOB.3
 man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3
 man/man3/CURLOPT_KEYPASSWD.3
 man/man3/CURLOPT_KRBLEVEL.3
@@ -248,13 +249,17 @@ man/man3/CURLOPT_PROXYUSERPWD.3
 man/man3/CURLOPT_PROXY_CAINFO.3
 man/man3/CURLOPT_PROXY_CAPATH.3
 man/man3/CURLOPT_PROXY_CRLFILE.3
+man/man3/CURLOPT_PROXY_ISSUERCERT.3
+man/man3/CURLOPT_PROXY_ISSUERCERT_BLOB.3
 man/man3/CURLOPT_PROXY_KEYPASSWD.3
 man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3
 man/man3/CURLOPT_PROXY_SERVICE_NAME.3
 man/man3/CURLOPT_PROXY_SSLCERT.3
 man/man3/CURLOPT_PROXY_SSLCERTTYPE.3
+man/man3/CURLOPT_PROXY_SSLCERT_BLOB.3
 man/man3/CURLOPT_PROXY_SSLKEY.3
 man/man3/CURLOPT_PROXY_SSLKEYTYPE.3
+man/man3/CURLOPT_PROXY_SSLKEY_BLOB.3
 man/man3/CURLOPT_PROXY_SSLVERSION.3
 man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3
 man/man3/CURLOPT_PROXY_SSL_OPTIONS.3
@@ -306,10 +311,12 @@ man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3
 man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3
 man/man3/CURLOPT_SSLCERT.3
 man/man3/CURLOPT_SSLCERTTYPE.3
+man/man3/CURLOPT_SSLCERT_BLOB.3
 man/man3/CURLOPT_SSLENGINE.3
 man/man3/CURLOPT_SSLENGINE_DEFAULT.3
 man/man3/CURLOPT_SSLKEY.3
 man/man3/CURLOPT_SSLKEYTYPE.3
+man/man3/CURLOPT_SSLKEY_BLOB.3
 man/man3/CURLOPT_SSLVERSION.3
 man/man3/CURLOPT_SSL_CIPHER_LIST.3
 man/man3/CURLOPT_SSL_CTX_DATA.3

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.162 pkgsrc/www/curl/distinfo:1.163
--- pkgsrc/www/curl/distinfo:1.162	Wed Apr 29 11:24:19 2020
+++ pkgsrc/www/curl/distinfo	Thu Jun 25 21:20:04 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.162 2020/04/29 11:24:19 leot Exp $
+$NetBSD: distinfo,v 1.163 2020/06/25 21:20:04 wiz Exp $
 
-SHA1 (curl-7.70.0.tar.xz) = f213c6ed665e05273e9c55ecafdaf981692ad747
-RMD160 (curl-7.70.0.tar.xz) = 765e3fa450c5207f908aa337d7744760c4298f20
-SHA512 (curl-7.70.0.tar.xz) = ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
-Size (curl-7.70.0.tar.xz) = 2348780 bytes
+SHA1 (curl-7.71.0.tar.xz) = 90a50b475e8f2be4f89ad511d893187d3a101397
+RMD160 (curl-7.71.0.tar.xz) = 5d8e8f6e6c51b60a6e1ee1e7d61891f9ff3f1cca
+SHA512 (curl-7.71.0.tar.xz) = f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a
+Size (curl-7.71.0.tar.xz) = 2379056 bytes
 SHA1 (patch-configure) = 8dcc112bd2950e146a77bed7638e490e24a5aa71
-SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
+SHA1 (patch-curl-config.in) = 16d50c2720e56fd56a9188f58c5cc2717f98e49f

Index: pkgsrc/www/curl/patches/patch-curl-config.in
diff -u pkgsrc/www/curl/patches/patch-curl-config.in:1.8 pkgsrc/www/curl/patches/patch-curl-config.in:1.9
--- pkgsrc/www/curl/patches/patch-curl-config.in:1.8	Wed Jan 24 07:57:19 2018
+++ pkgsrc/www/curl/patches/patch-curl-config.in	Thu Jun 25 21:20:04 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-curl-config.in,v 1.8 2018/01/24 07:57:19 wiz Exp $
+$NetBSD: patch-curl-config.in,v 1.9 2020/06/25 21:20:04 wiz Exp $
 
 - make "curl-config --libs" return proper ldflags for shared libraries
 
---- curl-config.in.orig	2018-01-22 08:55:10.000000000 +0000
+--- curl-config.in.orig	2020-06-22 08:52:00.000000000 +0000
 +++ curl-config.in
-@@ -149,9 +149,9 @@ while test $# -gt 0; do
+@@ -161,9 +161,9 @@ while test $# -gt 0; do
             CURLLIBDIR=""
          fi
-         if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+         if test "X@ENABLE_SHARED@" = "Xno" -o "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
 -          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
 +          echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
          else


--_----------=_159312000575060--