diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2007-03-09 14:45:32 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2007-03-09 14:45:32 +0000 |
| commit | fbac9544966f62cb907e6eaa2e2aa3d5db8e0de2 (patch) | |
| tree | 273d0af8c9cc86f11c325a08e12e80941dd26c7b /ftp/curl | |
| parent | - Add entry for Trac "download wiki page as text" Cross-Site Scripting Vulner... (diff) | |
Update to curl 7.16.1, loosely based on the PR. Also:
- add a LIBSSH2 option for SCP and SFTP support using security/libssh2;
- add a patch from the cURL CVS repository to fix an expired cookie in
test 62.
PR: 109670
Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Notes
Notes:
svn path=/head/; revision=187021
Diffstat (limited to 'ftp/curl')
| -rw-r--r-- | ftp/curl/Makefile | 15 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/curl/files/patch-configure | 9 | ||||
| -rw-r--r-- | ftp/curl/files/patch-tests::data::test62 | 15 |
4 files changed, 31 insertions, 14 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 848616511f4d..7f440fcfe9d7 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= curl -PORTVERSION= 7.16.0 -PORTREVISION= 1 +PORTVERSION= 7.16.1 CATEGORIES= ftp ipv6 www MASTER_SITES= http://curl.haxx.se/download/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -56,6 +55,7 @@ OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ IPV6 "IPv6 support" on \ KERBEROS4 "Kerberos 4 authentication" off \ LIBIDN "Internationalized Domain Names via libidn" off \ + LIBSSH2 "SCP/SFTP support via libssh2" off \ NTLM "NTLM authentication" off \ OPENSSL "OpenSSL support" on @@ -65,6 +65,10 @@ OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ IGNORE= may only use GNU TLS if OpenSSL support is disabled .endif +.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL) +IGNORE= only supports LIBSSH2 with OpenSSL +.endif + .if defined(WITH_NTLM) && !defined(WITH_OPENSSL) IGNORE= only supports NTLM with OpenSSL .endif @@ -119,6 +123,13 @@ CONFIGURE_ARGS+= --with-libidn=${LOCALBASE} CONFIGURE_ARGS+= --without-libidn .endif +.if defined(WITH_LIBSSH2) +LIB_DEPENDS+= ssh2.0:${PORTSDIR}/security/libssh2 +CONFIGURE_ARGS+= --with-libssh2=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-libssh2 +.endif + .if defined(WITH_CURL_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index b21da0362fc7..4e4551194116 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -MD5 (curl-7.16.0.tar.bz2) = 5819f56e93d04cde2992fe88b54cbfad -SHA256 (curl-7.16.0.tar.bz2) = fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 -SIZE (curl-7.16.0.tar.bz2) = 1566391 +MD5 (curl-7.16.1.tar.bz2) = acdab0b0467c55e10ed02d2afed80575 +SHA256 (curl-7.16.1.tar.bz2) = 257b204acf1d80314694b4cf63cccbc7c70bccee75cb3d9924bbb061ec6bccef +SIZE (curl-7.16.1.tar.bz2) = 1592074 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index 35cea8f421bb..b64829df7d62 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -11,12 +11,3 @@ ;; esac -@@ -35638,7 +35640,7 @@ - main () - { - #ifndef basename -- char *p = (char *) basename; -+ char *(*p)(const char *) = basename; - return !p; - #endif - diff --git a/ftp/curl/files/patch-tests::data::test62 b/ftp/curl/files/patch-tests::data::test62 new file mode 100644 index 000000000000..2c2f48b8edcc --- /dev/null +++ b/ftp/curl/files/patch-tests::data::test62 @@ -0,0 +1,15 @@ +--- tests/data/test62.orig Fri Mar 9 15:11:24 2007 ++++ tests/data/test62 Fri Mar 9 15:11:45 2007 +@@ -33,9 +33,9 @@ + # http://curlm.haxx.se/rfc/cookie_spec.html + # This file was generated by libcurl! Edit at your own risk. + +-.foo.com TRUE /we/want/ FALSE 1170327387 test yes +-.host.foo.com TRUE /we/want/ FALSE 1170327387 test2 yes +-.fake.host.foo.com TRUE /we/want/ FALSE 1170327387 test4 yes ++.foo.com TRUE /we/want/ FALSE 2054030187 test yes ++.host.foo.com TRUE /we/want/ FALSE 2054030187 test2 yes ++.fake.host.foo.com TRUE /we/want/ FALSE 2054030187 test4 yes + + .foo.com TRUE /moo TRUE 0 test3 maybe + </file> |