diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2015-05-01 17:59:31 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2015-05-01 17:59:31 +0800 |
| commit | 034090a5cf6bce8b6e9cb7c6d223d67dbe011b3c (patch) | |
| tree | f87346c511b0317282c86b123c0948d409118ca3 /ftp | |
| parent | cb3bef9cfe6d0d1138d4a64d227d93e0a4a152f9 (diff) | |
| download | freebsd-ports-gnome-034090a5cf6bce8b6e9cb7c6d223d67dbe011b3c.tar.gz freebsd-ports-gnome-034090a5cf6bce8b6e9cb7c6d223d67dbe011b3c.tar.zst freebsd-ports-gnome-034090a5cf6bce8b6e9cb7c6d223d67dbe011b3c.zip | |
- Update to 7.42.1
Changes: http://curl.haxx.se/changes.html
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/curl/Makefile | 2 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 4 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib-url.c | 36 | ||||
| -rw-r--r-- | ftp/curl/pkg-plist | 1 |
4 files changed, 4 insertions, 39 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index d6be343c8c55..359e41d7dc63 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.42.0 +PORTVERSION= 7.42.1 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 3fda5ee071f4..31b977f25cb9 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,2 +1,2 @@ -SHA256 (curl-7.42.0.tar.lzma) = dd2251de6f2682dfc29ed18e86ff2f34c14e65fc03fddb62b0157e76932be649 -SIZE (curl-7.42.0.tar.lzma) = 2731954 +SHA256 (curl-7.42.1.tar.lzma) = 3d6c196ab5083ab2ea3691819602e7b9698404ce8480d4008e3ba64822cc2c47 +SIZE (curl-7.42.1.tar.lzma) = 2732330 diff --git a/ftp/curl/files/patch-lib-url.c b/ftp/curl/files/patch-lib-url.c index 00f26e2c50db..c560e2c3123d 100644 --- a/ftp/curl/files/patch-lib-url.c +++ b/ftp/curl/files/patch-lib-url.c @@ -1,12 +1,8 @@ -[1] Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-18 -[2] -Reference: https://github.com/bagder/curl/commit/fd9d3a1ef1f7b1cb5812d04bad07818efc6f3b3a.patch - --- lib/url.c.orig 2015-04-22 05:55:54 UTC +++ lib/url.c @@ -658,6 +658,10 @@ CURLcode Curl_open(struct SessionHandle @@ -20,35 +16,3 @@ Reference: https://github.com/bagder/curl/commit/fd9d3a1ef1f7b1cb5812d04bad07818 data->wildcard.state = CURLWC_INIT; data->wildcard.filelist = NULL; data->set.fnmatch = ZERO_NULL; -@@ -3069,9 +3073,11 @@ ConnectionExists(struct SessionHandle *d - struct connectdata *check; - struct connectdata *chosen = 0; - bool canPipeline = IsPipeliningPossible(data, needle); -+#ifdef USE_NTLM - bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) || - (data->state.authhost.want & CURLAUTH_NTLM_WB)) && - (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE; -+#endif - struct connectbundle *bundle; - - *force_reuse = FALSE; -@@ -3208,6 +3214,7 @@ ConnectionExists(struct SessionHandle *d - continue; - } - -+#if defined(USE_NTLM) - if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) || - (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) { - /* This protocol requires credentials per connection or is HTTP+NTLM, -@@ -3217,10 +3224,9 @@ ConnectionExists(struct SessionHandle *d - /* one of them was different */ - continue; - } --#if defined(USE_NTLM) - credentialsMatch = TRUE; --#endif - } -+#endif - - if(!needle->bits.httpproxy || needle->handler->flags&PROTOPT_SSL || - (needle->bits.httpproxy && check->bits.httpproxy && diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 868df4e36666..9166ab7bf5fb 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -142,6 +142,7 @@ man/man3/CURLOPT_OPENSOCKETDATA.3.gz man/man3/CURLOPT_OPENSOCKETFUNCTION.3.gz man/man3/CURLOPT_PASSWORD.3.gz man/man3/CURLOPT_PATH_AS_IS.3.gz +man/man3/CURLOPT_PINNEDPUBLICKEY.3.gz man/man3/CURLOPT_PORT.3.gz man/man3/CURLOPT_POST.3.gz man/man3/CURLOPT_POSTFIELDS.3.gz |