CVS commit: pkgsrc/www/curl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 27 07:51:20 UTC 2022

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

Log Message:
curl: update to 7.83.0.

curl and libcurl 7.83.0

This release includes the following changes:

 o curl: add %header{name} experimental support in -w handling
 o curl: add %{header_json} experimental support in -w handling
 o curl: add --no-clobber [28]
 o curl: add --remove-on-error [11]
 o header api: add curl_easy_header and curl_easy_nextheader [56]
 o msh3: add support for QUIC and HTTP/3 using msh3 [84]

This release includes the following bugfixes:

 o appveyor: add Cygwin build [77]
 o appveyor: only add MSYS2 to PATH where required [78]
 o BearSSL: add CURLOPT_SSL_CIPHER_LIST support [27]
 o BearSSL: add CURLOPT_SSL_CTX_FUNCTION support [26]
 o BINDINGS.md: add Hollywood binding [34]
 o CI: Do not use buildconf. Instead, just use: autoreconf -fi [42]
 o CI: install Python package impacket to run SMB test 1451 [5]
 o configure.ac: move -pthread CFLAGS setting back where it used to be [14]
 o configure: bump the copyright year range int the generated output
 o conncache: include the zone id in the "bundle" hashkey [112]
 o connecache: remove duplicate connc->closure_handle check [90]
 o connect: make Curl_getconnectinfo work with conn cache from share handle [22]
 o connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined [6]
 o cookie.d: clarify when cookies are sent
 o cookies: improve errorhandling for reading cookiefile [123]
 o curl/system.h: update ifdef condition for MCST-LCC compiler [4]
 o curl: error out if -T and -d are used for the same URL [99]
 o curl: error out when options need features not present in libcurl [18]
 o curl: escape '?' in generated --libcurl code [117]
 o curl: fix segmentation fault for empty output file names. [60]
 o curl_easy_header: fix typos in documentation [74]
 o CURLINFO_PRIMARY_PORT.3: clarify which port this is [126]
 o CURLOPT*TLSAUTH.3: they only work with OpenSSL or GnuTLS [105]
 o CURLOPT_DISALLOW_USERNAME_IN_URL.3: use uppercase URL
 o CURLOPT_PREQUOTE.3: only works for FTP file transfers, not dirs [79]
 o CURLOPT_PROGRESSFUNCTION.3: fix typo in example [63]
 o CURLOPT_UNRESTRICTED_AUTH.3: extended explanation [127]
 o CURLSHOPT_UNLOCKFUNC.3: fix the callback prototype [9]
 o docs/HYPER.md: updated to reflect current hyper build needs
 o docs/opts: Mention Schannel client cert type is P12 [50]
 o docs: Fix missing semicolon in example code [102]
 o docs: lots of minor language polish [51]
 o English: use American spelling consistently [95]
 o fail.d: tweak the description [101]
 o firefox-db2pem.sh: make the shell script safer [47]
 o ftp: fix error message for partial file upload [61]
 o gen.pl: change wording for mutexed options [98]
 o GHA: add openssl3 jobs moved over from zuul [88]
 o GHA: build hyper with nightly rustc [7]
 o GHA: move bearssl jobs over from zuul [85]
 o gha: move the event-based test over from Zuul [59]
 o gtls: fix build for disabled TLS-SRP [48]
 o http2: handle DONE called for the paused stream [69]
 o http2: RST the stream if we stop it on our own will [67]
 o http: avoid auth/cookie on redirects same host diff port [110]
 o http: close the stream (not connection) on time condition abort [68]
 o http: reject header contents with nul bytes [41]
 o http: return error on colon-less HTTP headers [31]
 o http: streamclose "already downloaded" [57]
 o hyper: fix status_line() return code [13]
 o hyper: fix tests 580 and 581 for hyper [107]
 o hyper: no h2c support [33]
 o infof: consistent capitalization of warning messages [103]
 o ipv4/6.d: clarify that they are about using IP addresses [3]
 o json.d: fix typo (overriden -> overridden) [24]
 o keepalive-time.d: It takes many probes to detect brokenness [29]
 o lib/warnless.[ch]: only check for WIN32 and ignore _WIN32 [45]
 o lib670: avoid double check result [71]
 o lib: #ifdef on USE_HTTP2 better [65]
 o lib: fix some misuse of curlx_convert_wchar_to_UTF8 [38]
 o lib: remove exclamation marks [100]
 o libssh2: compare sha256 strings case sensitively [114]
 o libssh2: make the md5 comparison fail if wrong length [111]
 o libssh: fix build with old libssh versions [12]
 o libssh: fix double close [124]
 o libssh: Improve fix for missing SSH_S_ stat macros [10]
 o libssh: unstick SFTP transfers when done event-based [58]
 o macos: set .plist version in autoconf [122]
 o mbedtls: remove 'protocols' array from backend when ALPN is not used [66]
 o mbedtls: remove server_fd from backend [91]
 o mk-ca-bundle.pl: Use stricter logic to process the certificates [39]
 o mk-ca-bundle.vbs: delete this script in favor of mk-ca-bundle.pl [8]
 o mlc_config.json: add file to ignore known troublesome URLs [35]
 o mqtt: better handling of TCP disconnect mid-message [55]
 o ngtcp2: add client certificate authentication for OpenSSL [15]
 o ngtcp2: avoid busy loop in low CWND situation [119]
 o ngtcp2: deal with sub-millisecond timeout [116]
 o ngtcp2: disconnect the QUIC connection proper [19]
 o ngtcp2: enlarge H3_SEND_SIZE [82]
 o ngtcp2: fix HTTP/3 upload stall and avoid busy loop [83]
 o ngtcp2: fix memory leak [80]
 o ngtcp2: fix QUIC_IDLE_TIMEOUT [94]
 o ngtcp2: make curl 1ms faster [93]
 o ngtcp2: remove remote_addr which is not used in a meaningful way [81]
 o ngtcp2: update to work after recent ngtcp2 updates [62]
 o ngtcp2: use token when detecting :status header field [92]
 o nonblock: restore setsockopt method to curlx_nonblock [20]
 o openssl: check SSL_get_peer_cert_chain return value [1]
 o openssl: enable CURLOPT_SSL_EC_CURVES with BoringSSL [23]
 o openssl: fix CN check error code [21]
 o options: remove mistaken space before paren in prototype
 o perl: removed a double semicolon at end of line [64]
 o pop3/smtp: return *WEIRD_SERVER_REPLY when not understood [43]
 o projects/README: converted to markdown [76]
 o projects: Update VC version names for VS2017, VS2022 [52]
 o rtsp: don't let CSeq error override earlier errors [37]
 o runtests: add 'bearssl' as testable feature [87]
 o runtests: make 'oldlibssh' be before 0.9.4 [2]
 o schannel: remove dead code that will never run [89]
 o scripts/copyright.pl: ignore the new mlc_config.json file
 o scripts: move three scripts from lib/ to scripts/ [44]
 o test1135: sync with recent API updates [54]
 o test1459: disable for oldlibssh [53]
 o test375: fix line endings on Windows [40]
 o test386: Fix an incorrect test markup tag
 o test718: edited slightly to return better HTTP [32]
 o tests/server/util.h: align WIN32 condition with util.c [46]
 o tests: refactor server/socksd.c to support --unix-socket [96]
 o timediff.[ch]: add curlx helper functions for timeval conversions [86]
 o tls: make mbedtls and NSS check for h2, not nghttp2 [70]
 o tool and tests: force flush of all buffers at end of program [17]
 o tool_cb_hdr: Turn the Location: into a terminal hyperlink [30]
 o tool_getparam: error out on missing -K file [115]
 o tool_listhelp.c: uppercase URL
 o tool_operate: fix a scan-build warning [16]
 o tool_paramhlp: use feof(3) to identify EOF correctly when using fread(3) [97]
 o transfer: redirects to other protocols or ports clear auth [109]
 o unit1620: call global_init before calling Curl_open [125]
 o url: check sasl additional parameters for connection reuse. [113]
 o vtls: provide a unified APLN-disagree string for all backends [75]
 o vtls: use a backend standard message for "ALPN: offers %s" [73]
 o vtls: use a generic "ALPN, server accepted" message [72]
 o winbuild/README.md: fixup dead link [36]
 o winbuild: Add a Visual Studio example to the README [49]
 o wolfssl: fix compiler error without IPv6 [25]


