MFH: r552448 r552670 r553854 r557488 r557987

Update to 7.74.0

Changes:	https://curl.se/changes.html
PR:		251773
Submitted by:	lwhsu
Security:	3c77f139-3a09-11eb-929d-d4c9ef517024

4 files changed, 37 insertions, 17 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 4beb514eafb5..577d03b57cba 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	curl
-PORTVERSION=	7.72.0
+PORTVERSION=	7.74.0
 CATEGORIES=	ftp net www
 MASTER_SITES=	https://curl.haxx.se/download/ \
 		LOCAL/sunpoet
@@ -28,12 +28,11 @@ USE_LDCONFIG=	yes
 
 CPE_VENDOR=	haxx
 
-DOCS=		BUGS FAQ FEATURES INSTALL KNOWN_BUGS MAIL-ETIQUETTE RESOURCES \
-		THANKS TODO TheArtOfHttpScripting options-in-versions
+DOCS=		FAQ FEATURES.md INSTALL KNOWN_BUGS MAIL-ETIQUETTE THANKS TODO options-in-versions
 
 SHEBANG_FILES=	*/*.pl
 
-OPTIONS_DEFINE=	ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP
+OPTIONS_DEFINE=	ALTSVC BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK NTLM PROXY PSL TLS_SRP ZSTD
 OPTIONS_GROUP=	PROTOCOL
 OPTIONS_RADIO=	SSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
@@ -137,6 +136,8 @@ THREADED_RESOLVER_CONFIGURE_ENABLE=	pthreads threaded-resolver
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	wolfssl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
+ZSTD_CONFIGURE_WITH=	zstd
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.pre.mk>
 
@@ -152,6 +153,12 @@ IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 IGNORE=		only supports LDAPS with SSL
 .endif
 
+.if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/lib/libkrb5support.so)
+BROKEN=		The GSSAPI_BASE option is selected, but you have krb5 installed. \
+		This is incompatible. In order to build, either select GSSAPI_MIT, \
+		or temporarily deinstall krb5 to build curl, or build in poudriere
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
@@ -167,6 +174,6 @@ post-install-DOCS-on:
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README.md Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.post.mk>
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 7b4402397299..bfe3ed95340a 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597852382
-SHA256 (curl-7.72.0.tar.xz) = 0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713
-SIZE (curl-7.72.0.tar.xz) = 2390040
+TIMESTAMP = 1607719479
+SHA256 (curl-7.74.0.tar.xz) = 999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b
+SIZE (curl-7.74.0.tar.xz) = 2400972
diff --git a/ftp/curl/pkg-descr b/ftp/curl/pkg-descr
index 7cbc20253764..df7e49ed9dad 100644
--- a/ftp/curl/pkg-descr
+++ b/ftp/curl/pkg-descr
@@ -10,4 +10,4 @@ form based upload, proxies, HTTP/2, cookies, user+password authentication
 (Basic, Plain, Digest, CRAM-MD5, NTLM, Negotiate and Kerberos), file transfer
 resume, proxy tunneling and more.
 
-WWW: https://curl.haxx.se/
+WWW: https://curl.se/
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 56c1965893c7..027148e8ab4e 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -5,6 +5,7 @@ include/curl/curlver.h
 include/curl/easy.h
 include/curl/mprintf.h
 include/curl/multi.h
+include/curl/options.h
 include/curl/stdcheaders.h
 include/curl/system.h
 include/curl/typecheck-gcc.h
@@ -12,7 +13,7 @@ include/curl/urlapi.h
 lib/libcurl.a
 lib/libcurl.so
 lib/libcurl.so.4
-lib/libcurl.so.4.6.0
+lib/libcurl.so.4.7.0
 libdata/pkgconfig/libcurl.pc
 man/man1/curl-config.1.gz
 man/man1/curl.1.gz
@@ -52,6 +53,7 @@ man/man3/CURLINFO_PRIMARY_PORT.3.gz
 man/man3/CURLINFO_PRIVATE.3.gz
 man/man3/CURLINFO_PROTOCOL.3.gz
 man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
+man/man3/CURLINFO_PROXY_ERROR.3.gz
 man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3.gz
 man/man3/CURLINFO_REDIRECT_COUNT.3.gz
 man/man3/CURLINFO_REDIRECT_TIME.3.gz
@@ -173,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
@@ -324,6 +332,7 @@ man/man3/CURLOPT_SSLVERSION.3.gz
 man/man3/CURLOPT_SSL_CIPHER_LIST.3.gz
 man/man3/CURLOPT_SSL_CTX_DATA.3.gz
 man/man3/CURLOPT_SSL_CTX_FUNCTION.3.gz
+man/man3/CURLOPT_SSL_EC_CURVES.3.gz
 man/man3/CURLOPT_SSL_ENABLE_ALPN.3.gz
 man/man3/CURLOPT_SSL_ENABLE_NPN.3.gz
 man/man3/CURLOPT_SSL_FALSESTART.3.gz
@@ -380,6 +389,9 @@ man/man3/curl_easy_duphandle.3.gz
 man/man3/curl_easy_escape.3.gz
 man/man3/curl_easy_getinfo.3.gz
 man/man3/curl_easy_init.3.gz
+man/man3/curl_easy_option_by_id.3.gz
+man/man3/curl_easy_option_by_name.3.gz
+man/man3/curl_easy_option_next.3.gz
 man/man3/curl_easy_pause.3.gz
 man/man3/curl_easy_perform.3.gz
 man/man3/curl_easy_recv.3.gz
@@ -461,7 +473,7 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/ALTSVC.md
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS.md
 %%PORTDOCS%%%%DOCSDIR%%/BUG-BOUNTY.md
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.md
 %%PORTDOCS%%%%DOCSDIR%%/CHECKSRC.md
 %%PORTDOCS%%%%DOCSDIR%%/CIPHERS.md
 %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
@@ -471,13 +483,14 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/CURL-DISABLE.md
 %%PORTDOCS%%%%DOCSDIR%%/DEPRECATE.md
 %%PORTDOCS%%%%DOCSDIR%%/DYNBUF.md
-%%PORTDOCS%%%%DOCSDIR%%/ESNI.md
+%%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
@@ -485,20 +498,19 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS.md
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING.md
 %%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
-%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
 %%PORTDOCS%%%%DOCSDIR%%/ROADMAP.md
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY-PROCESS.md
 %%PORTDOCS%%%%DOCSDIR%%/SSL-PROBLEMS.md
 %%PORTDOCS%%%%DOCSDIR%%/SSLCERTS.md
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
+%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting.md
 %%PORTDOCS%%%%DOCSDIR%%/VERSIONS.md
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI.md
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
@@ -508,7 +520,7 @@ share/aclocal/libcurl.m4
 %%PORTDOCS%%%%DOCSDIR%%/options-in-versions
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/altsvc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
@@ -548,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