MFH: r389953

- Update to 7.43.0
- Update HTTP2 option
- Update DOCS

Changes:	http://curl.haxx.se/changes.html

Security:	CVE-2015-3236
Security:	CVE-2015-3237
Approved by:	ports-secteam@

3 files changed, 29 insertions, 23 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 7f95e8ab5233..eee4fb9589fa 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.42.1
+PORTVERSION=	7.43.0
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -16,25 +16,26 @@ OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6
 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
-GSSAPI_BASE_DESC=	GSSAPI support via base system
+OPTIONS_DEFAULT=	CA_BUNDLE COOKIES GSSAPI_BASE IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
+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 (Kerberos required)
 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 \
 		--without-axtls
-CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE} \
+		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_PERL5=	build
@@ -50,12 +51,11 @@ PORTEXAMPLES=	*
 CPE_VENDOR=	haxx
 
 DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
-		HTTP-COOKIES INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS \
-		LIBCURL-STRUCTS LICENSE-MIXING MAIL-ETIQUETTE MANUAL \
-		README.netware README.win32 RELEASE-PROCEDURE RESOURCES \
-		SECURITY SSL-PROBLEMS SSLCERTS THANKS TODO \
-		TheArtOfHttpScripting VERSIONS curl-config.html \
-		curl-config.pdf curl.html curl.pdf index.html \
+		HTTP-COOKIES HTTP2.md INSTALL INSTALL.devcpp INTERNALS \
+		KNOWN_BUGS LICENSE-MIXING MAIL-ETIQUETTE MANUAL \
+		RELEASE-PROCEDURE RESOURCES ROADMAP.md SECURITY SSL-PROBLEMS \
+		SSLCERTS THANKS TODO TheArtOfHttpScripting VERSIONS \
+		curl-config.html curl-config.pdf curl.html curl.pdf index.html \
 		mk-ca-bundle.html mk-ca-bundle.pdf
 .endif
 
@@ -92,11 +92,11 @@ GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
 GSSAPI_MIT_LIBS=	${GSSAPILIBS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
-HTTP2_BUILD_DEPENDS=	nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2
+HTTP2_BUILD_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
 HTTP2_CONFIGURE_OFF=	--without-nghttp2
 HTTP2_CONFIGURE_ON=	--with-nghttp2=${LOCALBASE}
 HTTP2_LIB_DEPENDS=	libnghttp2.so:${PORTSDIR}/www/nghttp2
-HTTP2_RUN_DEPENDS=	nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2
+HTTP2_RUN_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
 HTTP2_USES=		pkgconfig
 IDN_CONFIGURE_OFF=	--without-libidn
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
@@ -125,7 +125,7 @@ OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USE=		OPENSSL=yes
 POLARSSL_CONFIGURE_OFF=	--without-polarssl
 POLARSSL_CONFIGURE_ON=	--with-polarssl=${LOCALBASE}
-POLARSSL_LIB_DEPENDS=	libpolarssl.so:${PORTSDIR}/security/polarssl
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
 PROXY_CONFIGURE_OFF=	--disable-proxy
 PROXY_CONFIGURE_ON=	--enable-proxy
 RTMP_CONFIGURE_OFF=	--without-librtmp
@@ -135,6 +135,9 @@ THREADED_RESOLVER_CONFIGURE_OFF=--disable-threaded-resolver
 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>
 
@@ -150,7 +153,7 @@ IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 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_OPTIONS:MWOLFSSL}
 IGNORE=		only supports LDAPS with SSL
 .endif
 
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 31b977f25cb9..ef8692482514 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (curl-7.42.1.tar.lzma) = 3d6c196ab5083ab2ea3691819602e7b9698404ce8480d4008e3ba64822cc2c47
-SIZE (curl-7.42.1.tar.lzma) = 2732330
+SHA256 (curl-7.43.0.tar.lzma) = e2b8d84d9c7d85f81cc8477ea3ec757e4c9908eca116be8764b7d158aa7677fa
+SIZE (curl-7.43.0.tar.lzma) = 2765536
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 9166ab7bf5fb..d658f851a084 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -143,6 +143,7 @@ man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz
 man/man3/CURLOPT_PASSWORD.3.gz
 man/man3/CURLOPT_PATH_AS_IS.3.gz
 man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz
+man/man3/CURLOPT_PIPEWAIT.3.gz
 man/man3/CURLOPT_PORT.3.gz
 man/man3/CURLOPT_POST.3.gz
 man/man3/CURLOPT_POSTFIELDS.3.gz
@@ -163,6 +164,7 @@ man/man3/CURLOPT_PROXYPORT.3.gz
 man/man3/CURLOPT_PROXYTYPE.3.gz
 man/man3/CURLOPT_PROXYUSERNAME.3.gz
 man/man3/CURLOPT_PROXYUSERPWD.3.gz
+man/man3/CURLOPT_PROXY_SERVICE_NAME.3.gz
 man/man3/CURLOPT_PROXY_TRANSFER_MODE.3.gz
 man/man3/CURLOPT_PUT.3.gz
 man/man3/CURLOPT_QUOTE.3.gz
@@ -184,6 +186,7 @@ man/man3/CURLOPT_RTSP_TRANSPORT.3.gz
 man/man3/CURLOPT_SASL_IR.3.gz
 man/man3/CURLOPT_SEEKDATA.3.gz
 man/man3/CURLOPT_SEEKFUNCTION.3.gz
+man/man3/CURLOPT_SERVICE_NAME.3.gz
 man/man3/CURLOPT_SHARE.3.gz
 man/man3/CURLOPT_SOCKOPTDATA.3.gz
 man/man3/CURLOPT_SOCKOPTFUNCTION.3.gz