[Midnightbsd-cvs] mports [20658] trunk/ftp/curl: curl 7.45.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 6 19:21:22 EST 2015 

Revision: 20658
          http://svnweb.midnightbsd.org/mports/?rev=20658
Author:   laffer1
Date:     2015-11-06 19:21:21 -0500 (Fri, 06 Nov 2015)
Log Message:
-----------
curl 7.45.0

Modified Paths:
--------------
    trunk/ftp/curl/Makefile
    trunk/ftp/curl/distinfo
    trunk/ftp/curl/pkg-plist

Removed 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-11-06 23:05:45 UTC (rev 20657)
+++ trunk/ftp/curl/Makefile	2015-11-07 00:21:21 UTC (rev 20658)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.43.0
-PORTREVISION=	2
+PORTVERSION=	7.45.0
 CATEGORIES=	ftp www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		FREEBSD_LOCAL/sunpoet
@@ -11,6 +10,7 @@
 COMMENT?=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
 
 LICENSE=	mit
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES HTTP2 IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP TLS_SRP
 OPTIONS_RADIO=	RESOLV SSL
@@ -18,8 +18,9 @@
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 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
+OPTIONS_DEFAULT=	CA_BUNDLE COOKIES IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER TLS_SRP
 CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
+CA_BUNDLE_IMPLIES=	OPENSSL
 COOKIES_DESC=		Cookies support
 CURL_DEBUG_DESC=	cURL debug memory tracking
 GSSAPI_BASE_DESC=	GSSAPI support via base system (Kerberos required)
@@ -26,11 +27,20 @@
 GSSAPI_HEIMDAL_DESC=	GSSAPI support via security/heimdal
 GSSAPI_MIT_DESC=	GSSAPI support via security/krb5
 GSSAPI_NONE_DESC=	Disable GSSAPI support
+LDAPS_IMPLIES=		LDAP
 LIBSSH2_DESC=		SCP/SFTP support via libssh2
+LIBSSH2_IMPLIES=	OPENSSL
 RESOLV_DESC=		DNS resolving options
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=		TLS-SRP (Secure Remote Password) support
 
+LOCALBASE?=	/usr/local
+.if defined(WITH_OPENSSL_PORT) || (!defined(WITH_OPENSSL_BASE) && exists(${LOCALBASE}/lib/libcrypto.so))
+OPTIONS_DEFAULT+=	GSSAPI_NONE
+.else
+OPTIONS_DEFAULT+=	GSSAPI_BASE
+.endif
+
 CONFIGURE_ARGS+=--disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp \
 		--without-axtls
@@ -38,6 +48,8 @@
 		ac_cv_func_SSLv2_client_method=no
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+TEST_ENV=	${MAKE_ENV} LC_ALL=C
+TEST_TARGET=	test
 USE_PERL5=	build
 USES=		libtool pathfix perl5 tar:lzma
 
@@ -109,9 +121,8 @@
 IPV6_CONFIGURE_ON=	--enable-ipv6
 LDAP_CONFIGURE_OFF=	--disable-ldap
 LDAP_CONFIGURE_ON=	--enable-ldap
-LDAP_CPPFLAGS=		-I${LOCALBASE}/include
-LDAP_LDFLAGS=		-L${LOCALBASE}/lib
 LDAP_USE=		OPENLDAP=yes
+LDAP_USES=		localbase
 LDAPS_CONFIGURE_OFF=	--disable-ldaps
 LDAPS_CONFIGURE_ON=	--enable-ldaps
 LIBSSH2_CONFIGURE_OFF=	--without-libssh2
@@ -144,26 +155,14 @@
 
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
-IGNORE=		only supports CA bundle with OpenSSL
-.endif
-
 .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MTLS_SRP}
 IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 .endif
 
-.if !${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAPS}
-IGNORE=		only supports LDAPS with LDAP
-.endif
-
 .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
 
-.if ${PORT_OPTIONS:MLIBSSH2} && !${PORT_OPTIONS:MOPENSSL}
-IGNORE=		only supports LIBSSH2 with OpenSSL
-.endif
-
 .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
@@ -183,25 +182,26 @@
 	@${REINPLACE_CMD} -e 's|include <gssapi.h>|include <gssapi/gssapi.h>|' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h
 	@${REINPLACE_CMD} -e 's|gss_nt_service_name|GSS_C_NT_HOSTBASED_SERVICE|' ${WRKSRC}/lib/curl_sasl_gssapi.c
 
+.if !defined(BUILDING_HIPHOP)
 post-install:
-.if !defined(BUILDING_HIPHOP)
 	${LN} -s libcurl.so.4 ${STAGEDIR}${PREFIX}/lib/libcurl.so.7
 	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/
 	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/
+	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 *.pdf ${STAGEDIR}${DOCSDIR}/libcurl/
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
-regression-test test: build
-.if !${PORT_OPTIONS:MPROXY}
+pre-test-PROXY-off:
 	@${ECHO_MSG} "******************************************"
 	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 	@${ECHO_MSG} "* Some tests SHALL FAIL!                 *"
 	@${ECHO_MSG} "* This is being addressed.               *"
 	@${ECHO_MSG} "******************************************"
-.endif
-	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE_CMD} test
 
 .include <bsd.port.mk>

