Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Apr 2026 17:24:12 +0000
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f485c4b627cc - main - ftp/curl: Readd GSSAPI_BASE option
Message-ID:  <69d29abc.1e986.9da95f1@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by sunpoet:

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

commit f485c4b627ccb16d24e639e71d02dda05f18274c
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2026-04-05 16:53:03 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2026-04-05 17:18:09 +0000

    ftp/curl: Readd GSSAPI_BASE option
---
 ftp/curl/Makefile | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index de6274ee5f43..f4e554cf01ef 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	curl
 PORTVERSION=	8.19.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.se/download/ \
 		https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
@@ -55,14 +55,14 @@ 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_MIT GSSAPI_NONE # GSSAPI_BASE
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
-#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_DEFAULT=ALTSVC BROTLI COOKIES GSSAPI_NONE DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS MQTT NTLM POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER WEBSOCKET ZSTD ${OPTIONS_DEFAULT_${OSREL:R}}
-OPTIONS_DEFAULT_13=	WOLFSSL
-OPTIONS_DEFAULT_14=	LIBSSH2 OPENSSL TLS_SRP
-OPTIONS_DEFAULT_15=	LIBSSH2 OPENSSL TLS_SRP
-OPTIONS_DEFAULT_16=	LIBSSH2 OPENSSL TLS_SRP
+#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=ALTSVC BROTLI COOKIES DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS MQTT NTLM POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER WEBSOCKET ZSTD ${OPTIONS_DEFAULT_${OSREL:R}}
+OPTIONS_DEFAULT_13=	GSSAPI_NONE WOLFSSL
+OPTIONS_DEFAULT_14=	GSSAPI_NONE LIBSSH2 OPENSSL TLS_SRP
+OPTIONS_DEFAULT_15=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} LIBSSH2 OPENSSL TLS_SRP
+OPTIONS_DEFAULT_16=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} LIBSSH2 OPENSSL TLS_SRP
 OPTIONS_SUB=	yes
 ALTSVC_DESC=	HTTP Alternative Services support
 COMPRESSION_DESC=	Compression methods
@@ -106,11 +106,11 @@ GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libnettle.so:security/nettle
 GOPHER_CONFIGURE_ENABLE=gopher
-#GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
-#GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
-#GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
-#GSSAPI_BASE_LIBS=	${GSSAPILIBS}
-#GSSAPI_BASE_USES=	gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
+GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
+GSSAPI_BASE_LIBS=	${GSSAPILIBS}
+GSSAPI_BASE_USES=	gssapi
 GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_CPPFLAGS=	${GSSAPICPPFLAGS}
 GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
@@ -161,6 +161,10 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 1500050 && ${PORT_OPTIONS:MGSSAPI_BASE}
+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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d29abc.1e986.9da95f1>