CVS commit: pkgsrc/www/curl

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Apr 29 11:24:19 UTC 2020

Modified Files:
        pkgsrc/www/curl: Makefile distinfo
        pkgsrc/www/curl/patches: patch-configure

Log Message:
curl: Update to 7.70.0

Changes:
7.70.0
------
This release includes the following changes:

 o curl: add --ssl-revoke-best-effort to allow a "best effort" revocation check
 o mqtt: add new experimental protocol
 o schannel: add "best effort" revocation check option: CURLSSLOPT_REVOKE_BEST_EFFORT
 o writeout: support to generate JSON output with '%{json}'

This release includes the following bugfixes:

 o appveyor: add Unicode winbuild jobs
 o appveyor: completely disable tests that fail to timeout early
 o appveyor: show failed tests in log even if test is ignored
 o appveyor: sort builds by type and add two new variants
 o appveyor: turn disabled tests into ignored result tests
 o appveyor: use random test server ports based upon APPVEYOR_API_URL
 o build: fixed build for systems with select() in unistd.h
 o buildconf: avoid using tempfile when removing files
 o checksrc: warn on obvious conditional blocks on the same line as if()
 o CI-fuzz: increase fuzz time to 40 minutes
 o ci/tests: fix Azure Pipelines not running Windows containers
 o CI: add build with ngtcp2 + gnutls on Travis CI
 o CI: bring GitHub Actions fuzzing job in line with macOS jobs
 o CI: migrate macOS jobs from Azure and Travis CI to GitHub Actions
 o CI: remove default Ubuntu build from GitHub Actions
 o cirrus: no longer ignore test 504 which is working again
 o cirrus: re-enable the FreeBSD 13 CI builds
 o cleanup: insert newline after if() conditions
 o cmake: add aliases so exported target names are available in tree
 o cmake: add CMAKE_MSVC_RUNTIME_LIBRARY
 o cmake: add support for building with wolfSSL
 o cmake: Avoid MSVC C4273 warnings in send/recv checks
 o cmdline: fix handling of OperationConfig linked list (--next)
 o compressed.d: stress that the headers are not modified
 o config: remove all defines of HAVE_DES_H
 o configure: convert -I to -isystem as a last step
 o configure: document 'compiler_num' for gcc
 o configure: don't check for Security.framework when cross-compiling
 o configure: fix -pedantic-errors for GCC 5 and later
 o configure: remove use of -vec-report0 from CFLAGS with icc
 o connect: happy eyeballs cleanup
 o connect: store connection info for QUIC connections
 o copyright: fix out-of-date copyright ranges and missing headers
 o curl-functions.m4: remove inappropriate AC_REQUIRE
 o curl.h: remnove CURL_VERSION_ESNI. Never supported nor documented
 o curl.h: update comment typo
 o curl: allow both --etag-compare and --etag-save with same file name
 o curl_setup: define _WIN32_WINNT_[OS] symbols
 o CURLINFO_CONDITION_UNMET: return true for 304 http status code
 o CURLINFO_NUM_CONNECTS: improve accuracy
 o CURLOPT_WRITEFUNCTION.3: add inline example and new see-also
 o dist: add mail-rcpt-allowfails.d to the tarball
 o docs/make: generate curl.1 from listed files only
 o docs: add warnings about FILE: URLs on Windows
 o easy: fix curl_easy_duphandle for builds missing IPv6 that use c-ares
 o examples/sessioninfo.c: add include to fix compiler warning
 o github actions: run when pushed to master or */ci + PRs
 o gnutls: bump lowest supported version to 3.1.10
 o gnutls: Don't skip really long certificate fields
 o gnutls: ensure TLS 1.3 when SRP isn't requested
 o gopher: check remaining time left during write busy loop
 o gskit: use our internal select wrapper for portability
 o http2: Fix erroneous debug message that h2 connection closed
 o http: don't consider upload done if the request isn't completely sent off
 o http: free memory when Alt-Used header creation fails due to OOM
 o lib/mk-ca-bundle: skip empty certs
 o lib670: use the same Win32 API check as all other lib tests
 o lib: fix typos in comments and errormessages
 o lib: never define CURL_CA_BUNDLE with a getenv
 o libcurl-multi.3: added missing full stop
 o libssh: avoid options override by configuration files
 o libssh: Use new ECDSA key types to check known hosts
 o mailmap: fixup a few author names/fields
 o Makefile.m32: Improve windres parameter compatibility
 o Makefile: run the cd commands in a subshell
 o memdebug: don't log free(NULL)
 o mime: properly check Content-Type even if it has parameters
 o multi-ssl: reset the SSL backend on `Curl_global_cleanup()`
 o multi: improve parameter check for curl_multi_remove_handle
 o nghttp2: 1.12.0 required
 o ngtcp2: update to git master for the key installation API change
 o nss: check for PK11_CreateDigestContext() returning NULL
 o openssl: adapt to functions marked as deprecated since version 3
 o OS400: update strings for ccsid-ifier (fixes the build)
 o output.d: quote the URL when globbing
 o packages: add OS400/chkstrings.c to the dist
 o RELEASE-PROCEDURE.md: run the copyright.pl script!
 o Revert "file: on Windows, refuse paths that start with \\"
 o runtests: always put test number in servercmd file
 o runtests: provide nicer errormsg when protocol "dump" file is empty
 o schannel: Fix blocking timeout logic
 o schannel: support .P12 or .PFX client certificates
 o scripts/release-notes.pl: add helper script for RELEASE-NOTES maintenance
 o select: make Curl_socket_check take timediff_t timeout
 o select: move duplicate select preparation code into Curl_select
 o select: remove typecast from SOCKET_WRITABLE/READABLE macros
 o server/getpart: make the "XML-parser" stricter
 o server/resolve: remove AI_CANONNAME to make macos tell the truth
 o smtp: set auth correctly
 o sockfilt: add logmsg output to select_ws_wait_thread on Windows
 o sockfilt: fix broken pipe on Windows to be ready in select_ws
 o sockfilt: fix handling of ready closed sockets on Windows
 o sockfilt: fix race-condition of waiting threads and event handling
 o socks: Fix blocking timeout logic
 o src: Remove C99 constructs to ensure C89 compliance
 o SSLCERTS.md: Fix example code for setting CA cert file
 o test1148: tolerate progress updates better (again)
 o test1154: set a proper name
 o test1177: verify that all the CURL_VERSION_ bits are documented
 o test1566: verify --etag-compare that gets a 304 back
 o test1908: avoid using fixed port number in test data
 o test2043: use revoked.badssl.com instead of revoked.grc.com
 o test2100: fix static port instead of dynamic value being used
 o tests/data: fix some XML formatting issues in test cases
 o tests/FILEFORMAT: converted to markdown and extended
 o tests/server/util.c: use curl_off_t instead of long for pid
 o tests: add %NOLISTENPORT and use it
 o tests: add Windows compatible pidwait like pidkill and pidterm
 o tests: fix conflict between Cygwin/msys and Windows PIDs
 o tests: introduce preprocessed test cases
 o tests: make Python-based servers compatible with Python 2 and 3
 o tests: make runtests check that disabled tests exists
 o tests: move pingpong server to dynamic listening port
 o tests: remove python_dependencies for smbserver from our tree
 o tests: run the RTSP test server on a dynamic port number
 o tests: run the SOCKS test server on a dynamic port number
 o tests: run the sws server on "any port"
 o tests: run the TFTP test server on a dynamic port number
 o tests: use Cygwin/msys PIDs for stunnel and sshd on Windows
 o tls: remove the BACKEND define kludge from most backends
 o tool: do not declare functions with Curl_ prefix
 o tool_operate: fix add_parallel_transfers when more are in queue
 o transfer: cap retries of "dead connections" to 5
 o transfer: Switch PUT to GET/HEAD on 303 redirect
 o travis: bump the wolfssl CI build to use 4.4.0
 o travis: update the ngtcp2 build to use the latest OpenSSL patch
 o url: allow non-HTTPS altsvc-matching for debug builds
 o version: add 'cainfo' and 'capath' to version info struct
 o version: increase buffer space for ssl version output
 o version: skip idn2_check_version() check and add precaution
 o vquic: add support for GnuTLS backend of ngtcp2
 o vtls: fix ssl_config memory-leak on out-of-memory
 o warnless: remove code block for icc that didn't work
 o windows: enable UnixSockets with all build toolchains
 o windows: suppress UI in all CryptAcquireContext() calls


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.161 -r1.162 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/curl/patches/patch-configure

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

