curl: Update to 7.67.0

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

 o curl: added --no-progress-meter
 o setopt: CURLMOPT_MAX_CONCURRENT_STREAMS is new
 o urlapi: CURLU_NO_AUTHORITY allows empty authority/host part

This release includes the following bugfixes:

 o BINDINGS: five new bindings addded
 o CURLOPT_TIMEOUT.3: Clarify transfer timeout time includes queue time
 o CURLOPT_TIMEOUT.3: remove the mention of "minutes"
 o ESNI: initial build/setup support
 o FTP: FTPFILE_NOCWD: avoid redundant CWDs
 o FTP: allow "rubbish" prepended to the SIZE response
 o FTP: remove trailing slash from path for LIST/MLSD
 o FTP: skip CWD to entry dir when target is absolute
 o FTP: url-decode path before evaluation
 o HTTP3.md: move -p for mkdir, remove -j for make
 o HTTP3: fix invalid use of sendto for connected UDP socket
 o HTTP3: fix ngtcp2 Windows build
 o HTTP3: fix prefix parameter for ngtcp2 build
 o HTTP3: fix typo somehere1 > somewhere1
 o HTTP3: show an --alt-svc using example too
 o INSTALL: add missing space for configure commands
 o INSTALL: add vcpkg installation instructions
 o README: minor grammar fix
 o altsvc: accept quoted ma and persist values
 o altsvc: both backends run h3-23 now
 o appveyor: Add MSVC ARM64 build
 o appveyor: Use two parallel compilation on appveyor with CMake
 o appveyor: add --disable-proxy autotools build
 o appveyor: add 32-bit MinGW-w64 build
 o appveyor: add a winbuild
 o appveyor: add a winbuild that uses VS2017
 o appveyor: make winbuilds with DEBUG=no/yes and VS 2015/2017
 o appveyor: publish artifacts on appveyor
 o appveyor: upgrade VS2017 to VS2019
 o asyn-thread: make use of Curl_socketpair() where available
 o asyn-thread: s/AF_LOCAL/AF_UNIX for Solaris
 o build: Remove unused HAVE_LIBSSL and HAVE_LIBCRYPTO defines
 o checksrc: fix uninitialized variable warning
 o chunked-encoding: stop hiding the CURLE_BAD_CONTENT_ENCODING error
 o cirrus: Increase the git clone depth
 o cirrus: Switch the FreeBSD 11.x build to 11.3 and add a 13.0 build
 o cirrus: switch off blackhole status on the freebsd CI machines
 o cleanups: 21 various PVS-Studio warnings
 o configure: only say ipv6 enabled when the variable is set
 o configure: remove all cyassl references
 o conn-reuse: requests wanting NTLM can reuse non-NTLM connections
 o connect: return CURLE_OPERATION_TIMEDOUT for errno == ETIMEDOUT
 o connect: silence sign-compare warning
 o cookie: avoid harmless use after free
 o cookie: pass in the correct cookie amount to qsort()
 o cookies: change argument type for Curl_flush_cookies
 o cookies: using a share with cookies shouldn't enable the cookie engine
 o copyrights: update copyright notices to 2019
 o curl: create easy handles on-demand and not ahead of time
 o curl: ensure HTTP 429 triggers --retry
 o curl: exit the create_transfers loop on errors
 o curl: fix memory leaked by parse_metalink()
 o curl: load large files with -d @ much faster
 o docs/HTTP3: fix `--with-ssl` ngtcp2 configure flag
 o docs: added multi-event.c example
 o docs: disambiguate CURLUPART_HOST is for host name (ie no port)
 o docs: note on failed handles not being counted by curl_multi_perform
 o doh: allow only http and https in debug mode
 o doh: avoid truncating DNS QTYPE to lower octet
 o doh: clean up dangling DOH memory on easy close
 o doh: fix (harmless) buffer overrun
 o doh: fix undefined behaviour and open up for gcc and clang optimization
 o doh: return early if there is no time left
 o examples/sslbackend: fix -Wchar-subscripts warning
 o examples: remove the "this exact code has not been verified"
 o git: add tests/server/disabled to .gitignore
 o gnutls: make gnutls_bye() not wait for response on shutdown
 o http2: expire a timeout at end of stream
 o http2: prevent dup'ed handles to send dummy PRIORITY frames
 o http2: relax verification of :authority in push promise requests
 o http2_recv: a closed stream trumps pause state
 o http: lowercase headernames for HTTP/2 and HTTP/3
 o ldap: Stop using wide char version of ldapp_err2string
 o ldap: fix OOM error on missing query string
 o mbedtls: add error message for cert validity starting in the future
 o mime: when disabled, avoid C99 macro
 o ngtcp2: adapt to API change
 o ngtcp2: compile with latest ngtcp2 + nghttp3 draft-23
 o ngtcp2: remove fprintf() calls
 o openssl: close_notify on the FTP data connection doesn't mean closure
 o openssl: fix compiler warning with LibreSSL
 o openssl: use strerror on SSL_ERROR_SYSCALL
 o os400: getpeername() and getsockname() return ebcdic AF_UNIX sockaddr
 o parsedate: fix date parsing disabled builds
 o quiche: don't close connection at end of stream
 o quiche: persist connection details (fixes -I with --http3)
 o quiche: set 'drain' when returning without having drained the queues
 o quiche: update HTTP/3 config creation to new API
 o redirect: handle redirects to absolute URLs containing spaces
 o runtests: get textaware info from curl instead of perl
 o schannel: reverse the order of certinfo insertions
 o schannel_verify: Fix concurrent openings of CA file
 o security: silence conversion warning
 o setopt: handle ALTSVC set to NULL
 o setopt: make it easier to add new enum values
 o setopt: store CURLOPT_RTSP_SERVER_CSEQ correctly
 o smb: check for full size message before reading message details
 o smbserver: fix Python 3 compatibility
 o socks: Fix destination host shown on SOCKS5 error
 o test1162: disable MSYS2's POSIX path conversion
 o test1591: fix spelling of http feature
 o tests: add `connect to non-listen` keywords
 o tests: fix narrowing conversion warnings
 o tests: fix the test 3001 cert failures
 o tests: makes tests succeed when using --disable-proxy
 o tests: use %FILE_PWD for file:// URLs
 o tests: use port 2 instead of 60000 for a safer non-listening port
 o tool_operate: Fix retry sleep time shown to user when Retry-After
 o travis: Add an ARM64 build
 o url: Curl_free_request_state() should also free doh handles
 o url: don't set appconnect time for non-ssl/non-ssh connections
 o url: fix the NULL hostname compiler warning
 o url: normalize CURLINFO_EFFECTIVE_URL
 o url: only reuse TLS connections with matching pinning
 o urlapi: avoid index underflow for short ipv6 hostnames
 o urlapi: fix URL encoding when setting a full URL
 o urlapi: fix unused variable warning
 o urlapi: question mark within fragment is still fragment
 o urldata: use 'bool' for the bit type on MSVC compilers
 o vtls: Fix comment typo about macosx-version-min compiler flag
 o vtls: fix narrowing conversion warnings
 o winbuild/MakefileBuild.vc: Add vssh
 o winbuild/MakefileBuild.vc: Fix line endings
 o winbuild: Add manifest to curl.exe for proper OS version detection
 o winbuild: add ENABLE_UNICODE option

