Re: git: 77a0a54b7f3d - main - ftp/curl: Update to 8.17.0
Date: Mon, 10 Nov 2025 15:45:33 UTC
Am 09.11.25 um 17:34 schrieb Po-Chuan Hsieh:
> The branch main has been updated by sunpoet:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=77a0a54b7f3df8548487920090550ac880e8e26c
>
> commit 77a0a54b7f3df8548487920090550ac880e8e26c
> Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2025-11-09 16:09:31 +0000
> Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2025-11-09 16:30:48 +0000
>
> ftp/curl: Update to 8.17.0
>
> - Remove GSSAPI_HEIMDAL option
> - Change OPTIONS_DEFAULT from conditional GSSAPI_BASE to GSSAPI_NONE
>
> Changes: https://curl.se/changes.html
> Security: CVE-2025-10966
> ---
> ftp/curl/Makefile | 12 +++---------
> ftp/curl/distinfo | 6 +++---
> ftp/curl/files/extra-patch-gssapi | 11 -----------
> ftp/curl/pkg-plist | 5 +++++
> 4 files changed, 11 insertions(+), 23 deletions(-)
>
> diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
> index 933e647ee542..56d41aec3918 100644
> --- a/ftp/curl/Makefile
> +++ b/ftp/curl/Makefile
> @@ -1,5 +1,5 @@
> PORTNAME= curl
> -PORTVERSION= 8.16.0
> +PORTVERSION= 8.17.0
> CATEGORIES= ftp net www
> MASTER_SITES= https://curl.se/download/ \
> https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
> @@ -50,9 +50,9 @@ OPTIONS_SINGLE= GSSAPI RESOLV
> 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
> OPTIONS_RADIO_SSL= GNUTLS OPENSSL WOLFSSL
> -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_MIT GSSAPI_NONE
> OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER
> -OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} 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=ALTSVC BROTLI COOKIES GSSAPI_NONE 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_SUB= yes
> ALTSVC_DESC= HTTP Alternative Services support
> COOKIES_DESC= Cookies support
> @@ -98,15 +98,9 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \
> GOPHER_CONFIGURE_ENABLE=gopher
> GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS}
> -GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gssapi
> GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS}
> GSSAPI_BASE_LIBS= ${GSSAPILIBS}
> GSSAPI_BASE_USES= gssapi
> -GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> -GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS}
> -GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS}
> -GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS}
> -GSSAPI_HEIMDAL_USES= gssapi:heimdal
> GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS}
> GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS}
> diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
> index 884a8c9ae04d..6d63f4c39edc 100644
> --- a/ftp/curl/distinfo
> +++ b/ftp/curl/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1757436421
> -SHA256 (curl-8.16.0.tar.xz) = 40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d
> -SIZE (curl-8.16.0.tar.xz) = 2788632
> +TIMESTAMP = 1762586706
> +SHA256 (curl-8.17.0.tar.xz) = 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992
> +SIZE (curl-8.17.0.tar.xz) = 2797000
> diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi
> deleted file mode 100644
> index d2b90d46c80f..000000000000
> --- a/ftp/curl/files/extra-patch-gssapi
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- configure.orig 2024-12-11 07:08:12 UTC
> -+++ configure
> -@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; }
> - if test -n "$gnu_gss"; then
> - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
> - elif test "x$not_mit" = "x1"; then
> -- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
> -+ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE"
> - else
> - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
> - fi
> diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
> index f80136f063c8..09a9b8eb4c98 100644
> --- a/ftp/curl/pkg-plist
> +++ b/ftp/curl/pkg-plist
> @@ -171,6 +171,7 @@ share/aclocal/libcurl.m4
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipv6.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keepalive.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localport.c
> +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log_failed_transfers.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/maxconnects.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
> @@ -327,6 +328,8 @@ share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz
> share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz
> share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz
> share/man/man3/CURLMOPT_NETWORK_CHANGED.3.gz
> +share/man/man3/CURLMOPT_NOTIFYDATA.3.gz
> +share/man/man3/CURLMOPT_NOTIFYFUNCTION.3.gz
> share/man/man3/CURLMOPT_PIPELINING.3.gz
> share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz
> share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz
> @@ -704,6 +707,8 @@ share/man/man3/curl_multi_get_handles.3.gz
> share/man/man3/curl_multi_get_offt.3.gz
> share/man/man3/curl_multi_info_read.3.gz
> share/man/man3/curl_multi_init.3.gz
> +share/man/man3/curl_multi_notify_disable.3.gz
> +share/man/man3/curl_multi_notify_enable.3.gz
> share/man/man3/curl_multi_perform.3.gz
> share/man/man3/curl_multi_poll.3.gz
> share/man/man3/curl_multi_remove_handle.3.gz
>
>
checking for gss.h... no
checking for gssapi/gssapi.h... yes
checking for gssapi/gssapi_generic.h... no
checking for gssapi/gssapi_krb5.h... yes
configure: error: MIT or GNU GSS library required, but not found
===> Script "configure" failed unexpectedly.
Please report the problem to sunpoet@FreeBSD.org [maintainer] and attach the
"/wrkdirs/usr/ports/ftp/curl/work/curl-8.17.0/config.log" including the
output
of the failure of your make command. Also, it might be a good idea to
provide
an overview of all packages installed on your system (e.g. a
/usr/local/sbin/pkg-static info -g -Ea).
*** Error code 1
Stop.
make: stopped in /usr/ports/ftp/curl
=>> Cleaning up wrkdir
===> Cleaning for curl-8.17.0
build of ftp/curl | curl-8.17.0 ended at 2025-11-10T16:42:34+01:00
build time: 00:00:07
!!! build failure encountered !!!
Was the port tested before you released it?