git: 4b24fb9d2758 - 2026Q3 - ftp/curl: Update to 8.22.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Michael Osipov <michaelo_at_FreeBSD.org>
Date: Sun, 13 Sep 2026 15:05:16 UTC
The branch 2026Q3 has been updated by michaelo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b24fb9d275865923d01ba4940147f5aa79fdebd

commit 4b24fb9d275865923d01ba4940147f5aa79fdebd
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2026-09-09 14:37:56 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2026-09-13 15:04:35 +0000

    ftp/curl: Update to 8.22.0
    
    - Remove TLS_SRP option
    
    Changes:        https://curl.se/changes.html
    Security:       CVE-2026-13608, CVE-2026-18924, CVE-2026-19931, CVE-2026-80229, CVE-2026-80230, CVE-2026-80231, CVE-2026-80255, CVE-2026-82208, CVE-2026-82209
    
    (cherry picked from commit 83a2de6dcfaf4075aab01ae67a883604a16ff828)
---
 ftp/curl/Makefile  | 16 ++++++----------
 ftp/curl/distinfo  |  6 +++---
 ftp/curl/pkg-plist |  6 +++++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index e4d3fbcc7622..b3165bce3baa 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	curl
-PORTVERSION=	8.21.0
+PORTVERSION=	8.22.0
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.se/download/ \
 		https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
@@ -15,8 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		cpe libtool localbase:ldflags perl5 shebangfix tar:xz
 USE_PERL5=	build
 
-CONFIGURE_ARGS=	--disable-unity \
+CONFIGURE_ARGS=	--disable-httpsig \
+		--disable-unity \
 		--disable-werror \
+		--enable-aws \
 		--enable-dateparse \
 		--enable-dnsshuffle \
 		--enable-headers-api \
@@ -44,7 +46,7 @@ CPE_VENDOR=	haxx
 
 SHEBANG_FILES=	*/*.pl
 
-OPTIONS_DEFINE=	ALTSVC COOKIES DEBUG DOCS EXAMPLES IDN IPV6 LIBUV NTLM PROXY PSL STATIC TLS_SRP
+OPTIONS_DEFINE=	ALTSVC COOKIES DEBUG DOCS EXAMPLES IDN IPV6 LIBUV NTLM PROXY PSL STATIC
 OPTIONS_GROUP=	COMPRESSION PROTOCOL
 OPTIONS_GROUP_COMPRESSION=	BROTLI ZSTD
 OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP IPFS LDAP LDAPS LIBSSH LIBSSH2 MQTT POP3 RTSP SMB SMTP TELNET TFTP WEBSOCKET
@@ -53,7 +55,7 @@ OPTIONS_RADIO_SSL=	GNUTLS OPENSSL WOLFSSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
-OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MQTT NTLM OPENSSL POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP WEBSOCKET ZSTD ${OPTIONS_DEFAULT_${OSREL:R}}
+OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MQTT NTLM OPENSSL POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER WEBSOCKET ZSTD ${OPTIONS_DEFAULT_${OSREL:R}}
 OPTIONS_DEFAULT_14=	GSSAPI_NONE
 OPTIONS_DEFAULT_15=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
 OPTIONS_DEFAULT_16=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE}
@@ -84,7 +86,6 @@ RTSP_IMPLIES=	HTTP
 SMB_DESC=	SMB/CIFS support
 SMTP_DESC=	SMTP/SMTPS support
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
-TLS_SRP_DESC=	TLS-SRP (Secure Remote Password) support
 
 ALTSVC_CONFIGURE_ENABLE=alt-svc
 BROTLI_CONFIGURE_WITH=	brotli
@@ -146,7 +147,6 @@ STATIC_CONFIGURE_ENABLE=static
 TELNET_CONFIGURE_ENABLE=telnet
 TFTP_CONFIGURE_ENABLE=	tftp
 THREADED_RESOLVER_CONFIGURE_ENABLE=	threaded-resolver
-TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WEBSOCKET_CONFIGURE_ENABLE=	websockets
 WOLFSSL_CONFIGURE_WITH=	wolfssl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
@@ -159,10 +159,6 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 IGNORE=		FreeBSD only provides MIT implementation of Kerberos in the base system since 15.0
 .endif
 
-.if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP}
-IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
-.endif
-
 .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL}
 IGNORE=		only supports LDAPS with GNUTLS/OPENSSL/WOLFSSL enabled
 .endif
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 21decfa86d25..cb1591d703fc 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1782510024
-SHA256 (curl-8.21.0.tar.xz) = aa1b66a70eace83dc624508745646c08ae561de512ab403adffb93ac87fc72e6
-SIZE (curl-8.21.0.tar.xz) = 2882336
+TIMESTAMP = 1788499928
+SHA256 (curl-8.22.0.tar.xz) = f7ef3ae8a22e521f289803fe93543eb64c329b58aa73a9e224dfd915a2a5f4f7
+SIZE (curl-8.22.0.tar.xz) = 2953092
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 2f18294006f7..b7558b58a5b1 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -30,6 +30,7 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md
 %%PORTDOCS%%%%DOCSDIR%%/CURL-DISABLE.md
 %%PORTDOCS%%%%DOCSDIR%%/CURLDOWN.md
+%%PORTDOCS%%%%DOCSDIR%%/DEPENDENCIES.md
 %%PORTDOCS%%%%DOCSDIR%%/DEPRECATE.md
 %%PORTDOCS%%%%DOCSDIR%%/DISTROS.md
 %%PORTDOCS%%%%DOCSDIR%%/EARLY-RELEASE.md
@@ -47,7 +48,6 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/INFRASTRUCTURE.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL-CMAKE.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS.md
 %%PORTDOCS%%%%DOCSDIR%%/IPFS.md
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS.md
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_RISKS.md
@@ -443,6 +443,10 @@ share/man/man3/CURLOPT_HTTPGET.3.gz
 share/man/man3/CURLOPT_HTTPHEADER.3.gz
 share/man/man3/CURLOPT_HTTPPOST.3.gz
 share/man/man3/CURLOPT_HTTPPROXYTUNNEL.3.gz
+share/man/man3/CURLOPT_HTTPSIG_ALGORITHM.3.gz
+share/man/man3/CURLOPT_HTTPSIG_HEADERS.3.gz
+share/man/man3/CURLOPT_HTTPSIG_KEY.3.gz
+share/man/man3/CURLOPT_HTTPSIG_KEYID.3.gz
 share/man/man3/CURLOPT_HTTP_CONTENT_DECODING.3.gz
 share/man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3.gz
 share/man/man3/CURLOPT_HTTP_VERSION.3.gz