Update to 7.40.0. Disable gssapi by default on NetBSD, since it doesn't compile any longer, see https://sourceforge.net/p/curl/bugs/1469/ Changes: Curl and libcurl 7.40.0 Public curl releases: 143 Command line options: 162 curl_easy_setopt() options: 208 Public functions in libcurl: 58 Contributors: 1219 This release includes the following changes: o http_digest: Added support for Windows SSPI based authentication o version info: Added Kerberos V5 to the supported features o Makefile: Added VC targets for WinIDN o config-win32: Introduce build targets for VS2012+ o SSL: Add PEM format support for public key pinning o smtp: Added support for the conversion of Unix newlines during mail send [8] o smb: Added initial support for the SMB/CIFS protocol o Added support for HTTP over unix domain sockets, via CURLOPT_UNIX_SOCKET_PATH and --unix-socket o sasl: Added support for GSS-API based Kerberos V5 authentication This release includes the following bugfixes: o darwinssl: fix session ID keys to only reuse identical sessions [18] o url-parsing: reject CRLFs within URLs [19] o OS400: Adjust specific support to last release o THANKS: Remove duplicate names o url.c: Fixed compilation warning o ssh: Fixed build on platforms where R_OK is not defined [1] o tool_strdup.c: include the tool strdup.h o build: Fixed Visual Studio project file generation of strdup.[c|h] o curl_easy_setopt.3: add CURLOPT_PINNEDPUBLICKEY [2] o curl.1: show zone index use in a URL o mk-ca-bundle.vbs: switch to new certdata.txt url o Makefile.dist: Added some missing SSPI configurations o build: Fixed no NTLM support for email when CURL_DISABLE_HTTP is defined o SSH: use the port number as well for known_known checks [3] o libssh2: detect features based on version, not configure checks o http2: Deal with HTTP/2 data inside Upgrade response header buffer [4] o multi: removed Curl_multi_set_easy_connection o symbol-scan.pl: do not require autotools o cmake: add ENABLE_THREADED_RESOLVER, rename ARES o cmake: build libhostname for test suite o cmake: fix HAVE_GETHOSTNAME definition o tests: fix libhostname visibility o tests: fix memleak in server/resolve.c o vtls.h: Fixed compiler warning when compiled without SSL o CMake: Restore order-dependent header checks o CMake: Restore order-dependent library checks o tool: Removed krb4 from the supported features o http2: Don't send Upgrade headers when we already do HTTP/2 o examples: Don't call select() to sleep on windows [6] o win32: Updated some legacy APIs to use the newer extended versions [5] o easy.c: Fixed compilation warning when no verbose string support o connect.c: Fixed compilation warning when no verbose string support o build: in Makefile.m32 pass -F flag to windres o build: in Makefile.m32 add -m32 flag for 32bit o multi: when leaving for timeout, close accordingly o CMake: Simplify if() conditions on check result variables o build: in Makefile.m32 try to detect 64bit target o multi: inform about closed sockets before they are closed o multi-uv.c: close the file handle after download o examples: Wait recommended 100ms when no file descriptors are ready o ntlm: Split the SSPI based messaging code from the native messaging code o cmake: fix NTLM detection when CURL_DISABLE_HTTP defined o cmake: add Kerberos to the supported feature o CURLOPT_POSTFIELDS.3: mention the COPYPOSTFIELDS option o http: Disable pipelining for HTTP/2 and upgraded connections o ntlm: Fixed static'ness of local decode function o sasl: Reduced the need for two sets of NTLM messaging functions o multi.c: Fixed compilation warnings when no verbose string support o select.c: fix compilation for VxWorks [7] o multi-single.c: switch to use curl_multi_wait o curl_multi_wait.3: clarify numfds being used if not NULL o http.c: Fixed compilation warnings from features being disabled o NSS: enable the CAPATH option [9] o docs: Fix FAILONERROR typos o HTTP: don't abort connections with pending Negotiate authentication o HTTP: Free (proxy)userpwd for NTLM/Negotiate after sending a request o http_perhapsrewind: don't abort CONNECT requests o build: updated dependencies in makefiles o multi.c: Fixed compilation warning o ftp.c: Fixed compilation warnings when proxy support disabled o get_url_file_name: Fixed crash on OOM on debug build o cookie.c: Refactored cleanup code to simplify o OS400: enable NTLM authentication o ntlm: Use Windows Crypt API o http2: avoid logging neg "failure" if h2 was not requested o schannel_recv: return the correct code [10] o VC build: added sspi define for winssl-zlib builds o Curl_client_write(): chop long data, convert data only once o openldap: do not ignore Curl_client_write() return code o ldap: check Curl_client_write() return codes o parsedate.c: Fixed compilation warning o url.c: Fixed compilation warning when USE_NTLM is not defined o ntlm_wb_response: fix "statement not reached" [11] o telnet: fix "cast increases required alignment of target type" o smtp: Fixed dot stuffing when EOL characters at end of input buffers [12] o ntlm: Allow NTLM2Session messages when USE_NTRESPONSES manually defined o ntlm: Disable NTLM v2 when 64-bit integers are not supported o ntlm: Use short integer when decoding 16-bit values o ftp.c: Fixed compilation warning when no verbose string support o synctime.c: fixed timeserver URLs o mk-ca-bundle.pl: restored forced run again o ntlm: Fixed return code for bad type-2 Target Info o curl_schannel.c: Data may be available before connection shutdown o curl_schannel: Improvements to memory re-allocation strategy [13] o darwinssl: aprintf() to allocate the session key o tool_util.c: Use GetTickCount64 if it is available o lib: Fixed multiple code analysis warnings if SAL are available o tool_binmode.c: Explicitly ignore the return code of setmode o tool_urlglob.c: Silence warning C6293: Ill-defined for-loop o opts: Warn CURLOPT_TIMEOUT overrides when set after CURLOPT_TIMEOUT_MS o SFTP: work-around servers that return zero size on STAT [14] o connect: singleipconnect(): properly try other address families after failure o IPV6: address scope != scope id [15] o parseurlandfillconn(): fix improper non-numeric scope_id stripping [16] o secureserver.pl: make OpenSSL CApath and cert absolute path values o secureserver.pl: update Windows detection and fix path conversion o secureserver.pl: clean up formatting of config and fix verbose output o tests: Added Windows support using Cygwin-based OpenSSH o sockfilt.c: use non-Ex functions that are available before WinXP o VMS: Updates for 0740-0D1220 o openssl: warn for SRP set if SSLv3 is used, not for TLS version o openssl: make it compile against openssl 1.1.0-DEV master branch o openssl: fix SSL/TLS versions in verbose output o curl: show size of inhibited data when using -v o build: Removed WIN32 definition from the Visual Studio projects o build: Removed WIN64 definition from the libcurl Visual Studio projects o vtls: Use bool for Curl_ssl_getsessionid() return type o sockfilt.c: Replace 100ms sleep with thread throttle o sockfilt.c: Reduce the number of individual memory allocations o vtls: Don't set cert info count until memory allocation is successful o nss: Don't ignore Curl_ssl_init_certinfo() OOM failure o nss: Don't ignore Curl_extract_certinfo() OOM failure o vtls: Fixed compilation warning and an ignored return code o sockfilt.c: Fixed compilation warnings o darwinssl: Fixed compilation warning o vtls: Use '(void) arg' for unused parameters o sepheaders.c: Fixed resource leak on failure o lib1900.c: Fixed cppcheck error [17] o ldap: Fixed Unicode connection details in Win32 initialsation / bind calls o ldap: Fixed Unicode DN, attributes and filter in Win32 search callsdiff -r1.143 -r1.144 pkgsrc/www/curl/Makefile
(wiz)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.143 2014/11/07 14:10:16 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.144 2015/01/08 17:23:07 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= curl-7.39.0 | 3 | DISTNAME= curl-7.40.0 | |
4 | CATEGORIES= www | 4 | CATEGORIES= www | |
5 | MASTER_SITES= http://curl.haxx.se/download/ \ | 5 | MASTER_SITES= http://curl.haxx.se/download/ \ | |
6 | ftp://ftp.sunet.se/pub/www/utilities/curl/ | 6 | ftp://ftp.sunet.se/pub/www/utilities/curl/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://curl.haxx.se/ | 10 | HOMEPAGE= http://curl.haxx.se/ | |
11 | COMMENT= Client that groks URLs | 11 | COMMENT= Client that groks URLs | |
12 | # not completely, but near enough | 12 | # not completely, but near enough | |
13 | LICENSE= mit | 13 | LICENSE= mit | |
14 | 14 | |||
15 | # list it into IPv6-ready packages | 15 | # list it into IPv6-ready packages | |
16 | BUILD_DEFS+= IPV6_READY | 16 | BUILD_DEFS+= IPV6_READY |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.45 2014/11/07 14:10:16 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.46 2015/01/08 17:23:07 wiz 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/curlbuild.h | 5 | include/curl/curlbuild.h | |
6 | include/curl/curlrules.h | 6 | include/curl/curlrules.h | |
7 | include/curl/curlver.h | 7 | include/curl/curlver.h | |
8 | include/curl/easy.h | 8 | include/curl/easy.h | |
9 | include/curl/mprintf.h | 9 | include/curl/mprintf.h | |
10 | include/curl/multi.h | 10 | include/curl/multi.h | |
11 | include/curl/stdcheaders.h | 11 | include/curl/stdcheaders.h | |
12 | include/curl/typecheck-gcc.h | 12 | include/curl/typecheck-gcc.h | |
13 | lib/libcurl.la | 13 | lib/libcurl.la | |
14 | lib/pkgconfig/libcurl.pc | 14 | lib/pkgconfig/libcurl.pc | |
@@ -213,26 +213,27 @@ man/man3/CURLOPT_TCP_KEEPIDLE.3 | @@ -213,26 +213,27 @@ man/man3/CURLOPT_TCP_KEEPIDLE.3 | |||
213 | man/man3/CURLOPT_TCP_KEEPINTVL.3 | 213 | man/man3/CURLOPT_TCP_KEEPINTVL.3 | |
214 | man/man3/CURLOPT_TCP_NODELAY.3 | 214 | man/man3/CURLOPT_TCP_NODELAY.3 | |
215 | man/man3/CURLOPT_TELNETOPTIONS.3 | 215 | man/man3/CURLOPT_TELNETOPTIONS.3 | |
216 | man/man3/CURLOPT_TFTP_BLKSIZE.3 | 216 | man/man3/CURLOPT_TFTP_BLKSIZE.3 | |
217 | man/man3/CURLOPT_TIMECONDITION.3 | 217 | man/man3/CURLOPT_TIMECONDITION.3 | |
218 | man/man3/CURLOPT_TIMEOUT.3 | 218 | man/man3/CURLOPT_TIMEOUT.3 | |
219 | man/man3/CURLOPT_TIMEOUT_MS.3 | 219 | man/man3/CURLOPT_TIMEOUT_MS.3 | |
220 | man/man3/CURLOPT_TIMEVALUE.3 | 220 | man/man3/CURLOPT_TIMEVALUE.3 | |
221 | man/man3/CURLOPT_TLSAUTH_PASSWORD.3 | 221 | man/man3/CURLOPT_TLSAUTH_PASSWORD.3 | |
222 | man/man3/CURLOPT_TLSAUTH_TYPE.3 | 222 | man/man3/CURLOPT_TLSAUTH_TYPE.3 | |
223 | man/man3/CURLOPT_TLSAUTH_USERNAME.3 | 223 | man/man3/CURLOPT_TLSAUTH_USERNAME.3 | |
224 | man/man3/CURLOPT_TRANSFERTEXT.3 | 224 | man/man3/CURLOPT_TRANSFERTEXT.3 | |
225 | man/man3/CURLOPT_TRANSFER_ENCODING.3 | 225 | man/man3/CURLOPT_TRANSFER_ENCODING.3 | |
226 | man/man3/CURLOPT_UNIX_SOCKET_PATH.3 | |||
226 | man/man3/CURLOPT_UNRESTRICTED_AUTH.3 | 227 | man/man3/CURLOPT_UNRESTRICTED_AUTH.3 | |
227 | man/man3/CURLOPT_UPLOAD.3 | 228 | man/man3/CURLOPT_UPLOAD.3 | |
228 | man/man3/CURLOPT_URL.3 | 229 | man/man3/CURLOPT_URL.3 | |
229 | man/man3/CURLOPT_USERAGENT.3 | 230 | man/man3/CURLOPT_USERAGENT.3 | |
230 | man/man3/CURLOPT_USERNAME.3 | 231 | man/man3/CURLOPT_USERNAME.3 | |
231 | man/man3/CURLOPT_USERPWD.3 | 232 | man/man3/CURLOPT_USERPWD.3 | |
232 | man/man3/CURLOPT_USE_SSL.3 | 233 | man/man3/CURLOPT_USE_SSL.3 | |
233 | man/man3/CURLOPT_VERBOSE.3 | 234 | man/man3/CURLOPT_VERBOSE.3 | |
234 | man/man3/CURLOPT_WILDCARDMATCH.3 | 235 | man/man3/CURLOPT_WILDCARDMATCH.3 | |
235 | man/man3/CURLOPT_WRITEDATA.3 | 236 | man/man3/CURLOPT_WRITEDATA.3 | |
236 | man/man3/CURLOPT_WRITEFUNCTION.3 | 237 | man/man3/CURLOPT_WRITEFUNCTION.3 | |
237 | man/man3/CURLOPT_XFERINFODATA.3 | 238 | man/man3/CURLOPT_XFERINFODATA.3 | |
238 | man/man3/CURLOPT_XFERINFOFUNCTION.3 | 239 | man/man3/CURLOPT_XFERINFOFUNCTION.3 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.99 2014/11/07 14:10:16 adam Exp $ | 1 | $NetBSD: distinfo,v 1.100 2015/01/08 17:23:07 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (curl-7.39.0.tar.bz2) = 80c6eadcc6ca526d1e1862c2234f33c7b7d10950 | 3 | SHA1 (curl-7.40.0.tar.bz2) = 1446603f4df89b6d1cafc4d6a8617c892651b3ff | |
4 | RMD160 (curl-7.39.0.tar.bz2) = 9a568334b9854e98fdf717099da85c0926ae8a9f | 4 | RMD160 (curl-7.40.0.tar.bz2) = 5ca0220dc5e866271e3757b21eee14477690e259 | |
5 | Size (curl-7.39.0.tar.bz2) = 3241619 bytes | 5 | Size (curl-7.40.0.tar.bz2) = 3266944 bytes | |
6 | SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e | 6 | SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e | |
7 | SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e | 7 | SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e | |
8 | SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 | 8 | SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 |
@@ -1,23 +1,29 @@ | @@ -1,23 +1,29 @@ | |||
1 | # $NetBSD: options.mk,v 1.10 2012/12/17 23:26:47 agc Exp $ | 1 | # $NetBSD: options.mk,v 1.11 2015/01/08 17:23:07 wiz Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.curl | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.curl | |
4 | PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn | 4 | PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn | |
5 | PKG_SUGGESTED_OPTIONS= inet6 libidn | 5 | PKG_SUGGESTED_OPTIONS= inet6 libidn | |
6 | 6 | |||
7 | .include "../../mk/bsd.prefs.mk" | 7 | .include "../../mk/bsd.prefs.mk" | |
8 | .if ${OPSYS} == NetBSD | 8 | .if ${OPSYS} == NetBSD | |
9 | # Kerberos is built in - no additional dependency | 9 | # Kerberos is built in - no additional dependency | |
10 | PKG_SUGGESTED_OPTIONS+= gssapi | 10 | # broken in 1.40.0 | |
11 | # https://sourceforge.net/p/curl/bugs/1469/ | |||
12 | #curl_sasl_gssapi.c:129:40: error: 'gss_nt_service_name' undeclared (first use in this function) | |||
13 | # gss_nt_service_name, &krb5->spn); | |||
14 | # ^ | |||
15 | #curl_sasl_gssapi.c:129:40: note: each undeclared identifier is reported only once for each function it appears in | |||
16 | #PKG_SUGGESTED_OPTIONS+= gssapi | |||
11 | .endif | 17 | .endif | |
12 | 18 | |||
13 | .include "../../mk/bsd.options.mk" | 19 | .include "../../mk/bsd.options.mk" | |
14 | 20 | |||
15 | .if !empty(PKG_OPTIONS:Minet6) | 21 | .if !empty(PKG_OPTIONS:Minet6) | |
16 | CONFIGURE_ARGS+= --enable-ipv6 | 22 | CONFIGURE_ARGS+= --enable-ipv6 | |
17 | .else | 23 | .else | |
18 | CONFIGURE_ARGS+= --disable-ipv6 | 24 | CONFIGURE_ARGS+= --disable-ipv6 | |
19 | .endif | 25 | .endif | |
20 | 26 | |||
21 | .if !empty(PKG_OPTIONS:Mlibssh2) | 27 | .if !empty(PKG_OPTIONS:Mlibssh2) | |
22 | CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2} | 28 | CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2} | |
23 | . include "../../security/libssh2/buildlink3.mk" | 29 | . include "../../security/libssh2/buildlink3.mk" |