Modified: trunk/ftp/curl/distinfo
===================================================================
--- trunk/ftp/curl/distinfo	2015-11-06 23:05:45 UTC (rev 20657)
+++ trunk/ftp/curl/distinfo	2015-11-07 00:21:21 UTC (rev 20658)
@@ -1,2 +1,2 @@
-SHA256 (curl-7.43.0.tar.lzma) = e2b8d84d9c7d85f81cc8477ea3ec757e4c9908eca116be8764b7d158aa7677fa
-SIZE (curl-7.43.0.tar.lzma) = 2765536
+SHA256 (curl-7.45.0.tar.lzma) = 96cd9711d8f38fa6f99af085a67ad1e0ebca339f2a9a00a2aa59c40a66c4552d
+SIZE (curl-7.45.0.tar.lzma) = 2849335

Deleted: trunk/ftp/curl/files/patch-lib-multi.c
===================================================================
--- trunk/ftp/curl/files/patch-lib-multi.c	2015-11-06 23:05:45 UTC (rev 20657)
+++ trunk/ftp/curl/files/patch-lib-multi.c	2015-11-07 00:21:21 UTC (rev 20658)
@@ -1,16 +0,0 @@
-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. */

Deleted: trunk/ftp/curl/files/patch-lib-transfer.c
===================================================================
--- trunk/ftp/curl/files/patch-lib-transfer.c	2015-11-06 23:05:45 UTC (rev 20657)
+++ trunk/ftp/curl/files/patch-lib-transfer.c	2015-11-07 00:21:21 UTC (rev 20658)
@@ -1,16 +0,0 @@
-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);

Modified: trunk/ftp/curl/pkg-plist
===================================================================
--- trunk/ftp/curl/pkg-plist	2015-11-06 23:05:45 UTC (rev 20657)
+++ trunk/ftp/curl/pkg-plist	2015-11-07 00:21:21 UTC (rev 20658)
@@ -12,11 +12,55 @@
 lib/libcurl.a
 lib/libcurl.so
 lib/libcurl.so.4
-lib/libcurl.so.4.3.0
+lib/libcurl.so.4.4.0
 lib/libcurl.so.7
 libdata/pkgconfig/libcurl.pc
 man/man1/curl-config.1.gz
 man/man1/curl.1.gz
+man/man3/CURLINFO_ACTIVESOCKET.3.gz
+man/man3/CURLINFO_APPCONNECT_TIME.3.gz
+man/man3/CURLINFO_CERTINFO.3.gz
+man/man3/CURLINFO_CONDITION_UNMET.3.gz
+man/man3/CURLINFO_CONNECT_TIME.3.gz
+man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz
+man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz
+man/man3/CURLINFO_CONTENT_TYPE.3.gz
+man/man3/CURLINFO_COOKIELIST.3.gz
+man/man3/CURLINFO_EFFECTIVE_URL.3.gz
+man/man3/CURLINFO_FILETIME.3.gz
+man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz
+man/man3/CURLINFO_HEADER_SIZE.3.gz
+man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz
+man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz
+man/man3/CURLINFO_LASTSOCKET.3.gz
+man/man3/CURLINFO_LOCAL_IP.3.gz
+man/man3/CURLINFO_LOCAL_PORT.3.gz
+man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz
+man/man3/CURLINFO_NUM_CONNECTS.3.gz
+man/man3/CURLINFO_OS_ERRNO.3.gz
+man/man3/CURLINFO_PRETRANSFER_TIME.3.gz
+man/man3/CURLINFO_PRIMARY_IP.3.gz
+man/man3/CURLINFO_PRIMARY_PORT.3.gz
+man/man3/CURLINFO_PRIVATE.3.gz
+man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
+man/man3/CURLINFO_REDIRECT_COUNT.3.gz
+man/man3/CURLINFO_REDIRECT_TIME.3.gz
+man/man3/CURLINFO_REDIRECT_URL.3.gz
+man/man3/CURLINFO_REQUEST_SIZE.3.gz
+man/man3/CURLINFO_RESPONSE_CODE.3.gz
+man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz
+man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz
+man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz
+man/man3/CURLINFO_RTSP_SESSION_ID.3.gz
+man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz
+man/man3/CURLINFO_SIZE_UPLOAD.3.gz
+man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz
+man/man3/CURLINFO_SPEED_UPLOAD.3.gz
+man/man3/CURLINFO_SSL_ENGINES.3.gz
+man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz
+man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz
+man/man3/CURLINFO_TLS_SESSION.3.gz
+man/man3/CURLINFO_TOTAL_TIME.3.gz
 man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz
 man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz
 man/man3/CURLMOPT_MAXCONNECTS.3.gz
@@ -26,6 +70,8 @@
 man/man3/CURLMOPT_PIPELINING.3.gz
 man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz
 man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz
+man/man3/CURLMOPT_PUSHDATA.3.gz
+man/man3/CURLMOPT_PUSHFUNCTION.3.gz
 man/man3/CURLMOPT_SOCKETDATA.3.gz
 man/man3/CURLMOPT_SOCKETFUNCTION.3.gz
 man/man3/CURLMOPT_TIMERDATA.3.gz
@@ -61,6 +107,7 @@
 man/man3/CURLOPT_CUSTOMREQUEST.3.gz
 man/man3/CURLOPT_DEBUGDATA.3.gz
 man/man3/CURLOPT_DEBUGFUNCTION.3.gz
+man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz
 man/man3/CURLOPT_DIRLISTONLY.3.gz
 man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz
 man/man3/CURLOPT_DNS_INTERFACE.3.gz
@@ -301,6 +348,7 @@
 man/man3/libcurl-multi.3.gz
 man/man3/libcurl-share.3.gz
 man/man3/libcurl-symbols.3.gz
+man/man3/libcurl-thread.3.gz
 man/man3/libcurl-tutorial.3.gz
 man/man3/libcurl.3.gz
 share/aclocal/libcurl.m4

More information about the Midnightbsd-cvs mailing list