From nobody Wed Jul 24 21:46:45 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WTnfF3qJsz5R2wZ; Wed, 24 Jul 2024 21:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WTnfF3KKlz4n7q; Wed, 24 Jul 2024 21:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721857605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bqqj/b5yJBIj041SFRZO5Zr7v8TMCppKw5FZCa1dUFQ=; b=gabz5Mo9mbpYcg9/FLfM+cN9ztX2kCD1FxgEZMIwzZvoX0BpEOiylQ64EtWwbDziV0D0uF D7b243mg0t72PUpyj4crkjnFraItAd0H7QXy1uOhc8dnmRQHn5aZVkufMFPnDTJF1MFKzR zSOb0oWGKHrpGNItc5AW5Lkh5ByaNHeAwaL76VbONm+2bAGk3p6Q1jPqB/OjeYhelyvluZ 1h22xz8Hvola/EsFs2fSS1Hvw8NFHSMwCNMRbkmO3m2B1c+/3EUXJ6t8450ca5uXQXHKZe 0/e626UPFZ+Ctl4UEeDCQw6rRv6fAKr535X+iQ6KyZp/OdzyAX8Dk4128V9o2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721857605; a=rsa-sha256; cv=none; b=DRpfhL3GYR5hStM+Ib2uM+Sf9Q66ZI1v/OG0g0aUVGaAa/zcyRTTRvGp3LN1Kr0avb8mUy n3tt8/PWeGj2RCtsKYxYL202QizCfhfB0/IV/Bo8D3v8yGftgxBLKzmL8HSzue+qnlCGQD oZkooG/HDvnbngFpTi5na7sbOd3DclUl5WEgfjaPN4TdFsBUvi/YfQc1Qnfsg8Lr4KEITS PY8CrMeVglr5i4yYPpF/89hd5PNANPlZCg0ZKwJdMeOMn9FWU2Y3z9dAoAM8YHWsobAtc1 8RKdyeY7w8JO4B3L2ypY4reIcxT0vWMbhoTFAdc9m6z6uSc/ZXxX570JJ8Ilzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721857605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bqqj/b5yJBIj041SFRZO5Zr7v8TMCppKw5FZCa1dUFQ=; b=q9/krSXt6aI5ucWn1NzxL3cKi9sLXah2CX6zvZ1VQ86V01jCHQfyqbpRja9T93XsPsC4bO GOv0GSa07/iiWlwk/B5Vl2b2dSEcahuwAFj2SM4Co02uCCNDOpfXtsQH0ruslYNOJWbomQ rhaKQ8ZRxvsZ98iD/Z3LFvugfYiflzgu52Ei8ME7ZsMTJP4/HygIgTGrZKhLvrT5/g9D2C nb3cmpwbXD44/x5W2gdR0TdQi4u1951V4lQr4YAAkXYwoEcKnJdVf42hjJ7ghxA94CdGlM 3YXa+SY0530bHvgHwtleaApsYSNXWM9imVe39AXnnNH634FePTWw7+J0qKKymg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WTnfF2nvkzSql; Wed, 24 Jul 2024 21:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46OLkjwU017821; Wed, 24 Jul 2024 21:46:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46OLkjOJ017818; Wed, 24 Jul 2024 21:46:45 GMT (envelope-from git) Date: Wed, 24 Jul 2024 21:46:45 GMT Message-Id: <202407242146.46OLkjOJ017818@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 75132f54b51c - 2024Q3 - ftp/curl: Update to 8.9.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 75132f54b51cf71e6b375cfcc1c9a04e2eca1a84 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=75132f54b51cf71e6b375cfcc1c9a04e2eca1a84 commit 75132f54b51cf71e6b375cfcc1c9a04e2eca1a84 Author: Po-Chuan Hsieh AuthorDate: 2024-07-24 21:15:49 +0000 Commit: Po-Chuan Hsieh 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