4 files changed, 42 insertions, 23 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 6deb7abcc4a..5c24bd9ea78 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.218 2019/09/18 07:21:08 adam Exp $
+# $NetBSD: Makefile,v 1.219 2019/11/06 09:17:29 leot Exp $
 
-DISTNAME=	curl-7.66.0
-PKGREVISION=	1
+DISTNAME=	curl-7.67.0
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/curl/PLIST b/www/curl/PLIST
index e18e129524f..bc777dc0eb9 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.76 2019/09/11 08:32:03 leot Exp $
+@comment $NetBSD: PLIST,v 1.77 2019/11/06 09:17:29 leot Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -81,6 +81,7 @@ man/man3/CURLINFO_TOTAL_TIME_T.3
 man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
 man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
 man/man3/CURLMOPT_MAXCONNECTS.3
+man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3
 man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3
 man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3
 man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3
diff --git a/www/curl/distinfo b/www/curl/distinfo
index c9c61953958..ad0868d4008 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.157 2019/09/11 08:32:03 leot Exp $
+$NetBSD: distinfo,v 1.158 2019/11/06 09:17:29 leot Exp $
 
-SHA1 (curl-7.66.0.tar.xz) = c4b5137302c74839bfa2211da72d960d0d5fedba
-RMD160 (curl-7.66.0.tar.xz) = 24b4a7432d117efcca0c1de95fb4797dcf186216
-SHA512 (curl-7.66.0.tar.xz) = 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
-Size (curl-7.66.0.tar.xz) = 2414840 bytes
-SHA1 (patch-configure) = 9131ad23999f3987b7b67a59191aa6998bd370d0
+SHA1 (curl-7.67.0.tar.xz) = 61ddc68157c2cd1e2c2461b3fbdc0b24083c2e68
+RMD160 (curl-7.67.0.tar.xz) = f9db855e7f76abeac1eeeb9ebc37b2b116be77f2
+SHA512 (curl-7.67.0.tar.xz) = 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29
+Size (curl-7.67.0.tar.xz) = 2418548 bytes
+SHA1 (patch-configure) = 584c39ee826686c570bcf560c18292570cc76ab1
 SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
