From owner-svn-ports-head@freebsd.org Sat Mar 30 20:44:49 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 DD9511562A34; Sat, 30 Mar 2019 20:44:49 +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 837FF76056; Sat, 30 Mar 2019 20:44:49 +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 5DEED1C3E4; Sat, 30 Mar 2019 20:44:49 +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 x2UKingq031413; Sat, 30 Mar 2019 20:44:49 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2UKinHS031412; Sat, 30 Mar 2019 20:44:49 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201903302044.x2UKinHS031412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 30 Mar 2019 20:44:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497348 - 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: 497348 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 837FF76056 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,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: Sat, 30 Mar 2019 20:44:50 -0000 Author: sunpoet Date: Sat Mar 30 20:44:48 2019 New Revision: 497348 URL: https://svnweb.freebsd.org/changeset/ports/497348 Log: Fix undefined Curl_get_line when ALTSVC enabled and COOKIES disabled ALTSVC requires Curl_get_line which is defined in lib/cookie.c inside a #if check of HTTP and COOKIES. That makes Curl_get_line undefined if COOKIES is disabled. This is a workaround to define Curl_get_line unconditionally. PR: 236885, 236890 Added: head/ftp/curl/files/patch-lib-cookie.c (contents, props changed) Added: head/ftp/curl/files/patch-lib-cookie.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/curl/files/patch-lib-cookie.c Sat Mar 30 20:44:48 2019 (r497348) @@ -0,0 +1,19 @@ +--- lib/cookie.c.orig 2019-03-25 08:42:50 UTC ++++ lib/cookie.c +@@ -1085,6 +1085,8 @@ Curl_cookie_add(struct Curl_easy *data, + return co; + } + ++#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_COOKIES */ ++ + /* + * get_line() makes sure to only return complete whole lines that fit in 'len' + * bytes and end with a newline. +@@ -1112,6 +1114,7 @@ char *Curl_get_line(char *buf, int len, + return NULL; + } + ++#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) + + /***************************************************************************** + *