parent
a30469e698
commit
6103c75013
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=533434
@ -2,8 +2,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= curl
|
PORTNAME= curl
|
||||||
PORTVERSION= 7.69.1
|
PORTVERSION= 7.70.0
|
||||||
PORTREVISION= 1
|
|
||||||
CATEGORIES= ftp net www
|
CATEGORIES= ftp net www
|
||||||
MASTER_SITES= https://curl.haxx.se/download/ \
|
MASTER_SITES= https://curl.haxx.se/download/ \
|
||||||
LOCAL/sunpoet
|
LOCAL/sunpoet
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
TIMESTAMP = 1585564806
|
TIMESTAMP = 1588242116
|
||||||
SHA256 (curl-7.69.1.tar.xz) = 03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f
|
SHA256 (curl-7.70.0.tar.xz) = 032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7
|
||||||
SIZE (curl-7.69.1.tar.xz) = 2467272
|
SIZE (curl-7.70.0.tar.xz) = 2348780
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
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);
|
|
Loading…
Reference in New Issue
Block a user