svn commit: r460547 - branches/2018Q1/ftp/curl

[Bryan Drewery]

Author: bdrewery
Date: Wed Jan 31 23:32:52 2018
New Revision: 460547
URL: https://svnweb.freebsd.org/changeset/ports/460547

Log:
  MFH: r459855 r460136 r460317
  
  Update to 7.58.0
  
  - Add BROTLI and LIBSSH options
  
  Changes:	https://curl.haxx.se/changes.html
  
  Remove LIBSSH option to avoid circular dependency
  
  libssh uses cmake which depends on curl.
  
  Fix BROTLI option
  
  Approved by:	portmgr (implicit)
  Security:	CVE-2018-1000007

Modified:
  branches/2018Q1/ftp/curl/Makefile
  branches/2018Q1/ftp/curl/distinfo
  branches/2018Q1/ftp/curl/pkg-plist
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/ftp/curl/Makefile
==============================================================================
--- branches/2018Q1/ftp/curl/Makefile	Wed Jan 31 22:12:27 2018	(r460546)
+++ branches/2018Q1/ftp/curl/Makefile	Wed Jan 31 23:32:52 2018	(r460547)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.57.0
+PORTVERSION=	7.58.0
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -13,7 +13,7 @@ COMMENT=	Command line tool and library for transferrin
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	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 HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 METALINK PROXY PSL RTMP SMB TLS_SRP
 OPTIONS_RADIO=	SSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
 OPTIONS_RADIO_SSL=	GNUTLS NSS OPENSSL POLARSSL WOLFSSL
@@ -35,7 +35,7 @@ TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) suppor
 CONFIGURE_ARGS=	--disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
 		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
-		--without-axtls --without-brotli
+		--without-axtls
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
 		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
@@ -59,6 +59,8 @@ DOCS=		BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUT
 
 SHEBANG_FILES=	*/*.pl
 
+BROTLI_CONFIGURE_WITH=	brotli=${LOCALBASE}
+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_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

Modified: branches/2018Q1/ftp/curl/distinfo
==============================================================================
--- branches/2018Q1/ftp/curl/distinfo	Wed Jan 31 22:12:27 2018	(r460546)
+++ branches/2018Q1/ftp/curl/distinfo	Wed Jan 31 23:32:52 2018	(r460547)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512157622
-SHA256 (curl-7.57.0.tar.xz) = f5f6fd3c72b7b8389969f4fb671ed8532fa9b5bb7a5cae7ca89bc1cea45c7878
-SIZE (curl-7.57.0.tar.xz) = 2283688
+TIMESTAMP = 1516795055
+SHA256 (curl-7.58.0.tar.xz) = 6a813875243609eb75f37fa72044e4ad618b55ec15a4eafdac2df6a7e800e3e3
+SIZE (curl-7.58.0.tar.xz) = 2303760

Modified: branches/2018Q1/ftp/curl/pkg-plist
==============================================================================
--- branches/2018Q1/ftp/curl/pkg-plist	Wed Jan 31 22:12:27 2018	(r460546)
+++ branches/2018Q1/ftp/curl/pkg-plist	Wed Jan 31 23:32:52 2018	(r460547)
@@ -399,6 +399,7 @@ man/man3/curl_unescape.3.gz
 man/man3/curl_version.3.gz
 man/man3/curl_version_info.3.gz
 man/man3/libcurl-easy.3.gz
+man/man3/libcurl-env.3.gz
 man/man3/libcurl-errors.3.gz
 man/man3/libcurl-multi.3.gz
 man/man3/libcurl-share.3.gz