MFH: r512057

Update to 7.66.0

Changes:	https://curl.haxx.se/changes.html
Security:	9fb4e57b-d65a-11e9-8a5f-e5c82b486287

Approved by:	ports-secteam (delphij)

4 files changed, 21 insertions, 18 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 91714b590ede..42b0b4a2988b 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.65.1
+PORTVERSION=	7.66.0
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index ff2eb3319ba2..003495ec1432 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559751348
-SHA256 (curl-7.65.1.tar.xz) = f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a
-SIZE (curl-7.65.1.tar.xz) = 2392672
+TIMESTAMP = 1568387123
+SHA256 (curl-7.66.0.tar.xz) = dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1
+SIZE (curl-7.66.0.tar.xz) = 2414840
diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c
index ccded252b3dd..77ab0a758e2b 100644
--- a/ftp/curl/files/patch-src-tool_operate.c
+++ b/ftp/curl/files/patch-src-tool_operate.c
@@ -1,7 +1,7 @@
---- src/tool_operate.c.orig	2018-10-27 10:00:54 UTC
+--- src/tool_operate.c.orig	2019-09-10 17:47:19 UTC
 +++ src/tool_operate.c
-@@ -603,20 +603,7 @@ static CURLcode operate_do(struct Global
-             DEBUGASSERT(!outs.filename);
+@@ -960,20 +960,7 @@ static CURLcode create_transfers(struct 
+             DEBUGASSERT(!outs->filename);
            }
  
 -          if(config->resume_from_current) {
@@ -9,7 +9,7 @@
 -               of the file as it is now and open it for append instead */
 -            struct_stat fileinfo;
 -            /* VMS -- Danger, the filesize is only valid for stream files */
--            if(0 == stat(outfile, &fileinfo))
+-            if(0 == stat(per->outfile, &fileinfo))
 -              /* set offset to current file size: */
 -              config->resume_from = fileinfo.st_size;
 -            else
@@ -22,26 +22,26 @@
  #ifdef __VMS
              /* open file for output, forcing VMS output format into stream
                 mode which is needed for stat() call above to always work. */
-@@ -624,7 +611,8 @@ static CURLcode operate_do(struct Global
+@@ -981,7 +968,8 @@ static CURLcode create_transfers(struct 
                                 "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0");
  #else
              /* open file for output: */
--            FILE *file = fopen(outfile, config->resume_from?"ab":"wb");
+-            FILE *file = fopen(per->outfile, config->resume_from?"ab":"wb");
 +            /* (always open for appending, it has no effect on new files) */
-+            FILE *file = fopen(outfile, "ab");
++            FILE *file = fopen(per->outfile, "ab");
  #endif
              if(!file) {
-               helpf(global->errors, "Can't open '%s'!\n", outfile);
-@@ -633,6 +621,19 @@ static CURLcode operate_do(struct Global
+               helpf(global->errors, "Can't open '%s'!\n", per->outfile);
+@@ -990,6 +978,19 @@ static CURLcode create_transfers(struct 
              }
-             outs.fopened = TRUE;
-             outs.stream = file;
+             outs->fopened = TRUE;
+             outs->stream = file;
 +
 +            if(config->resume_from_current) {
 +              /* We're told to continue from where we are now. Get the size
 +                 of the file as it is now */
 +              struct_stat fileinfo;
-+              if(0 == fstat(fileno(outs.stream), &fileinfo))
++              if(0 == fstat(fileno(outs->stream), &fileinfo))
 +                /* set offset to current file size: */
 +                config->resume_from = fileinfo.st_size;
 +              else
@@ -49,6 +49,6 @@
 +                config->resume_from = 0;
 +            }
 +
-             outs.init = config->resume_from;
+             outs->init = config->resume_from;
            }
            else {
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 7da9b3d149e7..d11a1ed7c5a5 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -12,7 +12,7 @@ include/curl/urlapi.h
 lib/libcurl.a
 lib/libcurl.so
 lib/libcurl.so.4
-lib/libcurl.so.4.5.0
+lib/libcurl.so.4.6.0
 libdata/pkgconfig/libcurl.pc
 man/man1/curl-config.1.gz
 man/man1/curl.1.gz
@@ -58,6 +58,7 @@ man/man3/CURLINFO_REDIRECT_TIME_T.3.gz
 man/man3/CURLINFO_REDIRECT_URL.3.gz
 man/man3/CURLINFO_REQUEST_SIZE.3.gz
 man/man3/CURLINFO_RESPONSE_CODE.3.gz
+man/man3/CURLINFO_RETRY_AFTER.3.gz
 man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz
 man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz
 man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz
@@ -284,6 +285,7 @@ man/man3/CURLOPT_RTSP_SERVER_CSEQ.3.gz
 man/man3/CURLOPT_RTSP_SESSION_ID.3.gz
 man/man3/CURLOPT_RTSP_STREAM_URI.3.gz
 man/man3/CURLOPT_RTSP_TRANSPORT.3.gz
+man/man3/CURLOPT_SASL_AUTHZID.3.gz
 man/man3/CURLOPT_SASL_IR.3.gz
 man/man3/CURLOPT_SEEKDATA.3.gz
 man/man3/CURLOPT_SEEKFUNCTION.3.gz
@@ -408,6 +410,7 @@ man/man3/curl_multi_fdset.3.gz
 man/man3/curl_multi_info_read.3.gz
 man/man3/curl_multi_init.3.gz
 man/man3/curl_multi_perform.3.gz
+man/man3/curl_multi_poll.3.gz
 man/man3/curl_multi_remove_handle.3.gz
 man/man3/curl_multi_setopt.3.gz
 man/man3/curl_multi_socket.3.gz