svn commit: r530365 - in head/ftp/curl: . files

[Sunpoet Po-Chuan Hsieh]

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 <michael.osipov at siemens.com>

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);