diff --git a/www/curl/patches/patch-configure b/www/curl/patches/patch-configure
index 9bb268b838f..d03641976e8 100644
--- a/www/curl/patches/patch-configure
+++ b/www/curl/patches/patch-configure
@@ -1,14 +1,15 @@
-$NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
+$NetBSD: patch-configure,v 1.8 2019/11/06 09:17:29 leot Exp $
 
 - Builtin krb5-config in platforms such as solaris do not support
   the gssapi option, and need an explicit -lgss
 - On Darwin, do not append custom CFLAGS.
 - Do not strip debug flags.
 - Support Minix.
+- Avoid unportable `==' test(1) operator.
 
---- configure.orig	2019-03-25 21:03:50.000000000 +0000
+--- configure.orig	2019-11-06 06:38:18.000000000 +0000
 +++ configure
-@@ -3746,6 +3746,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -3806,6 +3806,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
      esac
    done
@@ -16,7 +17,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
    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;}
-@@ -7881,7 +7882,7 @@ else
+@@ -7939,7 +7940,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -25,7 +26,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
      # 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`
-@@ -8347,12 +8348,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -8405,12 +8406,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -40,7 +41,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
    ;;
  
  newos6*)
-@@ -12559,14 +12556,13 @@ _LT_EOF
+@@ -12617,14 +12614,13 @@ _LT_EOF
        fi
        ;;
  
@@ -62,7 +63,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
        ;;
  
      solaris*)
-@@ -13249,15 +13245,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -13307,15 +13303,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        esac
        ;;
  
@@ -83,7 +84,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
        ;;
  
      newsos6)
-@@ -14363,6 +14357,18 @@ fi
+@@ -14421,6 +14415,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -102,7 +103,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
  netbsdelf*-gnu)
    version_type=linux
    need_lib_prefix=no
-@@ -16931,7 +16937,7 @@ squeeze() {
+@@ -16989,7 +16995,7 @@ squeeze() {
  
  
        #
@@ -111,7 +112,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -17259,13 +17265,6 @@ $as_echo_n "checking if compiler accepts
+@@ -17317,13 +17323,6 @@ $as_echo_n "checking if compiler accepts
        tmp_options="$flags_dbg_off"
      fi
      #
@@ -125,7 +126,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
      squeeze CPPFLAGS
      squeeze CFLAGS
  
-@@ -18933,7 +18932,7 @@ $as_echo "no" >&6; }
+@@ -18991,7 +18990,7 @@ $as_echo "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -134,7 +135,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
        ;;
    esac
  
-@@ -21934,7 +21933,11 @@ $as_echo "yes" >&6; }
+@@ -21988,7 +21987,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 +148,7 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -22107,7 +22110,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -22161,7 +22164,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)
@@ -156,3 +157,21 @@ $NetBSD: patch-configure,v 1.7 2019/05/22 09:00:48 leot Exp $
          ;;
       esac
    fi
+@@ -42524,7 +42527,7 @@ $as_echo_n "checking whether ESNI suppor
+     ESNI_ENABLED=0
+   ESNI_SUPPORT=''
+ 
+-      if test "x$OPENSSL_ENABLED" == "x1"; then
++      if test "x$OPENSSL_ENABLED" = "x1"; then
+     for ac_func in SSL_get_esni_status
+ do :
+   ac_fn_c_check_func "$LINENO" "SSL_get_esni_status" "ac_cv_func_SSL_get_esni_status"
+@@ -42540,7 +42543,7 @@ done
+ 
+     fi
+ 
+-    if test "x$ESNI_ENABLED" == "x1"; then
++    if test "x$ESNI_ENABLED" = "x1"; then
+ 
+ $as_echo "#define USE_ESNI 1" >>confdefs.h
+