Modified files:

Index: pkgsrc/www/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.225 pkgsrc/www/curl/Makefile:1.226
--- pkgsrc/www/curl/Makefile:1.225      Wed Mar 11 08:30:36 2020
+++ pkgsrc/www/curl/Makefile    Wed Apr 29 11:24:19 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.225 2020/03/11 08:30:36 adam Exp $
+# $NetBSD: Makefile,v 1.226 2020/04/29 11:24:19 leot Exp $
 
-DISTNAME=      curl-7.69.1
+DISTNAME=      curl-7.70.0
 CATEGORIES=    www
 MASTER_SITES=  https://curl.haxx.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.161 pkgsrc/www/curl/distinfo:1.162
--- pkgsrc/www/curl/distinfo:1.161      Wed Mar 11 08:30:36 2020
+++ pkgsrc/www/curl/distinfo    Wed Apr 29 11:24:19 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.161 2020/03/11 08:30:36 adam Exp $
+$NetBSD: distinfo,v 1.162 2020/04/29 11:24:19 leot Exp $
 
-SHA1 (curl-7.69.1.tar.xz) = 2dcd7c3a5ebe67cd3329f34e704be147c16ec7dc
-RMD160 (curl-7.69.1.tar.xz) = 802d529dac716fb17875bd40da9eb4afb3ca60d2
-SHA512 (curl-7.69.1.tar.xz) = dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
-Size (curl-7.69.1.tar.xz) = 2467272 bytes
-SHA1 (patch-configure) = daf5fd2ceca72cca80f992be1973ef70f63135e2
+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 (patch-configure) = 8dcc112bd2950e146a77bed7638e490e24a5aa71
 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533

