Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1636541708107090"
MIME-Version: 1.0
Date: Wed, 10 Nov 2021 10:55:08 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/www/curl
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20211110105508.B7DCAFAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	adam
Date:		Wed Nov 10 10:55:08 UTC 2021

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

Log Message:
curl: updated to 7.80.0

Fixed in 7.80.0

Changes:

CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse
CURLOPT_PREREQFUNCTION: add new callback
libssh2: add SHA256 fingerprint support
urlapi: add curl_url_strerror()
urlapi: support UNC paths in file: URLs on Windows
wolfssl: allow setting of groups/curves

Bugfixes:

.github: retry macos "brew install" command on failure
aws-sigv4: make signature work when post data is binary
BINDINGS: URL updates
build: remove checks for WinSock 1
c-hyper: don't abort CONNECT responses early when auth-in-progress
c-hyper: make Curl_http propagate errors better
c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work
c-hyper: make test 217 run
c-hyper: use hyper_request_set_uri_parts to make h2 better
checksrc: ignore preprocessor lines
CI/makefiles: introduce dedicated test target
ci: update Lift config to match requirements of curl build
cirrus: remove FreeBSD 11.4 from the matrix
cirrus: switch to openldap24-client
cleanup: constify unmodified static structs
cmake: add CURL_ENABLE_SSL option
cmake: fix error getting LOCATION property on non-imported target
CMake: restore support for SecureTransport on iOS
cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED
cmdline-opts: made the 'Added:' field mandatory
configure.ac: replace krb5-config with pkg-config
configure: when hyper is selected, deselect nghttp2
connect: use sysaddr_un from sys/un.h or custom-defined for windows
curl-confopts.m4: remove --enable/disable-hidden-symbols
curl-openssl.m4: modify library order for openssl linking
curl-openssl: pass argument to sed single-quoted
curl.1: remove mentions of really old version changes
curl: actually append "-" to --range without number only
curl: correct grammar in generated libcurl code
curl: print help descriptions in an aligned right column
curl_gssapi: fix link error on macOS Monterey
curl_multi_socket_action.3: add a "RETURN VALUE" section
curl_ntlm_core: use OpenSSL only if DES is available
Curl_updateconninfo: store addresses for QUIC connections too
CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred
CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required
CURLOPT_HTTPHEADER.3: add descripion for specific headers
docs/HTTP3: improve build instructions
docs/Makefile.am: repair 'make html'
docs: fix typo in CURLOPT_TRAILERFUNCTION example
docs: provide "RETURN VALUE" section for more func manpages
docs: reduce use of "very"
doh: remove experimental code for DoH with GET
examples/htmltidy: correct wrong printf() use
examples/imap-append: fix end-of-data check
ftp: make the MKD retry to retry once per directory
gen.pl: insert the current date and version in generated man page
gen.pl: replace leading single quotes with \(aq
http2: make getsock not wait for write if there's no remote window
HTTP3: fix the HTTP/3 Explained book link
http: fix Basic auth with empty name field in URL
http: reject HTTP response codes < 100
http: remove assert that breaks hyper
http: set content length earlier
http_proxy: make hyper CONNECT() return the correct error code
http_proxy: multiple CONNECT with hyper done better
hyper: disable test 1294 since hyper doesn't allow such crazy headers
hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING
hyper: pass the CONNECT line to the debug callback
imap: display quota information
INSTALL: update symbol hiding option
lib/mk-ca-bundle.pl: skip certs passed Not Valid After date
lib: avoid fallthrough cases in switch statements
libcurl.rc: switch out the copyright symbol for plain ASCII
libssh2: Get the version at runtime if possible
limit-rate.d: this is average over several seconds
llist: remove redundant code, branch will not be executed
Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options
maketgz: redirect updatemanpages.pl output to /dev/null
man pages: require all to use the same section header order
manpage: adjust the asterisk in some SYNOPSIS sections
md5: fix compilation with OpenSSL 3.0 API
misc: fix a few issues on MidnightBSD
misc: fix typos in docs and comments
ngtcp2: advertise h3 as well as h3-29
ngtcp2: compile with the latest nghttp3
ngtcp2: specify the missing required callback functions
ngtcp2: use latest QUIC TLS RFC9001
NTLM: use DES_set_key_unchecked with OpenSSL
openssl: if verifypeer is not requested, skip the CA loading
openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway
Revert "src/tool_filetime: disable -Wformat on mingw for this file"
sasl: binary messages
schannel: fix memory leak due to failed SSL connection
scripts/delta: count command line options in the new file
sendf: accept zero-length data in Curl_client_write()
sha256: use high-level EVP interface for OpenSSL
smooth-gtk-thread.c: enhance the mutex lock use
sws: fix memory leak on exit
test1160: edited to work with hyper
test1173: make manpage-syntax.pl spot \n errors in examples
test1185: verify checksrc
test1266/1267: disabled on hyper: no HTTP/0.9 support
test1287: make work on hyper
test207: accept a different error code for hyper
test262: don't attempt with hyper
test552: updated to work with hyper
test559: add 'HTTP' in keywords
tests/smbserver.py: fix compatibility with impacket 0.9.23+
tests: add Schannel-specific tests and disable unsupported ones
tests: disable test 2043
tests: kill some test servers afterwards to avoid locked logfiles
tests: use python3 in test 1451
tls: remove newline from three infof() calls
tool_cb_prg: make resumed upload progress bar show better
tool_listhelp: easier generated with gen.pl
tool_main: fix typo in comment
tool_operate: a failed etag save now only fails that transfer
URL-SYNTAX: add IMAP UID SEARCH example
url: check the return value of curl_url()
url: set "k->size" -1 at start of request
urlapi: skip a strlen(), pass in zero
urlapi: URL decode percent-encoded host names
version_win32: use actual version instead of manifested version
vtls: Fix a memory leak if an SSL session cannot be added to the cache
wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity
zuul: pin the quiche build to use an older cmake-rs


To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/www/curl/PLIST
cvs rdiff -u -r1.176 -r1.177 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.12 -r1.13 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.


--_----------=_1636541708107090
Content-Disposition: inline
Content-Length: 7255
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.249 pkgsrc/www/curl/Makefile:1.250
--- pkgsrc/www/curl/Makefile:1.249	Thu Oct 21 07:46:32 2021
+++ pkgsrc/www/curl/Makefile	Wed Nov 10 10:55:08 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.249 2021/10/21 07:46:32 wiz Exp $
+# $NetBSD: Makefile,v 1.250 2021/11/10 10:55:08 adam Exp $
 
-DISTNAME=	curl-7.79.1
-PKGREVISION=	2
+DISTNAME=	curl-7.80.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.86 pkgsrc/www/curl/PLIST:1.87
--- pkgsrc/www/curl/PLIST:1.86	Wed May 26 07:54:16 2021
+++ pkgsrc/www/curl/PLIST	Wed Nov 10 10:55:08 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.86 2021/05/26 07:54:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.87 2021/11/10 10:55:08 adam Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -222,6 +222,7 @@ man/man3/CURLOPT_MAXAGE_CONN.3
 man/man3/CURLOPT_MAXCONNECTS.3
 man/man3/CURLOPT_MAXFILESIZE.3
 man/man3/CURLOPT_MAXFILESIZE_LARGE.3
+man/man3/CURLOPT_MAXLIFETIME_CONN.3
 man/man3/CURLOPT_MAXREDIRS.3
 man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
 man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
@@ -248,6 +249,8 @@ man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3
 man/man3/CURLOPT_POSTQUOTE.3
 man/man3/CURLOPT_POSTREDIR.3
 man/man3/CURLOPT_PREQUOTE.3
+man/man3/CURLOPT_PREREQDATA.3
+man/man3/CURLOPT_PREREQFUNCTION.3
 man/man3/CURLOPT_PRE_PROXY.3
 man/man3/CURLOPT_PRIVATE.3
 man/man3/CURLOPT_PROGRESSDATA.3
@@ -320,6 +323,7 @@ man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
 man/man3/CURLOPT_SSH_AUTH_TYPES.3
 man/man3/CURLOPT_SSH_COMPRESSION.3
 man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
+man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256.3
 man/man3/CURLOPT_SSH_KEYDATA.3
 man/man3/CURLOPT_SSH_KEYFUNCTION.3
 man/man3/CURLOPT_SSH_KNOWNHOSTS.3
@@ -461,6 +465,7 @@ man/man3/curl_url_cleanup.3
 man/man3/curl_url_dup.3
 man/man3/curl_url_get.3
 man/man3/curl_url_set.3
+man/man3/curl_url_strerror.3
 man/man3/curl_version.3
 man/man3/curl_version_info.3
 man/man3/libcurl-easy.3

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.176 pkgsrc/www/curl/distinfo:1.177
--- pkgsrc/www/curl/distinfo:1.176	Tue Oct 26 11:29:24 2021
+++ pkgsrc/www/curl/distinfo	Wed Nov 10 10:55:08 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.176 2021/10/26 11:29:24 nia Exp $
+$NetBSD: distinfo,v 1.177 2021/11/10 10:55:08 adam Exp $
 
-BLAKE2s (curl-7.79.1.tar.xz) = 98c4e52926f4903a3252bfc4a8c49e933bf95f29a75294fe64decf48d6bafe39
-SHA512 (curl-7.79.1.tar.xz) = 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
-Size (curl-7.79.1.tar.xz) = 2465212 bytes
-SHA1 (patch-configure) = 89400a8a1a83b49d70de23d34794ecaeeb8b8c62
+BLAKE2s (curl-7.80.0.tar.xz) = 9ed20221204d08ee1f4b038b28d32ac817d85cc6be3fbb1b248cee75459d469a
+SHA512 (curl-7.80.0.tar.xz) = e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
+Size (curl-7.80.0.tar.xz) = 2474492 bytes
+SHA1 (patch-configure) = 898732721ea9c76ec8729c711eba018f6c88ff6c
 SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df

Index: pkgsrc/www/curl/patches/patch-configure
diff -u pkgsrc/www/curl/patches/patch-configure:1.12 pkgsrc/www/curl/patches/patch-configure:1.13
--- pkgsrc/www/curl/patches/patch-configure:1.12	Wed Sep 15 06:26:01 2021
+++ pkgsrc/www/curl/patches/patch-configure	Wed Nov 10 10:55:08 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.12 2021/09/15 06:26:01 wiz Exp $
+$NetBSD: patch-configure,v 1.13 2021/11/10 10:55:08 adam 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.12 2021/09/
 - Do not strip debug flags.
 - Support Minix.
 
---- configure.orig	2021-09-13 14:46:32.000000000 +0000
+--- configure.orig	2021-11-09 08:16:06.000000000 +0000
 +++ configure
-@@ -4253,6 +4253,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
+@@ -4243,6 +4243,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
          ;;
      esac
    done
@@ -16,7 +16,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
    if test $xc_bad_var_cflags = yes; then
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -8633,7 +8634,7 @@ else $as_nop
+@@ -8623,7 +8624,7 @@ else $as_nop
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -25,7 +25,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
      # 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`
-@@ -9113,12 +9114,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -9103,12 +9104,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -40,7 +40,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
    ;;
  
  newos6*)
