From owner-svn-ports-all@freebsd.org Sun Nov 1 20:10:07 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 68ECC458977; Sun, 1 Nov 2020 20:10:07 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CPRwv286Wz4XVx; Sun, 1 Nov 2020 20:10:07 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C70F1DE97; Sun, 1 Nov 2020 20:10:07 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A1KA7Es058025; Sun, 1 Nov 2020 20:10:07 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A1KA7iU058024; Sun, 1 Nov 2020 20:10:07 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202011012010.0A1KA7iU058024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 1 Nov 2020 20:10:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553854 - head/ftp/curl X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/ftp/curl X-SVN-Commit-Revision: 553854 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2020 20:10:07 -0000 Author: mandree Date: Sun Nov 1 20:10:06 2020 New Revision: 553854 URL: https://svnweb.freebsd.org/changeset/ports/553854 Log: ftp/curl: avoid auto-enabling ZSTD, make explicit option; ensure GSSAPI compilation. Since August 2020, curl would auto-enable ZSTD if available while configuring, this would however not propagate to the LIB_DEPENDS. Make sure to explicitly control ZSTD by introducing an option that defaults to off. While here, also mark BROKEN if GSSAPI_BASE is selected while krb5 is installed when building. PR: 250414 Approved by: sunpoet@ (maintainer timeout, 14d) Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Sun Nov 1 19:51:47 2020 (r553853) +++ head/ftp/curl/Makefile Sun Nov 1 20:10:06 2020 (r553854) @@ -32,7 +32,7 @@ DOCS= FAQ FEATURES INSTALL KNOWN_BUGS MAIL-ETIQUETTE SHEBANG_FILES= */*.pl -OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP +OPTIONS_DEFINE= ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP ZSTD OPTIONS_GROUP= PROTOCOL OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV @@ -136,6 +136,8 @@ THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded- TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= wolfssl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl +ZSTD_CONFIGURE_WITH= zstd +ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include @@ -149,6 +151,12 @@ IGNORE= only supports TLS-SRP with either OpenSSL or .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL +.endif + +.if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/lib/libkrb5support.so) +BROKEN= The GSSAPI_BASE option is selected, but you have krb5 installed. \ + This is incompatible. In order to build, either select GSSAPI_MIT, \ + or temporarily deinstall krb5 to build curl, or build in poudriere .endif post-patch: