Page MenuHomeFreeBSD
Files F131609354

D42039.id128092.diff
No OneTemporary
Actions

D42039.id128092.diff
View Options

Index: ftp/curl/Makefile
===================================================================
--- ftp/curl/Makefile
+++ ftp/curl/Makefile
@@ -1,5 +1,6 @@
PORTNAME= curl
PORTVERSION= 8.3.0
+PORTREVISION= 1
CATEGORIES= ftp net www
MASTER_SITES= https://curl.se/download/ \
https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
@@ -25,6 +26,8 @@
--enable-netrc \
--enable-openssl-auto-load-config \
--enable-progress-meter \
+ --without-ca-bundle \
+ --with-ca-fallback \
--with-fish-functions-dir=${LOCALBASE}/share/fish/completions \
--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions
CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \
@@ -38,7 +41,7 @@
SHEBANG_FILES= */*.pl
-OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD
+OPTIONS_DEFINE= ALTSVC BROTLI COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD
OPTIONS_GROUP= PROTOCOL
OPTIONS_RADIO= SSL
OPTIONS_SINGLE= GSSAPI RESOLV
@@ -46,10 +49,9 @@
OPTIONS_RADIO_SSL= GNUTLS OPENSSL WOLFSSL
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER
-OPTIONS_DEFAULT=ALTSVC CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP
+OPTIONS_DEFAULT=ALTSVC COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP
OPTIONS_SUB= yes
ALTSVC_DESC= HTTP Alternative Services support
-CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS
COOKIES_DESC= Cookies support
CURL_DEBUG_DESC=cURL debug memory tracking
DICT_DESC= DICT (RFC 2229) support
@@ -76,8 +78,6 @@
ALTSVC_CONFIGURE_ENABLE=alt-svc
BROTLI_CONFIGURE_WITH= brotli
BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli
-CA_BUNDLE_CONFIGURE_WITH= ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
CARES_CONFIGURE_ENABLE= ares
CARES_LIB_DEPENDS= libcares.so:dns/c-ares
CARES_USES= pkgconfig
@@ -150,10 +150,6 @@
.include <bsd.port.pre.mk>
-.if !${PORT_OPTIONS:MCA_BUNDLE} && (${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL})
-CONFIGURE_ARGS+=--with-ca-fallback
-.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

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 5:25 PM (20 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23540011
Default Alt Text
D42039.id128092.diff (2 KB)

Event Timeline