From owner-svn-ports-all@freebsd.org Wed Feb 3 19:47:00 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 67A6F529BDA; Wed, 3 Feb 2021 19:47:00 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWByq2wRtz3Px0; Wed, 3 Feb 2021 19:46:59 +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 CA55526960; Wed, 3 Feb 2021 19:46:58 +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 113Jkw7j091037; Wed, 3 Feb 2021 19:46:58 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 113JkwsG091034; Wed, 3 Feb 2021 19:46:58 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202102031946.113JkwsG091034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 3 Feb 2021 19:46:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563916 - in head/ftp/curl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/ftp/curl: . files X-SVN-Commit-Revision: 563916 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2021 19:47:00 -0000 Author: sunpoet Date: Wed Feb 3 19:46:57 2021 New Revision: 563916 URL: https://svnweb.freebsd.org/changeset/ports/563916 Log: Make User-Agent header setting reliable - Bump PORTREVISION for package change Requested by: Jonathan Simon Obtained from: https://github.com/curl/curl/commit/0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 Added: head/ftp/curl/files/patch-lib-transfer.c (contents, props changed) Modified: head/ftp/curl/Makefile head/ftp/curl/files/patch-lib-url.c Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Wed Feb 3 19:46:50 2021 (r563915) +++ head/ftp/curl/Makefile Wed Feb 3 19:46:57 2021 (r563916) @@ -3,6 +3,7 @@ PORTNAME= curl PORTVERSION= 7.74.0 +PORTREVISION= 1 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet Added: head/ftp/curl/files/patch-lib-transfer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/curl/files/patch-lib-transfer.c Wed Feb 3 19:46:57 2021 (r563916) @@ -0,0 +1,25 @@ +Obtained from: https://github.com/curl/curl/commit/0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 + +--- lib/transfer.c.orig 2020-12-08 08:14:13 UTC ++++ lib/transfer.c +@@ -1532,6 +1532,20 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + Curl_hsts_loadcb(data, data->hsts); + } + ++ /* ++ * Set user-agent. Used for HTTP, but since we can attempt to tunnel ++ * basically anything through a http proxy we can't limit this based on ++ * protocol. ++ */ ++ if(data->set.str[STRING_USERAGENT]) { ++ Curl_safefree(data->state.aptr.uagent); ++ data->state.aptr.uagent = ++ aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]); ++ if(!data->state.aptr.uagent) ++ return CURLE_OUT_OF_MEMORY; ++ } ++ ++ data->req.headerbytecount = 0; + return result; + } + Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Wed Feb 3 19:46:50 2021 (r563915) +++ head/ftp/curl/files/patch-lib-url.c Wed Feb 3 19:46:57 2021 (r563916) @@ -1,11 +1,13 @@ +Obtained from: https://github.com/curl/curl/commit/0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 + Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-12-18 ---- lib/url.c.orig 2019-05-21 17:57:39 UTC +--- lib/url.c.orig 2020-12-08 07:39:35 UTC +++ lib/url.c -@@ -552,6 +552,10 @@ CURLcode Curl_init_userdefined(struct Cu +@@ -607,6 +607,10 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) CURL_HTTP_VERSION_1_1 #endif ; @@ -16,3 +18,24 @@ Last-Update: 2010-12-18 Curl_http2_init_userset(set); return result; } +@@ -3940,20 +3944,6 @@ CURLcode Curl_setup_conn(struct connectdata *conn, + lingering set from a previous invoke */ + conn->bits.proxy_connect_closed = FALSE; + #endif +- /* +- * Set user-agent. Used for HTTP, but since we can attempt to tunnel +- * basically anything through a http proxy we can't limit this based on +- * protocol. +- */ +- if(data->set.str[STRING_USERAGENT]) { +- Curl_safefree(data->state.aptr.uagent); +- data->state.aptr.uagent = +- aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]); +- if(!data->state.aptr.uagent) +- return CURLE_OUT_OF_MEMORY; +- } +- +- data->req.headerbytecount = 0; + + #ifdef CURL_DO_LINEEND_CONV + data->state.crlf_conversions = 0; /* reset CRLF conversion counter */