curl: Update to 7.72.0

pkgsrc changes:
 - Add test dependency to Python and py-impacket for SMB and TELNET tests


Changes:
7.72.0
------
This release includes the following changes:
 o content_encoding: add zstd decoding support
 o CURL_PUSH_ERROROUT: allow the push callback to fail the parent stream
 o CURLINFO_EFFECTIVE_METHOD: added

This release includes the following bugfixes:
 o CVE-2020-8231: libcurl: wrong connect-only connection
 o appveyor: collect libcurl.dll variants with prefix or suffix
 o asyn-ares: correct some bad comments
 o bearssl: fix build with disabled proxy support
 o buildconf: avoid array concatenation in die()
 o buildconf: retire ares buildconf invocation
 o checksrc: ban gmtime/localtime
 o checksrc: invoke script with -D to find .checksrc proper
 o CI/azure: install libssh2 for use with msys2-based builds
 o CI/azure: unconditionally enable warnings-as-errors with autotools
 o CI/macos: enable warnings as errors for CMake builds
 o CI/macos: set minimum macOS version
 o CI/macos: unconditionally enable warnings-as-errors with autotools
 o CI: Add muse CI analyzer
 o cirrus-ci: upgrade 11-STABLE to 11.4
 o CMake: don't complain about missing nroff
 o CMake: fix test for warning suppressions
 o cmake: fix windows xp build
 o configure.ac: Sort features name in summary
 o configure: allow disabling warnings
 o configure: cleanup wolfssl + pkg-config conflicts when cross compiling.
 o configure: show zstd "no" in summary when built without it
 o connect: remove redundant message about connect failure
 o curl-config: ignore REQUIRE_LIB_DEPS in --libs output
 o curl.1: add a few missing valid exit codes
 o curl: add %{method} to the -w variables
 o curl: improve the existing file check with -J
 o curl_multi_setopt: fix compiler warning "result is always false"
 o curl_version_info.3: CURL_VERSION_KERBEROS4 is deprecated
 o CURLINFO_CERTINFO.3: fix typo
 o CURLOPT_NOBODY.3: clarify what setting to 0 means
 o docs: add date of 7.20 to CURLM_CALL_MULTI_PERFORM mentions
 o docs: Add video link to docs/CONTRIBUTE.md
 o docs: change "web site" to "website"
 o docs: clarify MAX_SEND/RECV_SPEED functionality
 o docs: Update a few leftover mentions of DarwinSSL
 o doh: remove redundant cast
 o file2memory: use a define instead of -1 unsigned value
 o ftp: don't do ssl_shutdown instead of ssl_close
 o ftpserver: don't verify SMTP MAIL FROM names
 o getinfo: reset retry-after value in initinfo
 o gnutls: repair the build with `CURL_DISABLE_PROXY`
 o gtls: survive not being able to get name/issuer
 o h2: repair trailer handling
 o http2: close the http2 connection when no more requests may be sent
 o http2: fix nghttp2_strerror -> nghttp2_http2_strerror in debug messages
 o libssh2: s/ssherr/sftperr/
 o libtest/Makefile.am: add -no-undefined for libstubgss for Cygwin
 o md(4|5): don't use deprecated macOS functions
 o mprintf: Fix dollar string handling
 o mprintf: Fix stack overflows
 o multi: Condition 'extrawait' is always true
 o multi: Remove 10-year old out-commented code
 o multi: remove two checks always true
 o multi: update comment to say easyp list is linear
 o multi_remove_handle: close unused connect-only connections
 o ngtcp2: adapt to error code rename
 o ngtcp2: adjust to recent sockaddr updates
 o ngtcp2: update to modified qlog callback prototype
 o nss: fix build with disabled proxy support
 o ntlm: free target_info before (re-)malloc
 o openssl: fix build with LibreSSL < 2.9.1
 o page-header: provide protocol details in the curl.1 man page
 o quiche: handle calling disconnect twice
 o runtests.pl: treat LibreSSL and BoringSSL as OpenSSL
 o runtests: move the gnutls-serv tests to a dynamic port
 o runtests: move the smbserver to use a dynamic port number
 o runtests: move the TELNET server to a dynamic port
 o runtests: run the DICT server on a random port number
 o runtests: run the http2 tests on a random port number
 o runtests: support dynamicly base64 encoded sections in tests
 o setopt: unset NOBODY switches to GET if still HEAD
 o smtp_parse_address: handle blank input string properly
 o socks: use size_t for size variable
 o strdup: remove the odd strlen check
 o test1119: verify stdout in the test
 o test1139: make it display the difference on test failures
 o test1140: compare stdout
 o test1908: treat file as text
 o tests/FILEFORMAT.md: mention %HTTP2PORT
 o tests/sshserver.pl: fix compatibility with OpenSSH for Windows
 o TLS naming: fix more Winssl and Darwinssl leftovers
 o tls-max.d: this option is only for TLS-using connections
 o tlsv1.3.d. only for TLS-using connections
 o tool_doswin: Simplify Windows version detection
 o tool_getparam: make --krb option work again
 o TrackMemory tests: ignore realloc and free in getenv.c
 o transfer: fix data_pending for builds with both h2 and h3 enabled
 o transfer: fix memory-leak with CURLOPT_CURLU in a duped handle
 o transfer: move retrycount from connect struct to easy handle
 o travis/script.sh: fix use of `-n' with unquoted envvar
 o travis: add ppc64le and s390x builds
 o travis: update quiche builds for new boringssl layout
 o url: fix CURLU and location following
 o url: silence MSVC warning
 o util: silence conversion warnings
 o win32: Add Curl_verify_windows_version() to curlx
 o WIN32: stop forcing narrow-character API
 o windows: add unicode to feature list
 o windows: disable Unix Sockets for old mingw

4 files changed, 26 insertions, 12 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 7a279ec704e..7d520400ea5 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.230 2020/07/01 07:54:09 adam Exp $
+# $NetBSD: Makefile,v 1.231 2020/08/19 09:03:10 leot Exp $
 
-DISTNAME=	curl-7.71.1
+DISTNAME=	curl-7.72.0
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.xz
@@ -13,6 +13,8 @@ LICENSE=	mit
 
 BUILD_DEFS+=	IPV6_READY
 
+TEST_DEPENDS+=	${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket
+
 USE_TOOLS+=		nroff perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -22,6 +24,16 @@ CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 PKGCONFIG_OVERRIDE=	libcurl.pc.in
 TEST_TARGET=		check
 
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	pre-configure
+SUBST_MESSAGE.python=	Adjust hard-coded python invocations
+SUBST_FILES.python=	tests/data/test1451
+SUBST_SED.python=	-e 's,python,${PYTHONBIN},g'
+
+REPLACE_PYTHON+=	tests/*.py
+
+PYTHON_FOR_BUILD_ONLY=	test
+
 INSTALLATION_DIRS=	share/doc/curl
 
 .include "options.mk"
@@ -33,6 +45,7 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 4f1323a021a..7aa006cb2e0 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.80 2020/06/25 21:20:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.81 2020/08/19 09:03:10 leot Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -27,6 +27,7 @@ man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
 man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
 man/man3/CURLINFO_CONTENT_TYPE.3
 man/man3/CURLINFO_COOKIELIST.3
+man/man3/CURLINFO_EFFECTIVE_METHOD.3
 man/man3/CURLINFO_EFFECTIVE_URL.3
 man/man3/CURLINFO_FILETIME.3
 man/man3/CURLINFO_FILETIME_T.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index dde855ee364..68ebd8c8e96 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.164 2020/07/01 07:54:09 adam Exp $
+$NetBSD: distinfo,v 1.165 2020/08/19 09:03:10 leot Exp $
 
-SHA1 (curl-7.71.1.tar.xz) = 243b6ab55421c20500cae8224409c3242d10bcce
-RMD160 (curl-7.71.1.tar.xz) = d41a8efd64fe6d831948bc5ab7ef033a23b5179d
-SHA512 (curl-7.71.1.tar.xz) = 631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b
-Size (curl-7.71.1.tar.xz) = 2387660 bytes
+SHA1 (curl-7.72.0.tar.xz) = b8c8d8f33e9fa99d7ba6e35036715f8a76356f66
+RMD160 (curl-7.72.0.tar.xz) = f9bce9f71e9a0a591cda110e634421d9926a6eb3
+SHA512 (curl-7.72.0.tar.xz) = e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107
+Size (curl-7.72.0.tar.xz) = 2390040 bytes
 SHA1 (patch-configure) = 8dcc112bd2950e146a77bed7638e490e24a5aa71
-SHA1 (patch-curl-config.in) = 16d50c2720e56fd56a9188f58c5cc2717f98e49f
+SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df
diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in
index d7af75d1518..72b9198a111 100644
--- a/www/curl/patches/patch-curl-config.in
+++ b/www/curl/patches/patch-curl-config.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-curl-config.in,v 1.9 2020/06/25 21:20:04 wiz Exp $
+$NetBSD: patch-curl-config.in,v 1.10 2020/08/19 09:03:11 leot Exp $
 
 - make "curl-config --libs" return proper ldflags for shared libraries
 
---- curl-config.in.orig	2020-06-22 08:52:00.000000000 +0000
+--- curl-config.in.orig	2020-08-16 22:28:40.000000000 +0000
 +++ curl-config.in
 @@ -161,9 +161,9 @@ while test $# -gt 0; do
             CURLLIBDIR=""
          fi
-         if test "X@ENABLE_SHARED@" = "Xno" -o "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+         if test "X@ENABLE_SHARED@" = "Xno"; then
 -          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
 +          echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
          else