To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/www/curl/PLIST
cvs rdiff -u -r1.180 -r1.181 pkgsrc/www/curl/distinfo
cvs rdiff -u -r1.15 -r1.16 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.254 pkgsrc/www/curl/Makefile:1.255
--- pkgsrc/www/curl/Makefile:1.254      Tue Mar  8 08:18:27 2022
+++ pkgsrc/www/curl/Makefile    Wed Apr 27 07:51:20 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.254 2022/03/08 08:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.255 2022/04/27 07:51:20 wiz Exp $
 
-DISTNAME=      curl-7.82.0
+DISTNAME=      curl-7.83.0
 CATEGORIES=    www
 MASTER_SITES=  https://curl.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/PLIST
diff -u pkgsrc/www/curl/PLIST:1.88 pkgsrc/www/curl/PLIST:1.89
--- pkgsrc/www/curl/PLIST:1.88  Fri Jan  7 21:05:37 2022
+++ pkgsrc/www/curl/PLIST       Wed Apr 27 07:51:20 2022
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.88 2022/01/07 21:05:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.89 2022/04/27 07:51:20 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
 include/curl/curlver.h
 include/curl/easy.h
+include/curl/header.h
 include/curl/mprintf.h
 include/curl/multi.h
 include/curl/options.h
@@ -403,7 +404,9 @@ man/man3/curl_easy_cleanup.3
 man/man3/curl_easy_duphandle.3
 man/man3/curl_easy_escape.3
 man/man3/curl_easy_getinfo.3