-@@ -13384,14 +13381,13 @@ _LT_EOF
+@@ -13374,14 +13371,13 @@ _LT_EOF
        fi
        ;;
  
@@ -62,7 +62,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
        ;;
  
      solaris*)
-@@ -14081,15 +14077,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
+@@ -14071,15 +14067,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
        esac
        ;;
  
@@ -83,7 +83,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
        ;;
  
      newsos6)
-@@ -15199,6 +15193,18 @@ fi
+@@ -15189,6 +15183,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -102,7 +102,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
  netbsdelf*-gnu)
    version_type=linux
    need_lib_prefix=no
-@@ -17759,7 +17765,7 @@ squeeze() {
+@@ -17749,7 +17755,7 @@ squeeze() {
  
  
        #
@@ -111,7 +111,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
      #
      tmp_save_CPPFLAGS="$CPPFLAGS"
      tmp_save_CFLAGS="$CFLAGS"
-@@ -18014,13 +18020,6 @@ printf %s "checking if compiler accepts 
+@@ -18004,13 +18010,6 @@ printf %s "checking if compiler accepts 
        tmp_options="$flags_dbg_yes"
      fi
      #
@@ -125,7 +125,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
      squeeze CPPFLAGS
      squeeze CFLAGS
    fi
-@@ -20734,7 +20733,7 @@ printf "%s\n" "no" >&6; }
+@@ -20667,7 +20666,7 @@ printf "%s\n" "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -134,20 +134,7 @@ $NetBSD: patch-configure,v 1.12 2021/09/
        ;;
    esac
  
-@@ -24428,7 +24427,11 @@ printf "%s\n" "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
--        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
-+        if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
-+           GSSAPI_INCS=`$KRB5CONFIG --cflags`
-+        else
-+           GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
-+        fi
-      elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-      fi
-@@ -24600,7 +24603,7 @@ printf "%s\n" "#define HAVE_GSSAPI 1" >>
+@@ -24729,7 +24728,7 @@ printf "%s\n" "found" >&6; }
          LIBS="-lgss $LIBS"
          ;;
       *)


--_----------=_1636541708107090--