Index: pkgsrc/www/curl/patches/patch-configure
diff -u pkgsrc/www/curl/patches/patch-configure:1.9 pkgsrc/www/curl/patches/patch-configure:1.10
--- pkgsrc/www/curl/patches/patch-configure:1.9 Wed Jan  8 11:59:18 2020
+++ pkgsrc/www/curl/patches/patch-configure     Wed Apr 29 11:24:19 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.9 2020/01/08 11:59:18 leot Exp $
+$NetBSD: patch-configure,v 1.10 2020/04/29 11:24:19 leot Exp $
 
 - Builtin krb5-config in platforms such as solaris do not support
   the gssapi option, and need an explicit -lgss
@@ -6,9 +6,9 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
 - Do not strip debug flags.
 - Support Minix.
 
---- configure.orig     2019-11-06 06:38:18.000000000 +0000
+--- configure.orig     2020-04-27 16:15:09.000000000 +0000
 +++ configure
-@@ -3806,6 +3806,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -3812,6 +3812,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
      esac
    done
@@ -16,7 +16,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
    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;}
-@@ -7939,7 +7940,7 @@ else
+@@ -7945,7 +7946,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -25,7 +25,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
      # This has been around since 386BSD, at least.  Likely further.
      if test -x /sbin/sysctl; then
        lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -8405,12 +8406,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -8411,12 +8412,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -40,7 +40,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
    ;;
  
  newos6*)
-@@ -12617,14 +12614,13 @@ _LT_EOF
+@@ -12623,14 +12620,13 @@ _LT_EOF
        fi
        ;;
  
@@ -62,7 +62,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
        ;;
  
      solaris*)
-@@ -13307,15 +13303,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -13313,15 +13309,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
  
@@ -83,7 +83,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
        ;;
  
      newsos6)
-@@ -14421,6 +14415,18 @@ fi
+@@ -14427,6 +14421,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -102,16 +102,16 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
  netbsdelf*-gnu)
    version_type=linux
    need_lib_prefix=no
-@@ -16989,7 +16995,7 @@ squeeze() {
+@@ -16995,7 +17001,7 @@ squeeze() {
  
  
        #
 -  if test "$compiler_id" != "unknown"; then
 +  if false; then
      #
-     if test "$compiler_id" = "GNU_C" ||
-       test "$compiler_id" = "CLANG"; then
-@@ -17317,13 +17323,6 @@ $as_echo_n "checking if compiler accepts
+     tmp_save_CPPFLAGS="$CPPFLAGS"
+     tmp_save_CFLAGS="$CFLAGS"
+@@ -17283,13 +17289,6 @@ $as_echo_n "checking if compiler accepts
        tmp_options="$flags_dbg_off"
      fi
      #
@@ -125,7 +125,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
      squeeze CPPFLAGS
      squeeze CFLAGS
  
-@@ -18991,7 +18990,7 @@ $as_echo "no" >&6; }
+@@ -18962,7 +18961,7 @@ $as_echo "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -134,7 +134,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
        ;;
    esac
  
-@@ -21988,7 +21987,11 @@ $as_echo "yes" >&6; }
+@@ -21995,7 +21994,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 "$KRB5CONFIG"; then
@@ -147,7 +147,7 @@ $NetBSD: patch-configure,v 1.9 2020/01/0
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -22161,7 +22164,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -22168,7 +22171,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)