mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

Update to curl 7.16.1, loosely based on the PR. Also:

Browse source 
- 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>
This commit is contained in:
Peter Pentchev 2007-03-09 14:45:32 +00:00
parent a6486cbf1f
commit fbac954496
4 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ftp/curl/Makefile
View file

@ -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

6
ftp/curl/distinfo
View file

@ -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

9
ftp/curl/files/patch-configure
View file

@ -11,12 +11,3 @@
;;
esac
@@ -35638,7 +35640,7 @@
main ()
{
#ifndef basename
- char *p = (char *) basename;
+ char *(*p)(const char *) = basename;
return !p;
#endif

15
ftp/curl/files/patch-tests::data::test62 Normal file
View file

@ -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>