From owner-svn-ports-all@freebsd.org Thu Apr 2 12:23:44 2020 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 E79D32658F9; Thu, 2 Apr 2020 12:23:44 +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 48tMg40gXzz4W8x; Thu, 2 Apr 2020 12:23:44 +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 074C918D19; Thu, 2 Apr 2020 12:23:36 +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 032CNZ6L060882; Thu, 2 Apr 2020 12:23:35 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 032CNZ6p060880; Thu, 2 Apr 2020 12:23:35 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202004021223.032CNZ6p060880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 2 Apr 2020 12:23:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530365 - 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: 530365 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.29 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: Thu, 02 Apr 2020 12:23:45 -0000 Author: sunpoet Date: Thu Apr 2 12:23:35 2020 New Revision: 530365 URL: https://svnweb.freebsd.org/changeset/ports/530365 Log: Fix runtime error (for CARES enabled and IPV6 disabled builds) - Bump PORTREVISION for package change Obtained from: https://github.com/curl/curl/commit/3bfda07004a5739fb306e55cb9529ba3de35fbdb PR: 245237 Reported by: Michael Osipov Added: head/ftp/curl/files/patch-lib-easy.c (contents, props changed) Modified: head/ftp/curl/Makefile Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Apr 2 12:21:59 2020 (r530364) +++ head/ftp/curl/Makefile Thu Apr 2 12:23:35 2020 (r530365) @@ -3,6 +3,7 @@ PORTNAME= curl PORTVERSION= 7.69.1 +PORTREVISION= 1 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet Added: head/ftp/curl/files/patch-lib-easy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/curl/files/patch-lib-easy.c Thu Apr 2 12:23:35 2020 (r530365) @@ -0,0 +1,38 @@ +Obtained from: https://github.com/curl/curl/commit/3bfda07004a5739fb306e55cb9529ba3de35fbdb + +--- lib/easy.c.orig 2020-03-09 15:31:01 UTC ++++ lib/easy.c +@@ -884,14 +884,25 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy + goto fail; + + #ifdef USE_ARES +- if(Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS])) +- goto fail; +- if(Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE])) +- goto fail; +- if(Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4])) +- goto fail; +- if(Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6])) +- goto fail; ++ { ++ CURLcode rc; ++ ++ rc = Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS]); ++ if(rc && rc != CURLE_NOT_BUILT_IN) ++ goto fail; ++ ++ rc = Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE]); ++ if(rc && rc != CURLE_NOT_BUILT_IN) ++ goto fail; ++ ++ rc = Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4]); ++ if(rc && rc != CURLE_NOT_BUILT_IN) ++ goto fail; ++ ++ rc = Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6]); ++ if(rc && rc != CURLE_NOT_BUILT_IN) ++ goto fail; ++ } + #endif /* USE_ARES */ + + Curl_convert_setup(outcurl);