Date: Wed, 24 Jul 2024 21:46:45 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 75132f54b51c - 2024Q3 - ftp/curl: Update to 8.9.0 Message-ID: <202407242146.46OLkjOJ017818@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=75132f54b51cf71e6b375cfcc1c9a04e2eca1a84 commit 75132f54b51cf71e6b375cfcc1c9a04e2eca1a84 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-07-24 21:15:49 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-07-24 21:46:37 +0000 ftp/curl: Update to 8.9.0 Changes: https://curl.se/changes.html Security: CVE-2024-6197, CVE-2024-6874 (cherry picked from commit bc2e60ff225180dfb0627576cf7a05637c40b93e) --- ftp/curl/Makefile | 2 +- ftp/curl/distinfo | 6 ++--- ftp/curl/files/patch-src-tool_operate.c | 44 --------------------------------- ftp/curl/pkg-plist | 2 ++ 4 files changed, 6 insertions(+), 48 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 6574328dc10a..807da8977728 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -1,5 +1,5 @@ PORTNAME= curl -PORTVERSION= 8.8.0 +PORTVERSION= 8.9.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 9f3bd2d46c62..7d6e58acb6fd 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716448648 -SHA256 (curl-8.8.0.tar.xz) = 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 -SIZE (curl-8.8.0.tar.xz) = 2748860 +TIMESTAMP = 1721822998 +SHA256 (curl-8.9.0.tar.xz) = ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 +SIZE (curl-8.9.0.tar.xz) = 2781828 diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c deleted file mode 100644 index 9913e35386ac..000000000000 --- a/ftp/curl/files/patch-src-tool_operate.c +++ /dev/null @@ -1,44 +0,0 @@ ---- src/tool_operate.c.orig 2023-03-20 11:38:42 UTC -+++ src/tool_operate.c -@@ -1106,20 +1106,7 @@ static CURLcode single_transfer(struct GlobalConfig *g - DEBUGASSERT(!outs->filename); - } - -- if(config->resume_from_current) { -- /* We're told to continue from where we are now. Get the size -- of the file as it is now and open it for append instead */ -- struct_stat fileinfo; -- /* VMS -- Danger, the filesize is only valid for stream files */ -- if(0 == stat(per->outfile, &fileinfo)) -- /* set offset to current file size: */ -- config->resume_from = fileinfo.st_size; -- else -- /* let offset be 0 */ -- config->resume_from = 0; -- } -- -- if(config->resume_from) { -+ if(config->resume_from || config->resume_from_current) { - #ifdef __VMS - /* open file for output, forcing VMS output format into stream - mode which is needed for stat() call above to always work. */ -@@ -1136,6 +1123,19 @@ static CURLcode single_transfer(struct GlobalConfig *g - } - outs->fopened = TRUE; - outs->stream = file; -+ -+ if(config->resume_from_current) { -+ /* We're told to continue from where we are now. Get the size -+ of the file as it is now */ -+ struct_stat fileinfo; -+ if(0 == fstat(fileno(outs->stream), &fileinfo)) -+ /* set offset to current file size: */ -+ config->resume_from = fileinfo.st_size; -+ else -+ /* let offset be 0 */ -+ config->resume_from = 0; -+ } -+ - outs->init = config->resume_from; - } - else { diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 0ea19b0a674d..07ca76731753 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -217,6 +217,7 @@ share/aclocal/libcurl.m4 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket-cb.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlstream.c +share/man/man1/curl-config.1.gz share/man/man1/curl.1.gz share/man/man3/CURLINFO_ACTIVESOCKET.3.gz share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz @@ -576,6 +577,7 @@ share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz share/man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3.gz share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz +share/man/man3/CURLOPT_TCP_KEEPCNT.3.gz share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz share/man/man3/CURLOPT_TCP_NODELAY.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407242146.46OLkjOJ017818>