From owner-svn-ports-head@freebsd.org Tue Jan 30 15:39:01 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 107D6ED10CC; Tue, 30 Jan 2018 15:39:01 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AEC1F71BDE; Tue, 30 Jan 2018 15:39:00 +0000 (UTC) (envelope-from sunpoet@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 A9471191C5; Tue, 30 Jan 2018 15:39:00 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0UFd0XM039684; Tue, 30 Jan 2018 15:39:00 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0UFd0DR039683; Tue, 30 Jan 2018 15:39:00 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201801301539.w0UFd0DR039683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 30 Jan 2018 15:39:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460400 - head/ftp/curl X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/ftp/curl X-SVN-Commit-Revision: 460400 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jan 2018 15:39:01 -0000 Author: sunpoet Date: Tue Jan 30 15:39:00 2018 New Revision: 460400 URL: https://svnweb.freebsd.org/changeset/ports/460400 Log: Add more options - Add protocol group - Convert already-enabled protocols to IMAP, POP3, RTSP and SMTP options - Add DICT, FTP, GOPHER, HTTP, TELNET and TFP options - Update CA_BUNDLE_DESC - Use CA_BUNDLE_CONFIGURE_WITH and OPENSSL_CONFIGURE_WITH - Merge TLS_SRP check PR: 223967 (based on) Submitted by: brnrd Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Tue Jan 30 15:38:55 2018 (r460399) +++ head/ftp/curl/Makefile Tue Jan 30 15:39:00 2018 (r460400) @@ -13,27 +13,34 @@ COMMENT= Command line tool and library for transferrin LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP +OPTIONS_DEFINE= BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK PROXY PSL TLS_SRP +OPTIONS_GROUP= PROTOCOL OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV +OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER -OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP -CA_BUNDLE_DESC= Install CA bundle for OpenSSL -CA_BUNDLE_IMPLIES= OPENSSL +OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP THREADED_RESOLVER TLS_SRP +CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking +DICT_DESC= DICT (RFC 2229) support +HTTP_DESC= HTTP/HTTPS support +HTTP2_DESC= HTTP/2 support (requires HTTP) +HTTP2_IMPLIES= HTTP +IMAP_DESC= IMAP/IMAPS support LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL +POP3_DESC= POP3/POP3S support RESOLV_DESC= DNS resolving options SMB_DESC= SMB/CIFS support +SMTP_DESC= SMTP/SMTPS support THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support CONFIGURE_ARGS= --disable-werror \ - --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-axtls CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ @@ -59,18 +66,20 @@ DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUT SHEBANG_FILES= */*.pl -BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE} +BROTLI_CONFIGURE_WITH= brotli BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli -CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle -CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt +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 COOKIES_CONFIGURE_ENABLE= cookies CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug +DICT_CONFIGURE_ENABLE= dict +FTP_CONFIGURE_ENABLE= ftp GNUTLS_CONFIGURE_WITH= gnutls 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_LDFLAGS= ${GSSAPILDFLAGS} @@ -87,11 +96,13 @@ GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_MIT_LIBS= ${GSSAPILIBS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +HTTP_CONFIGURE_ENABLE= http HTTP2_CONFIGURE_WITH= nghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 HTTP2_USES= pkgconfig IDN_CONFIGURE_WITH= libidn2 IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 +IMAP_CONFIGURE_ENABLE= imap IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap @@ -105,20 +116,24 @@ METALINK_LIBS= -lcrypto NSS_CONFIGURE_WITH= nss NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_USES= pkgconfig -OPENSSL_CONFIGURE_OFF= --without-ssl -OPENSSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE} +OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USES= ssl POLARSSL_CONFIGURE_WITH=polarssl POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 +POP3_CONFIGURE_ENABLE= pop3 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_USES= pkgconfig +RTSP_ENABLE= rtsp SMB_CONFIGURE_ENABLE= smb +SMTP_CONFIGURE_ENABLE= smtp +TELNET_CONFIGURE_ENABLE=telnet +TFTP_CONFIGURE_ENABLE= tftp THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= cyassl @@ -126,16 +141,12 @@ WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl .include -.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP} +.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 .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL -.endif - -.if ${PORT_OPTIONS:MTLS_SRP} && ${SSL_DEFAULT:Mlibressl*} -IGNORE= unsupported TLS-SRP in LibreSSL .endif post-patch: