diff options
| -rw-r--r-- | ftp/curl/Makefile | 3 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib-transfer.c | 25 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib-url.c | 23 | ||||
| -rw-r--r-- | ftp/curl/pkg-plist | 3 |
5 files changed, 7 insertions, 53 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 7ab60b3f3e2b..4222cd48af5d 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.74.0 -PORTREVISION= 1 +PORTVERSION= 7.75.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 bfe3ed95340a..87fed419665d 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607719479 -SHA256 (curl-7.74.0.tar.xz) = 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b -SIZE (curl-7.74.0.tar.xz) = 2400972 +TIMESTAMP = 1612519099 +SHA256 (curl-7.75.0.tar.xz) = fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675 +SIZE (curl-7.75.0.tar.xz) = 2418816 diff --git a/ftp/curl/files/patch-lib-transfer.c b/ftp/curl/files/patch-lib-transfer.c deleted file mode 100644 index 624255504bec..000000000000 --- a/ftp/curl/files/patch-lib-transfer.c +++ /dev/null @@ -1,25 +0,0 @@ -Obtained from: https://github.com/curl/curl/commit/0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 - ---- lib/transfer.c.orig 2020-12-08 08:14:13 UTC -+++ lib/transfer.c -@@ -1532,6 +1532,20 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) - Curl_hsts_loadcb(data, data->hsts); - } - -+ /* -+ * Set user-agent. Used for HTTP, but since we can attempt to tunnel -+ * basically anything through a http proxy we can't limit this based on -+ * protocol. -+ */ -+ if(data->set.str[STRING_USERAGENT]) { -+ Curl_safefree(data->state.aptr.uagent); -+ data->state.aptr.uagent = -+ aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]); -+ if(!data->state.aptr.uagent) -+ return CURLE_OUT_OF_MEMORY; -+ } -+ -+ data->req.headerbytecount = 0; - return result; - } - diff --git a/ftp/curl/files/patch-lib-url.c b/ftp/curl/files/patch-lib-url.c index e19a8d85ef00..6224c72f510a 100644 --- a/ftp/curl/files/patch-lib-url.c +++ b/ftp/curl/files/patch-lib-url.c @@ -1,5 +1,3 @@ -Obtained from: https://github.com/curl/curl/commit/0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 - Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> @@ -18,24 +16,3 @@ Last-Update: 2010-12-18 Curl_http2_init_userset(set); return result; } -@@ -3940,20 +3944,6 @@ CURLcode Curl_setup_conn(struct connectdata *conn, - lingering set from a previous invoke */ - conn->bits.proxy_connect_closed = FALSE; - #endif -- /* -- * Set user-agent. Used for HTTP, but since we can attempt to tunnel -- * basically anything through a http proxy we can't limit this based on -- * protocol. -- */ -- if(data->set.str[STRING_USERAGENT]) { -- Curl_safefree(data->state.aptr.uagent); -- data->state.aptr.uagent = -- aprintf("User-Agent: %s\r\n", data->set.str[STRING_USERAGENT]); -- if(!data->state.aptr.uagent) -- return CURLE_OUT_OF_MEMORY; -- } -- -- data->req.headerbytecount = 0; - - #ifdef CURL_DO_LINEEND_CONV - data->state.crlf_conversions = 0; /* reset CRLF conversion counter */ diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 027148e8ab4e..e9d2d0cb3b1c 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -107,6 +107,7 @@ man/man3/CURLOPT_ALTSVC.3.gz man/man3/CURLOPT_ALTSVC_CTRL.3.gz man/man3/CURLOPT_APPEND.3.gz man/man3/CURLOPT_AUTOREFERER.3.gz +man/man3/CURLOPT_AWS_SIGV4.3.gz man/man3/CURLOPT_BUFFERSIZE.3.gz man/man3/CURLOPT_CAINFO.3.gz man/man3/CURLOPT_CAPATH.3.gz @@ -494,6 +495,7 @@ share/aclocal/libcurl.m4 %%PORTDOCS%%%%DOCSDIR%%/HTTP-COOKIES.md %%PORTDOCS%%%%DOCSDIR%%/HTTP2.md %%PORTDOCS%%%%DOCSDIR%%/HTTP3.md +%%PORTDOCS%%%%DOCSDIR%%/HYPER.md %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/INTERNALS.md @@ -511,6 +513,7 @@ share/aclocal/libcurl.m4 %%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting.md +%%PORTDOCS%%%%DOCSDIR%%/URL-SYNTAX.md %%PORTDOCS%%%%DOCSDIR%%/VERSIONS.md %%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI.md %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4 |