[Midnightbsd-cvs] mports [19595] trunk/ftp/curl: curl 7.43
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jul 15 18:09:25 EDT 2015
Revision: 19595
http://svnweb.midnightbsd.org/mports/?rev=19595
Author: laffer1
Date: 2015-07-15 18:09:24 -0400 (Wed, 15 Jul 2015)
Log Message:
-----------
curl 7.43
Modified Paths:
--------------
trunk/ftp/curl/Makefile
trunk/ftp/curl/distinfo
trunk/ftp/curl/pkg-plist
Added Paths:
-----------
trunk/ftp/curl/files/patch-lib-multi.c
trunk/ftp/curl/files/patch-lib-transfer.c
Modified: trunk/ftp/curl/Makefile
===================================================================
--- trunk/ftp/curl/Makefile 2015-07-15 22:05:29 UTC (rev 19594)
+++ trunk/ftp/curl/Makefile 2015-07-15 22:09:24 UTC (rev 19595)
@@ -1,7 +1,8 @@
# $MidnightBSD$
PORTNAME= curl
-PORTVERSION= 7.42.1
+PORTVERSION= 7.43.0
+PORTREVISION= 2
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
FREEBSD_LOCAL/sunpoet
@@ -12,26 +13,29 @@
LICENSE= mit
OPTIONS_DEFINE= CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP TLS_SRP
-OPTIONS_RADIO= GSSAPI RESOLV SSL
-OPTIONS_RADIO_GSSAPI= GSSAPI_BASE HEIMDAL_PORT KRB5_PORT
+OPTIONS_RADIO= RESOLV SSL
+OPTIONS_SINGLE= GSSAPI
OPTIONS_RADIO_RESOLV= CARES THREADED_RESOLVER
-OPTIONS_RADIO_SSL= CYASSL GNUTLS NSS OPENSSL POLARSSL
-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
-HEIMDAL_PORT_DESC= GSSAPI support via security/heimdal
-KRB5_PORT_DESC= GSSAPI support via security/krb5
-LIBSSH2_DESC= SCP/SFTP support via libssh2
-RESOLV_DESC= DNS resolving options
+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 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
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
@@ -47,12 +51,11 @@
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
@@ -71,25 +74,32 @@
COOKIES_CONFIGURE_ON= --enable-cookies
CURL_DEBUG_CONFIGURE_OFF= --disable-curldebug
CURL_DEBUG_CONFIGURE_ON=--enable-curldebug
-CYASSL_CONFIGURE_OFF= --without-cyassl
-CYASSL_CONFIGURE_ON= --with-cyassl=${LOCALBASE}
-CYASSL_LIB_DEPENDS= libcyassl.so:${PORTSDIR}/security/yassl
DEBUG_CONFIGURE_OFF= --disable-debug
DEBUG_CONFIGURE_ON= --enable-debug
GNUTLS_CONFIGURE_OFF= --without-gnutls
GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE}
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
-GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=/usr
-GSSAPI_BASE_CPPFLAGS= -I${INCLUDEDIR}
-HEIMDAL_PORT_CONFIGURE_ON= --with-gssapi=${HEIMDAL_HOME}
-HEIMDAL_PORT_CPPFLAGS= -I${HEIMDAL_HOME}/include
-HEIMDAL_PORT_LDFLAGS= -L${HEIMDAL_HOME}/lib
-HEIMDAL_PORT_LIB_DEPENDS= libgssapi.so.3:${PORTSDIR}/security/heimdal
-HTTP2_BUILD_DEPENDS= nghttp2>=0.6.0:${PORTSDIR}/www/nghttp2
+GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS}
+GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS}
+GSSAPI_BASE_LIBS= ${GSSAPILIBS}
+GSSAPI_BASE_USES= gssapi
+GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+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_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_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}
@@ -97,10 +107,6 @@
IPV6_CATEGORIES= ipv6
IPV6_CONFIGURE_OFF= --disable-ipv6
IPV6_CONFIGURE_ON= --enable-ipv6
-KRB5_PORT_CONFIGURE_ON= --with-gssapi=${KRB5_HOME}
-KRB5_PORT_CPPFLAGS= -I${KRB5_HOME}/include
-KRB5_PORT_LDFLAGS= -L${KRB5_HOME}/lib
-KRB5_PORT_LIB_DEPENDS= libgssapi_krb5.so.2:${PORTSDIR}/security/krb5
LDAP_CONFIGURE_OFF= --disable-ldap
LDAP_CONFIGURE_ON= --enable-ldap
LDAP_CPPFLAGS= -I${LOCALBASE}/include
@@ -122,7 +128,7 @@
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
@@ -132,6 +138,9 @@
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.mport.options.mk>
@@ -147,7 +156,7 @@
IGNORE= only supports LDAPS with LDAP
.endif
-.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MCYASSL} && !${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
@@ -155,10 +164,19 @@
IGNORE= only supports LIBSSH2 with OpenSSL
.endif
-.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MHEIMDAL_PORT} && !${PORT_OPTIONS:MKRB5_PORT}
-CONFIGURE_ARGS+=--without-gssapi
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL} && (defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so)))
+IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif
+.if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == "security/libressl"
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && ${PORT_OPTIONS:MOPENSSL}
+IGNORE= GSSAPI_BASE is not compatible with LibreSSL. Use other GSSAPI options
+.endif
+.if ${PORT_OPTIONS:MTLS_SRP}
+IGNORE= unsupported TLS-SRP in LibreSSL
+.endif
+.endif
+
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure
Modified: trunk/ftp/curl/distinfo
===================================================================
--- trunk/ftp/curl/distinfo 2015-07-15 22:05:29 UTC (rev 19594)
+++ trunk/ftp/curl/distinfo 2015-07-15 22:09:24 UTC (rev 19595)
@@ -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
Added: trunk/ftp/curl/files/patch-lib-multi.c
===================================================================
--- trunk/ftp/curl/files/patch-lib-multi.c (rev 0)
+++ trunk/ftp/curl/files/patch-lib-multi.c 2015-07-15 22:09:24 UTC (rev 19595)
@@ -0,0 +1,16 @@
+Obtained from: https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+
+--- lib/multi.c.orig 2015-06-15 21:14:25 UTC
++++ lib/multi.c
+@@ -402,11 +402,6 @@ CURLMcode curl_multi_add_handle(CURLM *m
+ /* Point to the multi's connection cache */
+ data->state.conn_cache = &multi->conn_cache;
+
+- if(data->set.httpreq == HTTPREQ_PUT)
+- data->state.infilesize = data->set.filesize;
+- else
+- data->state.infilesize = data->set.postfieldsize;
+-
+ /* This adds the new entry at the 'end' of the doubly-linked circular
+ list of SessionHandle structs to try and maintain a FIFO queue so
+ the pipelined requests are in order. */
Property changes on: trunk/ftp/curl/files/patch-lib-multi.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/ftp/curl/files/patch-lib-transfer.c
===================================================================
--- trunk/ftp/curl/files/patch-lib-transfer.c (rev 0)
+++ trunk/ftp/curl/files/patch-lib-transfer.c 2015-07-15 22:09:24 UTC (rev 19595)
@@ -0,0 +1,16 @@
+Obtained from: https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+
+--- lib/transfer.c.orig 2015-06-14 21:31:01 UTC
++++ lib/transfer.c
+@@ -1315,6 +1315,11 @@ CURLcode Curl_pretransfer(struct Session
+ Curl_safefree(data->info.wouldredirect);
+ data->info.wouldredirect = NULL;
+
++ if(data->set.httpreq == HTTPREQ_PUT)
++ data->state.infilesize = data->set.filesize;
++ else
++ data->state.infilesize = data->set.postfieldsize;
++
+ /* If there is a list of cookie files to read, do it now! */
+ if(data->change.cookielist)
+ Curl_cookie_loadfiles(data);
Property changes on: trunk/ftp/curl/files/patch-lib-transfer.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/ftp/curl/pkg-plist
===================================================================
--- trunk/ftp/curl/pkg-plist 2015-07-15 22:05:29 UTC (rev 19594)
+++ trunk/ftp/curl/pkg-plist 2015-07-15 22:09:24 UTC (rev 19595)
@@ -143,6 +143,7 @@
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_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_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
More information about the Midnightbsd-cvs
mailing list