From owner-svn-ports-all@freebsd.org Sun May 26 18:52:16 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EF0B15AD788;
Sun, 26 May 2019 18:52:16 +0000 (UTC)
(envelope-from sunpoet@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id B2CA56A7FF;
Sun, 26 May 2019 18:52:15 +0000 (UTC)
(envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D3211FB4B;
Sun, 26 May 2019 18:52:15 +0000 (UTC)
(envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4QIqFGo083202;
Sun, 26 May 2019 18:52:15 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4QIqFL8083201;
Sun, 26 May 2019 18:52:15 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201905261852.x4QIqFL8083201@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 26 May 2019 18:52:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r502743 - branches/2019Q2/ftp/curl/files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: branches/2019Q2/ftp/curl/files
X-SVN-Commit-Revision: 502743
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: B2CA56A7FF
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.96)[-0.961,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 May 2019 18:52:16 -0000
Author: sunpoet
Date: Sun May 26 18:52:15 2019
New Revision: 502743
URL: https://svnweb.freebsd.org/changeset/ports/502743
Log:
MFH: r502732
Fix build with FTP disabled
Obtained from: https://github.com/curl/curl/commit/dc0a671213fa94489933755828b26f5807d61a7a
Reported by: Charlie Li <ml+freebsd@vishwin.info>
Approved by: ports-secteam (blanket)
Modified:
branches/2019Q2/ftp/curl/files/patch-lib-url.c
Directory Properties:
branches/2019Q2/ (props changed)
Modified: branches/2019Q2/ftp/curl/files/patch-lib-url.c
==============================================================================
--- branches/2019Q2/ftp/curl/files/patch-lib-url.c Sun May 26 18:34:42 2019 (r502742)
+++ branches/2019Q2/ftp/curl/files/patch-lib-url.c Sun May 26 18:52:15 2019 (r502743)
@@ -5,6 +5,15 @@ Last-Update: 2010-12-18
--- lib/url.c.orig 2019-05-21 17:57:39 UTC
+++ lib/url.c
+@@ -439,7 +439,7 @@ CURLcode Curl_init_userdefined(struct Cu
+
+ set->httpreq = HTTPREQ_GET; /* Default HTTP request */
+ set->rtspreq = RTSPREQ_OPTIONS; /* Default RTSP request */
+-#ifndef CURL_DISABLE_FILE
++#ifndef CURL_DISABLE_FTP
+ set->ftp_use_epsv = TRUE; /* FTP defaults to EPSV operations */
+ set->ftp_use_eprt = TRUE; /* FTP defaults to EPRT operations */
+ set->ftp_use_pret = FALSE; /* mainly useful for drftpd servers */
@@ -552,6 +552,10 @@ CURLcode Curl_init_userdefined(struct Cu
CURL_HTTP_VERSION_1_1
#endif