svn commit: r384723 - head/ftp/curl

[Antoine Brodin]

On Sat, Apr 25, 2015 at 11:46 AM, Sunpoet Po-Chuan Hsieh
<sunpoet at freebsd.org> wrote:
> Author: sunpoet
> Date: Sat Apr 25 09:46:50 2015
> New Revision: 384723
> URL: https://svnweb.freebsd.org/changeset/ports/384723
>
> Log:
>   - Fix OPTIONS_DEFAULT: remove SSL
>   - Add WOLFSSL option
>   - Cosmetic change

Hi,

Is it intended that wolfssl is now default?  PORTREVISION bump?

Cheers,

Antoine

>
> Modified:
>   head/ftp/curl/Makefile
>
> Modified: head/ftp/curl/Makefile
> ==============================================================================
> --- head/ftp/curl/Makefile      Sat Apr 25 09:37:20 2015        (r384722)
> +++ head/ftp/curl/Makefile      Sat Apr 25 09:46:50 2015        (r384723)
> @@ -16,20 +16,21 @@ OPTIONS_DEFINE=     CA_BUNDLE COOKIES CURL_D
>  OPTIONS_RADIO= RESOLV SSL
>  OPTIONS_SINGLE=        GSSAPI
>  OPTIONS_RADIO_RESOLV=  CARES THREADED_RESOLVER
> -OPTIONS_RADIO_SSL=     GNUTLS NSS OPENSSL POLARSSL
> +OPTIONS_RADIO_SSL=     GNUTLS NSS OPENSSL POLARSSL WOLFSSL
>  OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> -OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI_BASE IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
> -CA_BUNDLE_DESC=        Install CA bundle for OpenSSL
> -COOKIES_DESC=  Cookies support
> -CURL_DEBUG_DESC=cURL debug memory tracking
> +#OPTIONS_DEFAULT=      CA_BUNDLE COOKIES GSSAPI_BASE IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
> +OPTIONS_DEFAULT=       COOKIES GSSAPI_BASE IPV6 PROXY RESOLV THREADED_RESOLVER WOLFSSL
> +CA_BUNDLE_DESC=                Install CA bundle for OpenSSL
> +COOKIES_DESC=          Cookies support
> +CURL_DEBUG_DESC=       cURL debug memory tracking
>  GSSAPI_BASE_DESC=      GSSAPI support via base system
>  GSSAPI_HEIMDAL_DESC=   GSSAPI support via security/heimdal
>  GSSAPI_MIT_DESC=       GSSAPI support via security/krb5
>  GSSAPI_NONE_DESC=      Disable GSSAPI support
> -LIBSSH2_DESC=  SCP/SFTP support via libssh2
> -RESOLV_DESC=   DNS resolving options
> +LIBSSH2_DESC=          SCP/SFTP support via libssh2
> +RESOLV_DESC=           DNS resolving options
>  THREADED_RESOLVER_DESC=        Threaded DNS resolver
> -TLS_SRP_DESC=  TLS-SRP (Secure Remote Password) support
> +TLS_SRP_DESC=          TLS-SRP (Secure Remote Password) support
>
>  CONFIGURE_ARGS+=--disable-werror \
>                 --enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
> @@ -136,6 +137,9 @@ THREADED_RESOLVER_CONFIGURE_OFF=--disabl
>  THREADED_RESOLVER_CONFIGURE_ON=        --enable-threaded-resolver
>  TLS_SRP_CONFIGURE_OFF= --disable-tls-srp
>  TLS_SRP_CONFIGURE_ON=  --enable-tls-srp
> +WOLFSSL_CONFIGURE_OFF= --without-cyassl
> +WOLFSSL_CONFIGURE_ON=  --with-cyassl=${LOCALBASE}
> +WOLFSSL_LIB_DEPENDS=   libwolfssl.so:${PORTSDIR}/security/wolfssl
>
>  .include <bsd.port.options.mk>
>
> @@ -151,7 +155,7 @@ IGNORE=             only supports TLS-SRP with eith
>  IGNORE=                only supports LDAPS with LDAP
>  .endif
>
> -.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL}
> +.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OTIONS:MWOLFSSL}
>  IGNORE=                only supports LDAPS with SSL
>  .endif
>
>