From owner-svn-ports-head@FreeBSD.ORG Fri May 1 09:59:33 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 401906A4; Fri, 1 May 2015 09:59:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E5E912A3; Fri, 1 May 2015 09:59:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t419xXZj041026; Fri, 1 May 2015 09:59:33 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t419xWxP041018; Fri, 1 May 2015 09:59:32 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201505010959.t419xWxP041018@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 1 May 2015 09:59:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385098 - in head/ftp/curl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 09:59:33 -0000 Author: sunpoet Date: Fri May 1 09:59:31 2015 New Revision: 385098 URL: https://svnweb.freebsd.org/changeset/ports/385098 Log: - Update to 7.42.1 Changes: http://curl.haxx.se/changes.html Modified: head/ftp/curl/Makefile head/ftp/curl/distinfo head/ftp/curl/files/patch-lib-url.c head/ftp/curl/pkg-plist Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Fri May 1 09:43:33 2015 (r385097) +++ head/ftp/curl/Makefile Fri May 1 09:59:31 2015 (r385098) @@ -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 Modified: head/ftp/curl/distinfo ============================================================================== --- head/ftp/curl/distinfo Fri May 1 09:43:33 2015 (r385097) +++ head/ftp/curl/distinfo Fri May 1 09:59:31 2015 (r385098) @@ -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 Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Fri May 1 09:43:33 2015 (r385097) +++ head/ftp/curl/files/patch-lib-url.c Fri May 1 09:59:31 2015 (r385098) @@ -1,12 +1,8 @@ -[1] Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev 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/cur 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 && Modified: head/ftp/curl/pkg-plist ============================================================================== --- head/ftp/curl/pkg-plist Fri May 1 09:43:33 2015 (r385097) +++ head/ftp/curl/pkg-plist Fri May 1 09:59:31 2015 (r385098) @@ -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