From owner-svn-ports-head@freebsd.org Sun May 26 18:01:59 2019 Return-Path: Delivered-To: svn-ports-head@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 82F2415AC576; Sun, 26 May 2019 18:01:59 +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 CE5D78F340; Sun, 26 May 2019 18:01:54 +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 BAD5B1F2D5; Sun, 26 May 2019 18:01:53 +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 x4QI1rqn052803; Sun, 26 May 2019 18:01:53 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4QI1r67052802; Sun, 26 May 2019 18:01:53 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201905261801.x4QI1r67052802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 26 May 2019 18:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502732 - head/ftp/curl/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/ftp/curl/files X-SVN-Commit-Revision: 502732 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CE5D78F340 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-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 26 May 2019 18:01:59 -0000 Author: sunpoet Date: Sun May 26 18:01:53 2019 New Revision: 502732 URL: https://svnweb.freebsd.org/changeset/ports/502732 Log: Fix build with FTP disabled and FILE enabled Obtained from: https://github.com/curl/curl/commit/dc0a671213fa94489933755828b26f5807d61a7a Reported by: Charlie Li Modified: head/ftp/curl/files/patch-lib-url.c Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Sun May 26 18:01:46 2019 (r502731) +++ head/ftp/curl/files/patch-lib-url.c Sun May 26 18:01:53 2019 (r502732) @@ -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