aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2019-05-26 09:36:43 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2019-05-26 09:36:43 +0000
commitf9165a4f2bb2f86c5b381ffa263f8ac35d69756b (patch)
treef59b985379b219864218ae4dcefb563bc2770ec9
parent8cd766b2dfd429e595f4b199f816d3579c3e8c33 (diff)
downloadports-f9165a4f2bb2f86c5b381ffa263f8ac35d69756b.tar.gz
ports-f9165a4f2bb2f86c5b381ffa263f8ac35d69756b.zip
MFH: r502638
Update to 7.65.0 Changes: https://curl.haxx.se/changes.html Security: dd343a2b-7ee7-11e9-a290-8ddc52868fa9 Approved by: ports-secteam (joneum)
Notes
Notes: svn path=/branches/2019Q2/; revision=502705
-rw-r--r--ftp/curl/Makefile3
-rw-r--r--ftp/curl/distinfo6
-rw-r--r--ftp/curl/files/patch-lib-cookie.c19
-rw-r--r--ftp/curl/files/patch-lib-url.c16
-rw-r--r--ftp/curl/pkg-plist1
5 files changed, 13 insertions, 32 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index cf69ede606af..bd920febed98 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= curl
-PORTVERSION= 7.64.1
-PORTREVISION= 1
+PORTVERSION= 7.65.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 2e2eb3e2ad66..246e49e6080d 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553765263
-SHA256 (curl-7.64.1.tar.xz) = 9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3
-SIZE (curl-7.64.1.tar.xz) = 2385360
+TIMESTAMP = 1558782813
+SHA256 (curl-7.65.0.tar.xz) = 7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd
+SIZE (curl-7.65.0.tar.xz) = 2392324
diff --git a/ftp/curl/files/patch-lib-cookie.c b/ftp/curl/files/patch-lib-cookie.c
deleted file mode 100644
index a854fd95fe31..000000000000
--- a/ftp/curl/files/patch-lib-cookie.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/cookie.c.orig 2019-03-25 08:42:50 UTC
-+++ lib/cookie.c
-@@ -1085,6 +1085,8 @@ Curl_cookie_add(struct Curl_easy *data,
- return co;
- }
-
-+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_COOKIES */
-+
- /*
- * get_line() makes sure to only return complete whole lines that fit in 'len'
- * bytes and end with a newline.
-@@ -1112,6 +1114,7 @@ char *Curl_get_line(char *buf, int len,
- return NULL;
- }
-
-+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
-
- /*****************************************************************************
- *
diff --git a/ftp/curl/files/patch-lib-url.c b/ftp/curl/files/patch-lib-url.c
index f58cbde71101..770a9ca50b38 100644
--- a/ftp/curl/files/patch-lib-url.c
+++ b/ftp/curl/files/patch-lib-url.c
@@ -3,16 +3,16 @@ Forwarded: not-needed
Author: Peter Pentchev <roam@FreeBSD.org>
Last-Update: 2010-12-18
---- lib/url.c.orig 2019-02-05 14:00:12 UTC
+--- lib/url.c.orig 2019-05-21 17:57:39 UTC
+++ lib/url.c
-@@ -536,6 +536,10 @@ CURLcode Curl_init_userdefined(struct Cu
- set->fnmatch = ZERO_NULL;
- set->upkeep_interval_ms = CURL_UPKEEP_INTERVAL_DEFAULT;
- set->maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */
+@@ -552,6 +552,10 @@ CURLcode Curl_init_userdefined(struct Cu
+ CURL_HTTP_VERSION_1_1
+ #endif
+ ;
+#if defined(__FreeBSD_version)
+ /* different handling of signals and threads */
+ set->no_signal = TRUE;
+#endif
- set->http09_allowed = TRUE;
- set->httpversion =
- #ifdef USE_NGHTTP2
+ Curl_http2_init_userset(set);
+ return result;
+ }
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index ebe131fd352c..7da9b3d149e7 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -201,6 +201,7 @@ man/man3/CURLOPT_LOW_SPEED_TIME.3.gz
man/man3/CURLOPT_MAIL_AUTH.3.gz
man/man3/CURLOPT_MAIL_FROM.3.gz
man/man3/CURLOPT_MAIL_RCPT.3.gz
+man/man3/CURLOPT_MAXAGE_CONN.3.gz
man/man3/CURLOPT_MAXCONNECTS.3.gz
man/man3/CURLOPT_MAXFILESIZE.3.gz
man/man3/CURLOPT_MAXFILESIZE_LARGE.3.gz