From nobody Sun Jan 08 16:03:06 2023 X-Original-To: dev-commits-ports-main@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 4Nqhgn5QFSz2pHcS; Sun, 8 Jan 2023 16:03:17 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nqhgm3C1wz45p9; Sun, 8 Jan 2023 16:03:16 +0000 (UTC) (envelope-from grembo@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 213.239.217.29 is neither permitted nor denied by domain of grembo@freebsd.org) smtp.mailfrom=grembo@freebsd.org; dmarc=none Received: by mail.evolve.de (OpenSMTPD) with ESMTP id f2b2170b; Sun, 8 Jan 2023 16:03:08 +0000 (UTC) Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id 11b3c5bd (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sun, 8 Jan 2023 16:03:07 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: c63a8f65afe1 - main - ftp/curl: Update to 7.87.0 From: Michael Gmelin In-Reply-To: <202212300908.2BU98Vj0000052@gitrepo.freebsd.org> Date: Sun, 8 Jan 2023 17:03:06 +0100 Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Message-Id: <60D06459-5155-4644-A42A-8DF1D3205856@freebsd.org> References: <202212300908.2BU98Vj0000052@gitrepo.freebsd.org> To: Po-Chuan Hsieh X-Mailer: iPhone Mail (20B110) X-Spamd-Result: default: False [-2.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.976]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; ARC_NA(0.00)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_TLS_LAST(0.00)[]; FREEFALL_USER(0.00)[grembo]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[freebsd.org]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Nqhgm3C1wz45p9 X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N The removal of ca_root_nss by default breaks: - CI - ansible playbooks - howtos - image builds - finger memory While all these things should use ca_root_nss directly, the fact that it was= a dependency of curl for such a long time means fallout. If this is intended, it would be good to do some **big** shout out. Thanks Michael > On 30. Dec 2022, at 10:08, Po-Chuan Hsieh wrote: >=20 > =EF=BB=BFThe branch main has been updated by sunpoet: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dc63a8f65afe14e82338fac73a= 1a5b21648d49388 >=20 > commit c63a8f65afe14e82338fac73a1a5b21648d49388 > Author: Po-Chuan Hsieh > AuthorDate: 2022-12-30 08:40:01 +0000 > Commit: Po-Chuan Hsieh > CommitDate: 2022-12-30 09:04:09 +0000 >=20 > ftp/curl: Update to 7.87.0 >=20 > - Update WWW > - Disable CA_BUNDLE option by default >=20 > ca_root_nss is not needed since we have caroot in the base system. >=20 > Changes: https://curl.se/changes.html > Security: CVE-2022-43551, CVE-2022-43552 > --- > ftp/curl/Makefile | 244 ++++++++++++++++++++++++++-----------------------= ---- > ftp/curl/distinfo | 6 +- > ftp/curl/pkg-descr | 2 - > ftp/curl/pkg-plist | 5 +- > 4 files changed, 125 insertions(+), 132 deletions(-) >=20 > diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile > index c85c5e566ecb..b5711bd624f9 100644 > --- a/ftp/curl/Makefile > +++ b/ftp/curl/Makefile > @@ -1,165 +1,157 @@ > PORTNAME=3D curl > -DISTVERSION=3D 7.86.0 > +PORTVERSION=3D 7.87.0 > CATEGORIES=3D ftp net www > MASTER_SITES=3D https://curl.se/download/ \ > https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S= |.|_|g}/ >=20 > MAINTAINER=3D sunpoet@FreeBSD.org > COMMENT=3D Command line tool and library for transferring data with URL= s > -WWW=3D https://curl.se/ > +WWW=3D https://curl.se/ \ > + https://github.com/curl/curl >=20 > LICENSE=3D MIT > LICENSE_FILE=3D ${WRKSRC}/COPYING >=20 > USES=3D cpe libtool localbase pathfix perl5 shebangfix tar:xz > -CPE_VENDOR=3D haxx > -USE_LDCONFIG=3D yes > USE_PERL5=3D build >=20 > -SHEBANG_FILES=3D */*.pl > - > -GNU_CONFIGURE=3D yes > CONFIGURE_ARGS=3D --disable-werror \ > + --enable-headers-api \ > --with-fish-functions-dir=3D${LOCALBASE}/share/fish/completions \ > --with-zsh-functions-dir=3D${LOCALBASE}/share/zsh/site-functions > -CONFIGURE_ENV=3D ac_cv_func_SSLv2_client_method=3Dno \ > - LOCALBASE=3D${LOCALBASE} > - > +CONFIGURE_ENV=3D LOCALBASE=3D${LOCALBASE} \ > + ac_cv_func_SSLv2_client_method=3Dno > +GNU_CONFIGURE=3D yes > INSTALL_TARGET=3D install-strip > TEST_TARGET=3D test > +USE_LDCONFIG=3D yes > + > +CPE_VENDOR=3D haxx > + > +SHEBANG_FILES=3D */*.pl >=20 > -OPTIONS_DEFINE=3D ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG= DOCS \ > - EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD > -OPTIONS_DEFAULT=3D ALTSVC CA_BUNDLE COOKIES DICT FTP GOPHER \ > - GSSAPI_${${SSL_DEFAULT} =3D=3D base :?BASE :NONE} HTTP \ > - HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PSL RTSP \ > - SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP > -OPTIONS_GROUP=3D PROTOCOL > -OPTIONS_GROUP_PROTOCOL=3D DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS L= IBSSH2 MQTT \ > - POP3 RTMP RTSP SMB SMTP TELNET TFTP > -OPTIONS_RADIO=3D SSL > +OPTIONS_DEFINE=3D ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOC= S EXAMPLES IDN IPV6 NTLM PROXY PSL STATIC TLS_SRP ZSTD > +OPTIONS_GROUP=3D PROTOCOL > +OPTIONS_RADIO=3D SSL > +OPTIONS_SINGLE=3D GSSAPI RESOLV > +OPTIONS_GROUP_PROTOCOL=3D DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS L= IBSSH2 MQTT POP3 RTMP RTSP SMB SMTP TELNET TFTP > OPTIONS_RADIO_SSL=3D GNUTLS OPENSSL WOLFSSL > -OPTIONS_SINGLE=3D GSSAPI RESOLV > OPTIONS_SINGLE_GSSAPI=3D GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_N= ONE > OPTIONS_SINGLE_RESOLV=3D CARES THREADED_RESOLVER > -OPTIONS_SUB=3D yes > - > -ALTSVC_DESC=3D HTTP Alternative Services support > -CA_BUNDLE_DESC=3D Enable CA bundle for OpenSSL/GnuTLS > -COOKIES_DESC=3D Cookies support > -CURL_DEBUG_DESC=3D cURL debug memory tracking > -DICT_DESC=3D DICT (RFC 2229) support > -HTTP2_DESC=3D HTTP/2 support (requires HTTP) > -HTTP_DESC=3D HTTP/HTTPS support > -IMAP_DESC=3D IMAP/IMAPS support > -LIBSSH2_DESC=3D SCP/SFTP support via libssh2 (requires OPENSSL) > -MQTT_DESC=3D MQTT support > -POP3_DESC=3D POP3/POP3S support > -RESOLV_DESC=3D DNS resolving options > -SMB_DESC=3D SMB/CIFS support > -SMTP_DESC=3D SMTP/SMTPS support > +OPTIONS_DEFAULT=3DALTSVC COOKIES GSSAPI_${${SSL_DEFAULT} =3D=3D base :?BA= SE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP LIBSSH2 NTLM OPENSSL POP3 PROXY PS= L RTSP SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP > +OPTIONS_SUB=3D yes > +ALTSVC_DESC=3D HTTP Alternative Services support > +CA_BUNDLE_DESC=3D Enable CA bundle for OpenSSL/GnuTLS > +COOKIES_DESC=3D Cookies support > +CURL_DEBUG_DESC=3DcURL debug memory tracking > +DICT_DESC=3D DICT (RFC 2229) support > +HTTP_DESC=3D HTTP/HTTPS support > +HTTP2_DESC=3D HTTP/2 support (requires HTTP) > +HTTP2_IMPLIES=3D HTTP > +IMAP_DESC=3D IMAP/IMAPS support > +LDAPS_IMPLIES=3D LDAP > +LIBSSH2_DESC=3D SCP/SFTP support via libssh2 (requires OPENSSL) > +LIBSSH2_IMPLIES=3DOPENSSL > +MQTT_DESC=3D MQTT support > +POP3_DESC=3D POP3/POP3S support > +PROXY_IMPLIES=3D HTTP > +RESOLV_DESC=3D DNS resolving options > +RTSP_IMPLIES=3D HTTP > +SMB_DESC=3D SMB/CIFS support > +SMTP_DESC=3D SMTP/SMTPS support > THREADED_RESOLVER_DESC=3D Threaded DNS resolver > -TLS_SRP_DESC=3D TLS-SRP (Secure Remote Password) support > - > -ALTSVC_CONFIGURE_ENABLE=3D alt-svc > -BROTLI_LIB_DEPENDS=3D libbrotlidec.so:archivers/brotli > -BROTLI_CONFIGURE_WITH=3D brotli > -CARES_LIB_DEPENDS=3D libcares.so:dns/c-ares > -CARES_USES=3D pkgconfig > -CARES_CONFIGURE_ENABLE=3D ares > -CA_BUNDLE_RUN_DEPENDS=3D ${LOCALBASE}/share/certs/ca-root-nss.= crt:security/ca_root_nss > -CA_BUNDLE_CONFIGURE_WITH=3D ca-bundle=3D${LOCALBASE}/share/certs/c= a-root-nss.crt > -COOKIES_CONFIGURE_ENABLE=3D cookies > -CURL_DEBUG_CONFIGURE_ENABLE=3D curldebug > -DEBUG_CONFIGURE_ENABLE=3D debug > -DICT_CONFIGURE_ENABLE=3D dict > -FTP_CONFIGURE_ENABLE=3D ftp > -GNUTLS_LIB_DEPENDS=3D libgnutls.so:security/gnutls \ > - libnettle.so:security/nettle > -GNUTLS_CONFIGURE_WITH=3D gnutls > -GOPHER_CONFIGURE_ENABLE=3D gopher > -GSSAPI_BASE_USES=3D gssapi > -GSSAPI_BASE_CONFIGURE_ON=3D ${GSSAPI_CONFIGURE_ARGS} \ > - --with-gssapi=3D${GSSAPIBASEDIR} > -GSSAPI_BASE_CPPFLAGS=3D ${GSSAPICPPFLAGS} > -GSSAPI_BASE_LDFLAGS=3D ${GSSAPILDFLAGS} > -GSSAPI_BASE_LIBS=3D ${GSSAPILIBS} > -GSSAPI_HEIMDAL_USES=3D gssapi:heimdal > -GSSAPI_HEIMDAL_CONFIGURE_ON=3D ${GSSAPI_CONFIGURE_ARGS} \ > - --with-gssapi=3D${GSSAPIBASEDIR} > -GSSAPI_HEIMDAL_CPPFLAGS=3D ${GSSAPICPPFLAGS} > -GSSAPI_HEIMDAL_LDFLAGS=3D ${GSSAPILDFLAGS} > -GSSAPI_HEIMDAL_LIBS=3D ${GSSAPILIBS} > -GSSAPI_MIT_USES=3D gssapi:mit > -GSSAPI_MIT_CONFIGURE_ON=3D ${GSSAPI_CONFIGURE_ARGS} \ > - --with-gssapi=3D${GSSAPIBASEDIR} > -GSSAPI_MIT_CPPFLAGS=3D ${GSSAPICPPFLAGS} > -GSSAPI_MIT_LDFLAGS=3D ${GSSAPILDFLAGS} > -GSSAPI_MIT_LIBS=3D ${GSSAPILIBS} > -GSSAPI_NONE_CONFIGURE_ON=3D --without-gssapi > -HTTP2_LIB_DEPENDS=3D libnghttp2.so:www/libnghttp2 > -HTTP2_USES=3D pkgconfig > -HTTP2_CONFIGURE_WITH=3D nghttp2 > -HTTP_CONFIGURE_ENABLE=3D http > -IDN_LIB_DEPENDS=3D libidn2.so:dns/libidn2 > -IDN_CONFIGURE_WITH=3D libidn2 > -IMAP_CONFIGURE_ENABLE=3D imap > -IPV6_CONFIGURE_ENABLE=3D ipv6 > -LDAPS_IMPLIES=3D LDAP > -LDAPS_CONFIGURE_ENABLE=3D ldaps > -LDAP_USE=3D OPENLDAP=3Dyes > -LDAP_CONFIGURE_ENABLE=3D ldap > -LIBSSH2_IMPLIES=3D OPENSSL > -LIBSSH2_LIB_DEPENDS=3D libssh2.so:security/libssh2 > -LIBSSH2_CONFIGURE_WITH=3D libssh2 > -MQTT_CONFIGURE_ENABLE=3D mqtt > -NTLM_CONFIGURE_ENABLE=3D ntlm > -OPENSSL_USES=3D ssl > -OPENSSL_CONFIGURE_WITH=3D openssl=3D${OPENSSLBASE} > -OPENSSL_CPPFLAGS=3D -I${OPENSSLINC} > -OPENSSL_LDFLAGS=3D -L${OPENSSLLIB} > -POP3_CONFIGURE_ENABLE=3D pop3 > -PROXY_IMPLIES=3D HTTP > -PROXY_CONFIGURE_ENABLE=3D proxy > -PSL_LIB_DEPENDS=3D libpsl.so:dns/libpsl > -PSL_CONFIGURE_WITH=3D libpsl > -RTMP_LIB_DEPENDS=3D librtmp.so:multimedia/librtmp > -RTMP_USES=3D pkgconfig > -RTMP_CONFIGURE_WITH=3D librtmp > -RTSP_IMPLIES=3D HTTP > -RTSP_CONFIGURE_ENABLE=3D rtsp > -SMB_CONFIGURE_ENABLE=3D smb > -SMTP_CONFIGURE_ENABLE=3D smtp > -STATIC_CONFIGURE_ENABLE=3D static > -TELNET_CONFIGURE_ENABLE=3D telnet > -TFTP_CONFIGURE_ENABLE=3D tftp > +TLS_SRP_DESC=3D TLS-SRP (Secure Remote Password) support > + > +ALTSVC_CONFIGURE_ENABLE=3Dalt-svc > +BROTLI_CONFIGURE_WITH=3D brotli > +BROTLI_LIB_DEPENDS=3D libbrotlidec.so:archivers/brotli > +CA_BUNDLE_CONFIGURE_WITH=3D ca-bundle=3D${LOCALBASE}/share/certs/ca-ro= ot-nss.crt > +CA_BUNDLE_RUN_DEPENDS=3D ${LOCALBASE}/share/certs/ca-root-nss.crt:secu= rity/ca_root_nss > +CARES_CONFIGURE_ENABLE=3D ares > +CARES_LIB_DEPENDS=3D libcares.so:dns/c-ares > +CARES_USES=3D pkgconfig > +COOKIES_CONFIGURE_ENABLE=3D cookies > +CURL_DEBUG_CONFIGURE_ENABLE=3D curldebug > +DEBUG_CONFIGURE_ENABLE=3D debug > +DICT_CONFIGURE_ENABLE=3D dict > +FTP_CONFIGURE_ENABLE=3D ftp > +GNUTLS_CONFIGURE_WITH=3D gnutls > +GNUTLS_LIB_DEPENDS=3D libgnutls.so:security/gnutls \ > + libnettle.so:security/nettle > +GOPHER_CONFIGURE_ENABLE=3Dgopher > +GSSAPI_BASE_CONFIGURE_ON=3D --with-gssapi=3D${GSSAPIBASEDIR} ${GSSAPI_= CONFIGURE_ARGS} > +GSSAPI_BASE_CPPFLAGS=3D ${GSSAPICPPFLAGS} > +GSSAPI_BASE_LDFLAGS=3D ${GSSAPILDFLAGS} > +GSSAPI_BASE_LIBS=3D ${GSSAPILIBS} > +GSSAPI_BASE_USES=3D gssapi > +GSSAPI_HEIMDAL_CONFIGURE_ON=3D --with-gssapi=3D${GSSAPIBASEDIR} ${GSSA= PI_CONFIGURE_ARGS} > +GSSAPI_HEIMDAL_CPPFLAGS=3D${GSSAPICPPFLAGS} > +GSSAPI_HEIMDAL_LDFLAGS=3D ${GSSAPILDFLAGS} > +GSSAPI_HEIMDAL_LIBS=3D ${GSSAPILIBS} > +GSSAPI_HEIMDAL_USES=3D gssapi:heimdal > +GSSAPI_MIT_CONFIGURE_ON=3D--with-gssapi=3D${GSSAPIBASEDIR} ${GSSAPI_CONFI= GURE_ARGS} > +GSSAPI_MIT_CPPFLAGS=3D ${GSSAPICPPFLAGS} > +GSSAPI_MIT_LDFLAGS=3D ${GSSAPILDFLAGS} > +GSSAPI_MIT_LIBS=3D ${GSSAPILIBS} > +GSSAPI_MIT_USES=3D gssapi:mit > +GSSAPI_NONE_CONFIGURE_ON=3D --without-gssapi > +HTTP_CONFIGURE_ENABLE=3D http > +HTTP2_CONFIGURE_WITH=3D nghttp2 > +HTTP2_LIB_DEPENDS=3D libnghttp2.so:www/libnghttp2 > +HTTP2_USES=3D pkgconfig > +IDN_CONFIGURE_WITH=3D libidn2 > +IDN_LIB_DEPENDS=3D libidn2.so:dns/libidn2 > +IMAP_CONFIGURE_ENABLE=3D imap > +IPV6_CONFIGURE_ENABLE=3D ipv6 > +LDAP_CONFIGURE_ENABLE=3D ldap > +LDAP_USE=3D OPENLDAP=3Dyes > +LDAPS_CONFIGURE_ENABLE=3D ldaps > +LIBSSH2_CONFIGURE_WITH=3D libssh2 > +LIBSSH2_LIB_DEPENDS=3D libssh2.so:security/libssh2 > +MQTT_CONFIGURE_ENABLE=3D mqtt > +NTLM_CONFIGURE_ENABLE=3D ntlm > +OPENSSL_CONFIGURE_WITH=3D ssl=3D${OPENSSLBASE} > +OPENSSL_CPPFLAGS=3D -I${OPENSSLINC} > +OPENSSL_LDFLAGS=3D -L${OPENSSLLIB} > +OPENSSL_USES=3D ssl > +POP3_CONFIGURE_ENABLE=3D pop3 > +PROXY_CONFIGURE_ENABLE=3D proxy > +PSL_CONFIGURE_WITH=3D libpsl > +PSL_LIB_DEPENDS=3D libpsl.so:dns/libpsl > +RTMP_CONFIGURE_WITH=3D librtmp > +RTMP_LIB_DEPENDS=3D librtmp.so:multimedia/librtmp > +RTMP_USES=3D pkgconfig > +RTSP_CONFIGURE_ENABLE=3D rtsp > +SMB_CONFIGURE_ENABLE=3D smb > +SMTP_CONFIGURE_ENABLE=3D smtp > +STATIC_CONFIGURE_ENABLE=3Dstatic > +TELNET_CONFIGURE_ENABLE=3Dtelnet > +TFTP_CONFIGURE_ENABLE=3D tftp > THREADED_RESOLVER_CONFIGURE_ENABLE=3D pthreads threaded-resolver > -TLS_SRP_CONFIGURE_ENABLE=3D tls-srp > -WOLFSSL_LIB_DEPENDS=3D libwolfssl.so:security/wolfssl > -WOLFSSL_CONFIGURE_WITH=3D wolfssl > -ZSTD_LIB_DEPENDS=3D libzstd.so:archivers/zstd > -ZSTD_CONFIGURE_WITH=3D zstd > +TLS_SRP_CONFIGURE_ENABLE=3D tls-srp > +WOLFSSL_CONFIGURE_WITH=3D wolfssl > +WOLFSSL_LIB_DEPENDS=3D libwolfssl.so:security/wolfssl > +ZSTD_CONFIGURE_WITH=3D zstd > +ZSTD_LIB_DEPENDS=3D libzstd.so:archivers/zstd >=20 > .include >=20 > -.if !${PORT_OPTIONS:MCA_BUNDLE} && (${PORT_OPTIONS:MGNUTLS} || \ > - ${PORT_OPTIONS:MOPENSSL}) > -CONFIGURE_ARGS+=3D --with-ca-fallback > +.if !${PORT_OPTIONS:MCA_BUNDLE} && (${PORT_OPTIONS:MGNUTLS} || ${PORT_OPT= IONS:MOPENSSL}) > +CONFIGURE_ARGS+=3D--with-ca-fallback > .endif >=20 > -.if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || \ > - (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && \ > - ${PORT_OPTIONS:MTLS_SRP} > +.if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_O= PTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP} > IGNORE=3D only supports TLS-SRP with either OpenSSL or GnuTLS > .endif >=20 > -.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && \ > - !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} > +.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS= :MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} > IGNORE=3D only supports LDAPS with SSL > .endif >=20 > .if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/lib/libkrb5support= .so) > -BROKEN=3D the GSSAPI_BASE option is selected, but you have krb5 in= stalled. This is incompatible. In order to build, either select GSSAPI_MIT, o= r temporarily deinstall krb5 to build curl, or build in poudriere > +BROKEN=3D The GSSAPI_BASE option is selected, but you have krb5 in= stalled. \ > + This is incompatible. In order to build, either select GSSAPI_MIT= , \ > + or temporarily deinstall krb5 to build curl, or build in poudrier= e > .endif >=20 > post-patch: > @@ -177,6 +169,6 @@ post-install-DOCS-on: >=20 > post-install-EXAMPLES-on: > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ > - cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README.md Makefile.exa= mple makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ > + cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} Makefile.example Makef= ile.mk README.md *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ >=20 > .include > diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo > index 1bcbc8c3ac1a..61e8e2c357bb 100644 > --- a/ftp/curl/distinfo > +++ b/ftp/curl/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1668528014 > -SHA256 (curl-7.86.0.tar.xz) =3D 2d61116e5f485581f6d59865377df4463f2e78867= 7ac43222b496d4e49fb627b > -SIZE (curl-7.86.0.tar.xz) =3D 2518356 > +TIMESTAMP =3D 1671874820 > +SHA256 (curl-7.87.0.tar.xz) =3D ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c= 8cfb1ce47175cc3bee08fff > +SIZE (curl-7.87.0.tar.xz) =3D 2547932 > diff --git a/ftp/curl/pkg-descr b/ftp/curl/pkg-descr > index 963265f93945..8d0f3ac24be1 100644 > --- a/ftp/curl/pkg-descr > +++ b/ftp/curl/pkg-descr > @@ -9,5 +9,3 @@ TFTP. curl supports SSL certificates, HTTP POST, HTTP PUT,= FTP uploading, HTTP > form based upload, proxies, HTTP/2, cookies, user+password authentication > (Basic, Plain, Digest, CRAM-MD5, NTLM, Negotiate and Kerberos), file trans= fer > resume, proxy tunneling and more. > - > -See also: https://github.com/curl/curl > diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist > index b9670fae79fd..386b00cf12e4 100644 > --- a/ftp/curl/pkg-plist > +++ b/ftp/curl/pkg-plist > @@ -117,6 +117,7 @@ man/man3/CURLOPT_BUFFERSIZE.3.gz > man/man3/CURLOPT_CAINFO.3.gz > man/man3/CURLOPT_CAINFO_BLOB.3.gz > man/man3/CURLOPT_CAPATH.3.gz > +man/man3/CURLOPT_CA_CACHE_TIMEOUT.3.gz > man/man3/CURLOPT_CERTINFO.3.gz > man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3.gz > man/man3/CURLOPT_CHUNK_DATA.3.gz > @@ -510,10 +511,12 @@ share/aclocal/libcurl.m4 > %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md > %%PORTDOCS%%%%DOCSDIR%%/CODE_REVIEW.md > %%PORTDOCS%%%%DOCSDIR%%/CODE_STYLE.md > +%%PORTDOCS%%%%DOCSDIR%%/CONNECTION-FILTERS.md > %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE.md > %%PORTDOCS%%%%DOCSDIR%%/CURL-DISABLE.md > %%PORTDOCS%%%%DOCSDIR%%/DEPRECATE.md > %%PORTDOCS%%%%DOCSDIR%%/DYNBUF.md > +%%PORTDOCS%%%%DOCSDIR%%/EARLY-RELEASE.md > %%PORTDOCS%%%%DOCSDIR%%/EXPERIMENTAL.md > %%PORTDOCS%%%%DOCSDIR%%/FAQ > %%PORTDOCS%%%%DOCSDIR%%/FEATURES.md > @@ -554,6 +557,7 @@ share/aclocal/libcurl.m4 > %%PORTDOCS%%%%DOCSDIR%%/options-in-versions > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.mk > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/altsvc.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c > @@ -612,7 +616,6 @@ share/aclocal/libcurl.m4 > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap-ssl.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap-store.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap-tls.c > -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c