svn commit: r407840 - in branches/2016Q1/ftp/curl: . files
Niclas Zeising
zeising at FreeBSD.org
Tue Feb 2 20:00:17 UTC 2016
Author: zeising
Date: Tue Feb 2 20:00:15 2016
New Revision: 407840
URL: https://svnweb.freebsd.org/changeset/ports/407840
Log:
MFH: r405919 r407725
- Simplify Makefile:
- Use USES=localbase unconditionally
- Use *_CONFIGURE_{ENABLE,WITH}
- Bump PORTREVISION for package change
Differential Revision: https://reviews.FreeBSD.org/D4757
PR: 205804
Exp-run by: antoine
Accepted by: bapt (portmgr)
Update to 7.47.0
PR: 206756
Submitted by: zeising
Approved by: ports-secteam (miwi)
Security: CVE-2016-0755
Approved by: portmgr (erwin)
Apprived by: ports-secteam (feld)
Added:
branches/2016Q1/ftp/curl/files/patch-docs_examples_getredirect.c
- copied unchanged from r407725, head/ftp/curl/files/patch-docs_examples_getredirect.c
Modified:
branches/2016Q1/ftp/curl/Makefile
branches/2016Q1/ftp/curl/distinfo
Directory Properties:
branches/2016Q1/ (props changed)
Modified: branches/2016Q1/ftp/curl/Makefile
==============================================================================
--- branches/2016Q1/ftp/curl/Makefile Tue Feb 2 19:44:40 2016 (r407839)
+++ branches/2016Q1/ftp/curl/Makefile Tue Feb 2 20:00:15 2016 (r407840)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= curl
-PORTVERSION= 7.46.0
-PORTREVISION= 1
+PORTVERSION= 7.47.0
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
@@ -53,7 +52,7 @@ INSTALL_TARGET= install-strip
TEST_ENV= ${MAKE_ENV} LC_ALL=C
TEST_TARGET= test
USE_PERL5= build
-USES= gmake libtool pathfix perl5 tar:lzma
+USES= gmake libtool localbase pathfix perl5 tar:lzma
.if !defined(BUILDING_HIPHOP)
USE_LDCONFIG= yes
@@ -78,17 +77,12 @@ SLAVEDIRS= ftp/curl-hiphop
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:${PORTSDIR}/security/ca_root_nss
-CARES_CONFIGURE_OFF= --disable-ares
-CARES_CONFIGURE_ON= --enable-ares=${LOCALBASE}
+CARES_CONFIGURE_ENABLE= ares
CARES_LIB_DEPENDS= libcares.so:${PORTSDIR}/dns/c-ares
-COOKIES_CONFIGURE_OFF= --disable-cookies
-COOKIES_CONFIGURE_ON= --enable-cookies
-CURL_DEBUG_CONFIGURE_OFF= --disable-curldebug
-CURL_DEBUG_CONFIGURE_ON=--enable-curldebug
-DEBUG_CONFIGURE_OFF= --disable-debug
-DEBUG_CONFIGURE_ON= --enable-debug
-GNUTLS_CONFIGURE_OFF= --without-gnutls
-GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE}
+COOKIES_CONFIGURE_ENABLE= cookies
+CURL_DEBUG_CONFIGURE_ENABLE= curldebug
+DEBUG_CONFIGURE_ENABLE= debug
+GNUTLS_CONFIGURE_WITH= gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS}
@@ -100,35 +94,27 @@ GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS
GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS}
GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS}
GSSAPI_HEIMDAL_USES= gssapi:heimdal
-GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS}
GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS}
GSSAPI_MIT_LIBS= ${GSSAPILIBS}
GSSAPI_MIT_USES= gssapi:mit
GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
HTTP2_BUILD_DEPENDS= nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
-HTTP2_CONFIGURE_OFF= --without-nghttp2
-HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
+HTTP2_CONFIGURE_WITH= nghttp2
HTTP2_LIB_DEPENDS= libnghttp2.so:${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}
+IDN_CONFIGURE_WITH= libidn
IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
IPV6_CATEGORIES= ipv6
-IPV6_CONFIGURE_OFF= --disable-ipv6
-IPV6_CONFIGURE_ON= --enable-ipv6
-LDAP_CONFIGURE_OFF= --disable-ldap
-LDAP_CONFIGURE_ON= --enable-ldap
+IPV6_CONFIGURE_ENABLE= ipv6
+LDAP_CONFIGURE_ENABLE= ldap
LDAP_USE= OPENLDAP=yes
-LDAP_USES= localbase
-LDAPS_CONFIGURE_OFF= --disable-ldaps
-LDAPS_CONFIGURE_ON= --enable-ldaps
-LIBSSH2_CONFIGURE_OFF= --without-libssh2
-LIBSSH2_CONFIGURE_ON= --with-libssh2=${LOCALBASE}
+LDAPS_CONFIGURE_ENABLE= ldaps
+LIBSSH2_CONFIGURE_WITH= libssh2
LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2
-NSS_CONFIGURE_OFF= --without-nss
-NSS_CONFIGURE_ON= --with-nss=yes
+NSS_CONFIGURE_WITH= nss
NSS_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss
NSS_USES= pkgconfig
OPENSSL_CONFIGURE_OFF= --without-ssl
@@ -136,20 +122,14 @@ OPENSSL_CONFIGURE_ON= --with-ssl=${OPENS
OPENSSL_CPPFLAGS= -I${OPENSSLINC}
OPENSSL_LDFLAGS= -L${OPENSSLLIB}
OPENSSL_USE= OPENSSL=yes
-POLARSSL_CONFIGURE_OFF= --without-polarssl
-POLARSSL_CONFIGURE_ON= --with-polarssl=${LOCALBASE}
+POLARSSL_CONFIGURE_WITH=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
-RTMP_CONFIGURE_ON= --with-librtmp=${LOCALBASE}
+PROXY_CONFIGURE_ENABLE= proxy
+RTMP_CONFIGURE_WITH= librtmp
RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp
-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}
+THREADED_RESOLVER_CONFIGURE_ENABLE= threaded-resolver
+TLS_SRP_CONFIGURE_ENABLE= tls-srp
+WOLFSSL_CONFIGURE_WITH= cyassl
WOLFSSL_LIB_DEPENDS= libwolfssl.so:${PORTSDIR}/security/wolfssl
.include <bsd.port.options.mk>
Modified: branches/2016Q1/ftp/curl/distinfo
==============================================================================
--- branches/2016Q1/ftp/curl/distinfo Tue Feb 2 19:44:40 2016 (r407839)
+++ branches/2016Q1/ftp/curl/distinfo Tue Feb 2 20:00:15 2016 (r407840)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.46.0.tar.lzma) = fe854a0dedf0a89da72aa1725d8ff66285b613d366a88f14681dacd824024087
-SIZE (curl-7.46.0.tar.lzma) = 2864645
+SHA256 (curl-7.47.0.tar.lzma) = f7789a806fef4e24ec3d4b70ca86ff145243bf19d03ab0eb5c64f18f1b2748d8
+SIZE (curl-7.47.0.tar.lzma) = 2878783
Copied: branches/2016Q1/ftp/curl/files/patch-docs_examples_getredirect.c (from r407725, head/ftp/curl/files/patch-docs_examples_getredirect.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q1/ftp/curl/files/patch-docs_examples_getredirect.c Tue Feb 2 20:00:15 2016 (r407840, copy of r407725, head/ftp/curl/files/patch-docs_examples_getredirect.c)
@@ -0,0 +1,11 @@
+--- docs/examples/getredirect.c.orig 2016-01-30 11:01:12 UTC
++++ docs/examples/getredirect.c
+@@ -48,7 +48,7 @@ int main(void)
+ else {
+ res = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code);
+ if((res == CURLE_OK) &&
+- ((code / 100) != 3)) {
++ ((response_code / 100) != 3)) {
+ /* a redirect implies a 3xx response code */
+ fprintf(stderr, "Not a redirect.\n");
+ }
More information about the svn-ports-all
mailing list