curl: Update to 7.68.0 pkgsrc changes: - Removes patch-configure hunks applied upstream Changes: 7.68.0 ------ This release includes the following changes: o TLS: add BearSSL vtls implementation o XFERINFOFUNCTION: support CURL_PROGRESSFUNC_CONTINUE o curl: add --etag-compare and --etag-save o curl: add --parallel-immediate o multi: add curl_multi_wakeup() o openssl: CURLSSLOPT_NO_PARTIALCHAIN can disable partial cert chains This release includes the following bugfixes: o CVE-2019-15601: file: on Windows, refuse paths that start with \\ o Azure Pipelines: add several builds o CMake: add support for building with the NSS vtls backend o CURL-DISABLE: initial docs for the CURL_DISABLE_* defines o CURLOPT_HEADERFUNCTION.3: Document that size is always 1 o CURLOPT_QUOTE.3: fix typos o CURLOPT_READFUNCTION.3: fix the example o CURLOPT_URL.3: "curl supports SMB version 1 (only)" o CURLOPT_VERBOSE.3: see also ERRORBUFFER o HISTORY: added cmake, HTTP/3 and parallel downloads with curl o HISTORY: the SMB(S) support landed in 2014 o INSTALL.md: provide Android build instructions o KNOWN_BUGS: Connection information when using TCP Fast Open o KNOWN_BUGS: LDAP on Windows doesn't work correctly o KNOWN_BUGS: TLS session cache doesn't work with TFO o OPENSOCKETFUNCTION.3: correct the purpose description o TrackMemory tests: always remove CR before LF o altsvc: bump to h3-24 o altsvc: make the save function ignore NULL filenames o build: Disable Visual Studio warning "conditional expression is constant" o build: fix for CURL_DISABLE_DOH o checksrc.bat: Add a check for vquic and vssh directories o checksrc: repair the copyrightyear check o cirrus-ci: enable clang sanitizers on freebsd 13 o cirrus: Drop the FreeBSD 10.4 build o config-win32: cpu-machine-OS for Windows on ARM o configure: avoid unportable `==' test(1) operator o configure: enable IPv6 support without `getaddrinfo` o configure: fix typo in help text o conncache: CONNECT_ONLY connections assumed always in-use o conncache: fix multi-thread use of shared connection cache o copyrights: fix copyright year range o create_conn: prefer multiplexing to using new connections o curl -w: handle a blank input file correctly o curl.h: add two missing defines for "pre ISO C" compilers o curl/parseconfig: fix mem-leak o curl/parseconfig: use curl_free() to free memory allocated by libcurl o curl: cleanup multi handle on failure o curl: fix --upload-file . hangs if delay in STDIN o curl: fix -T globbing o curl: improved cleanup in upload error path o curl: make a few char pointers point to const char instead o curl: properly free mimepost data o curl: show better error message when no homedir is found o curl: show error for --http3 if libcurl lacks support o curl_setup_once: consistently use WHILE_FALSE in macros o define: remove HAVE_ENGINE_LOAD_BUILTIN_ENGINES, not used anymore o docs: Change 'experiemental' to 'experimental' o docs: TLS SRP doesn't work with TLS 1.3 o docs: fix several typos o docs: mention CURL_MAX_INPUT_LENGTH restrictions o doh: improved both encoding and decoding o doh: make it behave when built without proxy support o examples/postinmemory.c: Call curl_global_cleanup always o examples/url2file.c: corrected erroneous comment o examples: add multi-poll.c o global_init: undo the "intialized" bump in case of failure o hostip: suppress compiler warning o http_ntlm: Remove duplicate NSS initialisation o lib: Move lib/ssh.h -> lib/vssh/ssh.h o lib: fix compiler warnings with `CURL_DISABLE_VERBOSE_STRINGS` o lib: fix warnings found when porting to NuttX o lib: remove ASSIGNWITHINCONDITION exceptions, use our code style o lib: remove erroneous +x file permission on some c files o libssh2: add support for ECDSA and ed25519 knownhost keys o multi.h: remove INITIAL_MAX_CONCURRENT_STREAMS from public header o multi: free sockhash on OOM o multi_poll: avoid busy-loop when called without easy handles attached o ngtcp2: Support the latest update key callback type o ngtcp2: fix thread-safety bug in error-handling o ngtcp2: free used resources on disconnect o ngtcp2: handle key updates as ngtcp2 master branch tells us o ngtcp2: increase QUIC window size when data is consumed o ngtcp2: use overflow buffer for extra HTTP/3 data o ntlm: USE_WIN32_CRYPTO check removed to get USE_NTLM2SESSION set o ntlm_wb: fix double-free in OOM o openssl: Revert to less sensitivity for SYSCALL errors o openssl: improve error message for SYSCALL during connect o openssl: prevent recursive function calls from ctx callbacks o openssl: retrieve reported LibreSSL version at runtime o openssl: set X509_V_FLAG_PARTIAL_CHAIN by default o parsedate: offer a getdate_capped() alternative o pause: avoid updating socket if done was already called o projects: Fix Visual Studio projects SSH builds o projects: Fix Visual Studio wolfSSL configurations o quiche: reject HTTP/3 headers in the wrong order o remove_handle: clear expire timers after multi_done() o runtests: --repeat=[num] to repeat tests o runtests: introduce --shallow to reduce huge torture tests o schannel: fix --tls-max for when min is --tlsv1 or default o setopt: Fix ALPN / NPN user option when built without HTTP2 o strerror: Add Curl_winapi_strerror for Win API specific errors o strerror: Fix an error looking up some Windows error strings o strerror: Fix compiler warning "empty expression" o system.h: fix for MCST lcc compiler o test/sws: search for "Testno:" header unconditionally if no testno o test1175: verify symbols-in-versions and libcurl-errors.3 in sync o test1270: a basic -w redirect_url test o test1456: remove the use of a fixed local port number o test1558: use double slash after file: o test1560: require IPv6 for IPv6 aware URL parsing o tests/lib1557: fix mem-leak in OOM o tests/lib1559: fix mem-leak in OOM o tests/lib1591: free memory properly on OOM, in the trailers callback o tests/unit1607: fix mem-leak in OOM o tests/unit1609: fix mem-leak in OOM o tests/unit1620: fix bad free in OOM o tests: Change NTLM tests to require SSL o tests: Fix bounce requests with truncated writes o tests: fix build with `CURL_DISABLE_DOH` o tests: fix permissions of ssh keys in WSL o tests: make it possible to set executable extensions o tests: make sure checksrc runs on header files too o tests: set LC_ALL=en_US.UTF-8 instead of blank in several tests o tests: use DoH feature for DoH tests o tests: use \r\n for log messages in WSL o tool_operate: fix mem leak when failed config parse o travis: Fix error detection o travis: abandon coveralls, it is not reliable o travis: build ngtcp2 with --enable-lib-only o travis: export the CC/CXX variables when set o vtls: make BearSSL possible to set with CURL_SSL_BACKEND o winbuild: Define CARES_STATICLIB when WITH_CARES=static o winbuild: Document CURL_STATICLIB requirement for static libcurl This release includes the following known bugs: o see docs/KNOWN_BUGS (https://curl.haxx.se/docs/knownbugs.html)diff -r1.219 -r1.220 pkgsrc/www/curl/Makefile
(leot)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.219 2019/11/06 09:17:29 leot Exp $ | 1 | # $NetBSD: Makefile,v 1.220 2020/01/08 11:59:18 leot Exp $ | |
2 | 2 | |||
3 | DISTNAME= curl-7.67.0 | 3 | DISTNAME= curl-7.68.0 | |
4 | CATEGORIES= www | 4 | CATEGORIES= www | |
5 | MASTER_SITES= https://curl.haxx.se/download/ | 5 | MASTER_SITES= https://curl.haxx.se/download/ | |
6 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
7 | 7 | |||
8 | MAINTAINER= leot@NetBSD.org | 8 | MAINTAINER= leot@NetBSD.org | |
9 | HOMEPAGE= https://curl.haxx.se/ | 9 | HOMEPAGE= https://curl.haxx.se/ | |
10 | COMMENT= Client that groks URLs | 10 | COMMENT= Client that groks URLs | |
11 | # not completely, but near enough | 11 | # not completely, but near enough | |
12 | LICENSE= mit | 12 | LICENSE= mit | |
13 | 13 | |||
14 | BUILD_DEFS+= IPV6_READY | 14 | BUILD_DEFS+= IPV6_READY | |
15 | 15 | |||
16 | USE_TOOLS+= nroff perl | 16 | USE_TOOLS+= nroff perl |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.77 2019/11/06 09:17:29 leot Exp $ | 1 | @comment $NetBSD: PLIST,v 1.78 2020/01/08 11:59:18 leot Exp $ | |
2 | bin/curl | 2 | bin/curl | |
3 | bin/curl-config | 3 | bin/curl-config | |
4 | include/curl/curl.h | 4 | include/curl/curl.h | |
5 | include/curl/curlver.h | 5 | include/curl/curlver.h | |
6 | include/curl/easy.h | 6 | include/curl/easy.h | |
7 | include/curl/mprintf.h | 7 | include/curl/mprintf.h | |
8 | include/curl/multi.h | 8 | include/curl/multi.h | |
9 | include/curl/stdcheaders.h | 9 | include/curl/stdcheaders.h | |
10 | include/curl/system.h | 10 | include/curl/system.h | |
11 | include/curl/typecheck-gcc.h | 11 | include/curl/typecheck-gcc.h | |
12 | include/curl/urlapi.h | 12 | include/curl/urlapi.h | |
13 | lib/libcurl.la | 13 | lib/libcurl.la | |
14 | lib/pkgconfig/libcurl.pc | 14 | lib/pkgconfig/libcurl.pc | |
@@ -408,26 +408,27 @@ man/man3/curl_multi_cleanup.3 | @@ -408,26 +408,27 @@ man/man3/curl_multi_cleanup.3 | |||
408 | man/man3/curl_multi_fdset.3 | 408 | man/man3/curl_multi_fdset.3 | |
409 | man/man3/curl_multi_info_read.3 | 409 | man/man3/curl_multi_info_read.3 | |
410 | man/man3/curl_multi_init.3 | 410 | man/man3/curl_multi_init.3 | |
411 | man/man3/curl_multi_perform.3 | 411 | man/man3/curl_multi_perform.3 | |
412 | man/man3/curl_multi_poll.3 | 412 | man/man3/curl_multi_poll.3 | |
413 | man/man3/curl_multi_remove_handle.3 | 413 | man/man3/curl_multi_remove_handle.3 | |
414 | man/man3/curl_multi_setopt.3 | 414 | man/man3/curl_multi_setopt.3 | |
415 | man/man3/curl_multi_socket.3 | 415 | man/man3/curl_multi_socket.3 | |
416 | man/man3/curl_multi_socket_action.3 | 416 | man/man3/curl_multi_socket_action.3 | |
417 | man/man3/curl_multi_socket_all.3 | 417 | man/man3/curl_multi_socket_all.3 | |
418 | man/man3/curl_multi_strerror.3 | 418 | man/man3/curl_multi_strerror.3 | |
419 | man/man3/curl_multi_timeout.3 | 419 | man/man3/curl_multi_timeout.3 | |
420 | man/man3/curl_multi_wait.3 | 420 | man/man3/curl_multi_wait.3 | |
421 | man/man3/curl_multi_wakeup.3 | |||
421 | man/man3/curl_share_cleanup.3 | 422 | man/man3/curl_share_cleanup.3 | |
422 | man/man3/curl_share_init.3 | 423 | man/man3/curl_share_init.3 | |
423 | man/man3/curl_share_setopt.3 | 424 | man/man3/curl_share_setopt.3 | |
424 | man/man3/curl_share_strerror.3 | 425 | man/man3/curl_share_strerror.3 | |
425 | man/man3/curl_slist_append.3 | 426 | man/man3/curl_slist_append.3 | |
426 | man/man3/curl_slist_free_all.3 | 427 | man/man3/curl_slist_free_all.3 | |
427 | man/man3/curl_strequal.3 | 428 | man/man3/curl_strequal.3 | |
428 | man/man3/curl_strnequal.3 | 429 | man/man3/curl_strnequal.3 | |
429 | man/man3/curl_unescape.3 | 430 | man/man3/curl_unescape.3 | |
430 | man/man3/curl_url.3 | 431 | man/man3/curl_url.3 | |
431 | man/man3/curl_url_cleanup.3 | 432 | man/man3/curl_url_cleanup.3 | |
432 | man/man3/curl_url_dup.3 | 433 | man/man3/curl_url_dup.3 | |
433 | man/man3/curl_url_get.3 | 434 | man/man3/curl_url_get.3 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.158 2019/11/06 09:17:29 leot Exp $ | 1 | $NetBSD: distinfo,v 1.159 2020/01/08 11:59:18 leot Exp $ | |
2 | 2 | |||
3 | SHA1 (curl-7.67.0.tar.xz) = 61ddc68157c2cd1e2c2461b3fbdc0b24083c2e68 | 3 | SHA1 (curl-7.68.0.tar.xz) = 9a7c6aca20065581315fd1327b938185297d05a4 | |
4 | RMD160 (curl-7.67.0.tar.xz) = f9db855e7f76abeac1eeeb9ebc37b2b116be77f2 | 4 | RMD160 (curl-7.68.0.tar.xz) = e6c7e2cfbabca69cd36be4025ab3fa0c209bd28e | |
5 | SHA512 (curl-7.67.0.tar.xz) = 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29 | 5 | SHA512 (curl-7.68.0.tar.xz) = bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c | |
6 | Size (curl-7.67.0.tar.xz) = 2418548 bytes | 6 | Size (curl-7.68.0.tar.xz) = 2442788 bytes | |
7 | SHA1 (patch-configure) = 584c39ee826686c570bcf560c18292570cc76ab1 | 7 | SHA1 (patch-configure) = daf5fd2ceca72cca80f992be1973ef70f63135e2 | |
8 | SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 | 8 | SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533 |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | $NetBSD: patch-configure,v 1.8 2019/11/06 09:17:29 leot Exp $ | 1 | $NetBSD: patch-configure,v 1.9 2020/01/08 11:59:18 leot Exp $ | |
2 | 2 | |||
3 | - Builtin krb5-config in platforms such as solaris do not support | 3 | - Builtin krb5-config in platforms such as solaris do not support | |
4 | the gssapi option, and need an explicit -lgss | 4 | the gssapi option, and need an explicit -lgss | |
5 | - On Darwin, do not append custom CFLAGS. | 5 | - On Darwin, do not append custom CFLAGS. | |
6 | - Do not strip debug flags. | 6 | - Do not strip debug flags. | |
7 | - Support Minix. | 7 | - Support Minix. | |
8 | - Avoid unportable `==' test(1) operator. | |||
9 | 8 | |||
10 | --- configure.orig 2019-11-06 06:38:18.000000000 +0000 | 9 | --- configure.orig 2019-11-06 06:38:18.000000000 +0000 | |
11 | +++ configure | 10 | +++ configure | |
12 | @@ -3806,6 +3806,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar | 11 | @@ -3806,6 +3806,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar | |
13 | ;; | 12 | ;; | |
14 | esac | 13 | esac | |
15 | done | 14 | done | |
16 | + xc_bad_var_cflags=no | 15 | + xc_bad_var_cflags=no | |
17 | if test $xc_bad_var_cflags = yes; then | 16 | if test $xc_bad_var_cflags = yes; then | |
18 | { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 | 17 | { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 | |
19 | $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} | 18 | $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} | |
20 | @@ -7939,7 +7940,7 @@ else | 19 | @@ -7939,7 +7940,7 @@ else | |
21 | lt_cv_sys_max_cmd_len=8192; | 20 | lt_cv_sys_max_cmd_len=8192; | |
@@ -147,31 +146,13 @@ $NetBSD: patch-configure,v 1.8 2019/11/0 | @@ -147,31 +146,13 @@ $NetBSD: patch-configure,v 1.8 2019/11/0 | |||
147 | + fi | 146 | + fi | |
148 | elif test "$GSSAPI_ROOT" != "yes"; then | 147 | elif test "$GSSAPI_ROOT" != "yes"; then | |
149 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | 148 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | |
150 | fi | 149 | fi | |
151 | @@ -22161,7 +22164,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | 150 | @@ -22161,7 +22164,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | |
152 | LIBS="-lgss $LIBS" | 151 | LIBS="-lgss $LIBS" | |
153 | ;; | 152 | ;; | |
154 | *) | 153 | *) | |
155 | - LIBS="-lgssapi $LIBS" | 154 | - LIBS="-lgssapi $LIBS" | |
156 | + LIBS="-lgssapi -lkrb5 $LIBS" | 155 | + LIBS="-lgssapi -lkrb5 $LIBS" | |
157 | ;; | 156 | ;; | |
158 | esac | 157 | esac | |
159 | fi | 158 | fi | |
160 | @@ -42524,7 +42527,7 @@ $as_echo_n "checking whether ESNI suppor | |||
161 | ESNI_ENABLED=0 | |||
162 | ESNI_SUPPORT='' | |||
163 | ||||
164 | - if test "x$OPENSSL_ENABLED" == "x1"; then | |||
165 | + if test "x$OPENSSL_ENABLED" = "x1"; then | |||
166 | for ac_func in SSL_get_esni_status | |||
167 | do : | |||
168 | ac_fn_c_check_func "$LINENO" "SSL_get_esni_status" "ac_cv_func_SSL_get_esni_status" | |||
169 | @@ -42540,7 +42543,7 @@ done | |||
170 | ||||
171 | fi | |||
172 | ||||
173 | - if test "x$ESNI_ENABLED" == "x1"; then | |||
174 | + if test "x$ESNI_ENABLED" = "x1"; then | |||
175 | ||||
176 | $as_echo "#define USE_ESNI 1" >>confdefs.h | |||
177 |