+man/man3/curl_easy_header.3
 man/man3/curl_easy_init.3
+man/man3/curl_easy_nextheader.3
 man/man3/curl_easy_option_by_id.3
 man/man3/curl_easy_option_by_name.3
 man/man3/curl_easy_option_next.3

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.180 pkgsrc/www/curl/distinfo:1.181
--- pkgsrc/www/curl/distinfo:1.180      Tue Mar  8 08:18:27 2022
+++ pkgsrc/www/curl/distinfo    Wed Apr 27 07:51:20 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.180 2022/03/08 08:18:27 wiz Exp $
+$NetBSD: distinfo,v 1.181 2022/04/27 07:51:20 wiz Exp $
 
-BLAKE2s (curl-7.82.0.tar.xz) = def93379cffdb50e57a2e14f14bdf4c707a1e027ebb6a591b2267fc065726b27
-SHA512 (curl-7.82.0.tar.xz) = a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57
-Size (curl-7.82.0.tar.xz) = 2446764 bytes
-SHA1 (patch-configure) = c2a5911c2065a870c8cbf38afbd2fd7e94909343
+BLAKE2s (curl-7.83.0.tar.xz) = fb5024bce2a47b6fe98e82b7e498a8ea1f4b962329741fb7c9c4035ba6035686
+SHA512 (curl-7.83.0.tar.xz) = be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9
+Size (curl-7.83.0.tar.xz) = 2472560 bytes
+SHA1 (patch-configure) = ae123a94fa84ef99dfc1dadd596ac86ef0d143fe
 SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df

Index: pkgsrc/www/curl/patches/patch-configure
diff -u pkgsrc/www/curl/patches/patch-configure:1.15 pkgsrc/www/curl/patches/patch-configure:1.16
--- pkgsrc/www/curl/patches/patch-configure:1.15        Tue Mar  8 08:18:28 2022
+++ pkgsrc/www/curl/patches/patch-configure     Wed Apr 27 07:51:20 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.15 2022/03/08 08:18:28 wiz Exp $
+$NetBSD: patch-configure,v 1.16 2022/04/27 07:51:20 wiz 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.15 2022/03/
 - Do not strip debug flags.
 - Support Minix.
 
---- configure.orig     2022-03-01 19:38:54.000000000 +0000
+--- configure.orig     2022-04-25 07:31:45.000000000 +0000
 +++ configure
-@@ -4237,6 +4237,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
+@@ -4246,6 +4246,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
          ;;
      esac
    done
@@ -16,16 +16,16 @@ $NetBSD: patch-configure,v 1.15 2022/03/
    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;}
-@@ -8638,7 +8639,7 @@ else $as_nop
+@@ -8648,7 +8649,7 @@ else $as_nop
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
--  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-+  bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
+-  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
++  bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | minix* | netbsd* | openbsd*)
      # 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`
-@@ -9118,12 +9119,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -9236,12 +9237,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -40,7 +40,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
    ;;
  
  newos6*)
-@@ -13389,14 +13386,13 @@ _LT_EOF
+@@ -13520,14 +13517,13 @@ _LT_EOF
        fi
        ;;
  
@@ -62,7 +62,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
        ;;
  
      solaris*)
-@@ -14086,15 +14082,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
+@@ -14218,15 +14214,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
        esac
        ;;
  
@@ -83,7 +83,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
        ;;
  
      newsos6)
-@@ -15204,6 +15198,18 @@ fi
+@@ -15337,6 +15331,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -102,7 +102,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
  netbsdelf*-gnu)
    version_type=linux
    need_lib_prefix=no
-@@ -17650,7 +17656,7 @@ squeeze() {
+@@ -17794,7 +17800,7 @@ squeeze() {
  
  
        #
@@ -111,7 +111,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
      #
      tmp_save_CPPFLAGS="$CPPFLAGS"
      tmp_save_CFLAGS="$CFLAGS"
-@@ -17943,13 +17949,6 @@ printf %s "checking if compiler accepts 
+@@ -18087,13 +18093,6 @@ printf %s "checking if compiler accepts 
        tmp_options="$flags_dbg_yes"
      fi
      #
@@ -125,7 +125,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
      squeeze CPPFLAGS
      squeeze CFLAGS
    fi
-@@ -20709,7 +20708,7 @@ printf "%s\n" "no" >&6; }
+@@ -20853,7 +20852,7 @@ printf "%s\n" "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -134,7 +134,7 @@ $NetBSD: patch-configure,v 1.15 2022/03/
        ;;
    esac
  
-@@ -25108,7 +25107,7 @@ printf "%s\n" "found" >&6; }
+@@ -25252,7 +25251,7 @@ printf "%s\n" "found" >&6; }
          LIBS="-lgss $LIBS"
          ;;
       *)