4 files changed, 15 insertions, 61 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 9eedca6663c8..577d03b57cba 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.73.0
+PORTVERSION=	7.74.0
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 
 CPE_VENDOR=	haxx
 
-DOCS=		FAQ FEATURES INSTALL KNOWN_BUGS MAIL-ETIQUETTE THANKS TODO options-in-versions
+DOCS=		FAQ FEATURES.md INSTALL KNOWN_BUGS MAIL-ETIQUETTE THANKS TODO options-in-versions
 
 SHEBANG_FILES=	*/*.pl
 
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 418ab40bdc48..bfe3ed95340a 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602780726
-SHA256 (curl-7.73.0.tar.xz) = 7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a
-SIZE (curl-7.73.0.tar.xz) = 2394228
+TIMESTAMP = 1607719479
+SHA256 (curl-7.74.0.tar.xz) = 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b
+SIZE (curl-7.74.0.tar.xz) = 2400972
diff --git a/ftp/curl/files/patch-lib-vtls-openssl.c b/ftp/curl/files/patch-lib-vtls-openssl.c
deleted file mode 100644
index 80b60149483f..000000000000
--- a/ftp/curl/files/patch-lib-vtls-openssl.c
+++ /dev/null
@@ -1,55 +0,0 @@
-Obtained from:	https://github.com/curl/curl/commit/a3d5b199f96a108f38bd1f6adaf3a7585f721d02
-
---- lib/vtls/openssl.c.orig
-+++ lib/vtls/openssl.c
-@@ -225,6 +225,14 @@
-   "ALL:!EXPORT:!EXPORT40:!EXPORT56:!aNULL:!LOW:!RC4:@STRENGTH"
- #endif
- 
-+#ifdef HAVE_OPENSSL_SRP
-+/* the function exists */
-+#ifdef USE_TLS_SRP
-+/* the functionality is not disabled */
-+#define USE_OPENSSL_SRP
-+#endif
-+#endif
-+
- struct ssl_backend_data {
-   /* these ones requires specific SSL-types */
-   SSL_CTX* ctx;
-@@ -2471,7 +2479,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
- #endif
- #endif
-   const long int ssl_version = SSL_CONN_CONFIG(version);
--#ifdef HAVE_OPENSSL_SRP
-+#ifdef USE_OPENSSL_SRP
-   const enum CURL_TLSAUTH ssl_authtype = SSL_SET_OPTION(authtype);
- #endif
-   char * const ssl_cert = SSL_SET_OPTION(primary.clientcert);
-@@ -2516,7 +2524,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
-     failf(data, OSSL_PACKAGE " was built without SSLv2 support");
-     return CURLE_NOT_BUILT_IN;
- #else
--#ifdef HAVE_OPENSSL_SRP
-+#ifdef USE_OPENSSL_SRP
-     if(ssl_authtype == CURL_TLSAUTH_SRP)
-       return CURLE_SSL_CONNECT_ERROR;
- #endif
-@@ -2529,7 +2537,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
-     failf(data, OSSL_PACKAGE " was built without SSLv3 support");
-     return CURLE_NOT_BUILT_IN;
- #else
--#ifdef HAVE_OPENSSL_SRP
-+#ifdef USE_OPENSSL_SRP
-     if(ssl_authtype == CURL_TLSAUTH_SRP)
-       return CURLE_SSL_CONNECT_ERROR;
- #endif
-@@ -2797,7 +2805,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
-   }
- #endif
- 
--#ifdef HAVE_OPENSSL_SRP
-+#ifdef USE_OPENSSL_SRP
-   if(ssl_authtype == CURL_TLSAUTH_SRP) {
-     char * const ssl_username = SSL_SET_OPTION(username);
- 
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 5977f3143eae..027148e8ab4e 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -175,6 +175,12 @@ man/man3/CURLOPT_HEADER.3.gz
 man/man3/CURLOPT_HEADERDATA.3.gz
 man/man3/CURLOPT_HEADERFUNCTION.3.gz
 man/man3/CURLOPT_HEADEROPT.3.gz
+man/man3/CURLOPT_HSTS.3.gz
+man/man3/CURLOPT_HSTSREADDATA.3.gz
+man/man3/CURLOPT_HSTSREADFUNCTION.3.gz
+man/man3/CURLOPT_HSTSWRITEDATA.3.gz
+man/man3/CURLOPT_HSTSWRITEFUNCTION.3.gz
+man/man3/CURLOPT_HSTS_CTRL.3.gz
 man/man3/CURLOPT_HTTP09_ALLOWED.3.gz
 man/man3/CURLOPT_HTTP200ALIASES.3.gz
 man/man3/CURLOPT_HTTPAUTH.3.gz
@@ -480,10 +486,11 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/ECH.md
 %%PORTDOCS%%%%DOCSDIR%%/EXPERIMENTAL.md
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES.md
 %%PORTDOCS%%%%DOCSDIR%%/GOVERNANCE.md
 %%PORTDOCS%%%%DOCSDIR%%/HELP-US.md
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY.md
+%%PORTDOCS%%%%DOCSDIR%%/HSTS.md
 %%PORTDOCS%%%%DOCSDIR%%/HTTP-COOKIES.md
 %%PORTDOCS%%%%DOCSDIR%%/HTTP2.md
 %%PORTDOCS%%%%DOCSDIR%%/HTTP3.md
@@ -493,6 +500,7 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 %%PORTDOCS%%%%DOCSDIR%%/MAIL-ETIQUETTE
 %%PORTDOCS%%%%DOCSDIR%%/MQTT.md
+%%PORTDOCS%%%%DOCSDIR%%/NEW-PROTOCOL.md
 %%PORTDOCS%%%%DOCSDIR%%/PARALLEL-TRANSFERS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE-PROCEDURE.md
@@ -552,6 +560,7 @@ share/aclocal/libcurl.m4
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http3-present.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput-postfields.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap-append.c