ftp/curl: Revert daabb39144

2026-03-27 03:13:43 +08:00
parent 62f0a08173
commit f9ce1e48dd
5 changed files with 793 additions and 731 deletions
@@ -1,11 +1,8 @@
 PORTNAME=	curl
-DISTVERSION=	8.19.0
+PORTVERSION=	8.17.0
 CATEGORIES=	ftp net www
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/curl-${DISTVERSION:S|.|_|g}/ \
-		https://curl.se/download/
-
-PATCH_SITES=	https://github.com/curl/curl/commit/
-PATCHFILES=	53a3b2114a9b0652bb464437d38f5c8abffc708d.patch:-p1
+MASTER_SITES=	https://curl.se/download/ \
+		https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/

 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line tool and library for transferring data with URLs
@@ -15,237 +12,166 @@ WWW=		https://curl.se/ \
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING

-TEST_DEPENDS=	stunnel>=0:security/stunnel
+USES=		cpe libtool localbase:ldflags perl5 shebangfix tar:xz
+USE_PERL5=	build

-USES=		cmake:testing cpe pathfix perl5 \
-		pkgconfig python:test shebangfix tar:xz
-CPE_VENDOR=	haxx
-USE_PERL5=	test
-SHEBANG_GLOB=	*.pl *.py
+CONFIGURE_ARGS=	--disable-unity \
+		--disable-werror \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-headers-api \
+		--enable-hsts \
+		--enable-http-auth \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		--enable-openssl-auto-load-config \
+		--enable-progress-meter \
+		--enable-ssls-export \
+		--with-ca-path=/etc/ssl/certs \
+		--with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \
+		--without-ca-bundle \
+		--without-fish-functions-dir
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} \
+		ac_cv_func_SSLv2_client_method=no
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	test
 USE_LDCONFIG=	yes

-CMAKE_TESTING_ON=	BUILD_TESTING \
-			CURL_TEST_BUNDLES
-CMAKE_TESTING_TARGET=	test-nonflaky
+CPE_VENDOR=	haxx

-CMAKE_ON=	CMAKE_BUILD_RPATH_USE_ORIGIN \
-		CMAKE_FIND_PACKAGE_PREFER_CONFIG \
-		USE_SSLS_EXPORT
-CMAKE_OFF=	BUILD_TESTING
-CMAKE_ARGS=	-DCMAKE_DEBUG_POSTFIX="" \
-		-DCURL_CA_BUNDLE=none \
-		-DCURL_CA_PATH=/etc/ssl/certs
+SHEBANG_FILES=	*/*.pl

-OPTIONS_DEFINE=	ALTSVC COOKIES DOCS DEBUG EXAMPLES FISH IDN IPV6 \
-		LIBBACKTRACE LIBUV MANPAGES NTLM PROXY PSL STATIC TLS_SRP ZSH
+OPTIONS_DEFINE=	ALTSVC COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 LIBUV NTLM PROXY PSL STATIC TLS_SRP
 OPTIONS_GROUP=	COMPRESSION PROTOCOL
-OPTIONS_GROUP_COMPRESSION=	BROTLI ZSTD
-OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 HTTP3 IMAP IPFS LDAP \
-		LDAPS LIBSSH LIBSSH2 MQTT POP3 RTSP SMB SMTP TELNET TFTP \
-		WEBSOCKETS
 OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL WOLFSSL
 OPTIONS_SINGLE=	GSSAPI RESOLV
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_MIT GSSAPI_NONE
+OPTIONS_GROUP_COMPRESSION=	BROTLI ZSTD
+OPTIONS_GROUP_PROTOCOL=	DICT FTP GOPHER HTTP HTTP2 IMAP IPFS LDAP LDAPS LIBSSH LIBSSH2 MQTT POP3 RTSP SMB SMTP TELNET TFTP WEBSOCKET
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL WOLFSSL
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_MIT GSSAPI_NONE # GSSAPI_BASE
 OPTIONS_SINGLE_RESOLV=	CARES THREADED_RESOLVER
-OPTIONS_EXCLUDE_FreeBSD_13=	GSSAPI_BASE OPENSSL
-OPTIONS_EXCLUDE_FreeBSD_14=	GSSAPI_BASE
-#OPTIONS_EXCLUDE=	${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
-OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES DICT FTP \
-		GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MANPAGES NTLM \
-		POP3 PROXY PSL RTSP SMTP STATIC TELNET TFTP \
-		THREADED_RESOLVER TLS_SRP WEBSOCKETS ZSH ZSTD
-OPTIONS_DEFAULT_FreeBSD_13=	GSSAPI_NONE GNUTLS
-OPTIONS_DEFAULT_FreeBSD_14=	GSSAPI_NONE OPENSSL
-OPTIONS_DEFAULT_FreeBSD_15=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} OPENSSL
-OPTIONS_DEFAULT_FreeBSD_16=	GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} OPENSSL
-OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
+OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES GSSAPI_NONE DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MQTT NTLM OPENSSL POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP WEBSOCKET ZSTD
 OPTIONS_SUB=	yes
-
 ALTSVC_DESC=	HTTP Alternative Services support
+COMPRESSION_DESC=	Compression methods
 COOKIES_DESC=	Cookies support
+CURL_DEBUG_DESC=cURL debug memory tracking
 DICT_DESC=	DICT (RFC 2229) support
 HTTP_DESC=	HTTP/HTTPS support
-HTTP3_DESC=	HTTP/3 protocol support via libngtcp2 (implies GnuTLS)
+HTTP2_DESC=	HTTP/2 support (requires HTTP)
+HTTP2_IMPLIES=	HTTP
 IMAP_DESC=	IMAP/IMAPS support
 IPFS_DESC=	IPFS support
-LIBBACKTRACE_DESC=	Enable TrackMemory (implies debug)
-LIBSSH_DESC=	SCP/SFTP support via libssh
-LIBSSH2_DESC=	SCP/SFTP support via libssh2
+LDAPS_IMPLIES=	LDAP
+LDAPS_DESC=	LDAP protocol over SSL support (requires GNUTLS/OPENSSL/WOLFSSL)
+LIBSSH_DESC=	SCP/SFTP support via libssh (requires OPENSSL)
+LIBSSH_IMPLIES=	OPENSSL
+LIBSSH2_DESC=	SCP/SFTP support via libssh2 (requires OPENSSL)
+LIBSSH2_IMPLIES=OPENSSL
 LIBUV_DESC=	Event-based tests
+LIBUV_IMPLIES=	DEBUG
 MQTT_DESC=	MQTT support
 POP3_DESC=	POP3/POP3S support
+PROTOCOL_DESC=	Transmission protocols
+PROXY_IMPLIES=	HTTP
 RESOLV_DESC=	DNS resolving options
+RTSP_IMPLIES=	HTTP
 SMB_DESC=	SMB/CIFS support
 SMTP_DESC=	SMTP/SMTPS support
 THREADED_RESOLVER_DESC=	Threaded DNS resolver
 TLS_SRP_DESC=	TLS-SRP (Secure Remote Password) support
-WEBSOCKETS_DESC=WebSocket support
-
-ALTSVC_CMAKE_BOOL_OFF=	CURL_DISABLE_ALTSVC
-ALTSVC_IMPLIES=		HTTP

+ALTSVC_CONFIGURE_ENABLE=alt-svc
+BROTLI_CONFIGURE_WITH=	brotli
 BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
-BROTLI_CMAKE_BOOL=	CURL_BROTLI
-
+CARES_CONFIGURE_ENABLE=	ares
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
-CARES_CMAKE_BOOL=	ENABLE_ARES
-
-COOKIES_CMAKE_BOOL_OFF=	CURL_DISABLE_COOKIES
-
-DEBUG_CMAKE_BOOL=	ENABLE_DEBUG
-
-DICT_CMAKE_BOOL_OFF=	CURL_DISABLE_DICT
-
-FISH_USE=		PERL5=build
-FISH_CMAKE_BOOL=	CURL_COMPLETION_FISH
-
-FTP_CMAKE_BOOL_OFF=	CURL_DISABLE_FTP
-
+CARES_USES=		pkgconfig
+COOKIES_CONFIGURE_ENABLE=	cookies
+CURL_DEBUG_CONFIGURE_ENABLE=	curldebug
+DEBUG_CONFIGURE_ENABLE=	debug
+DICT_CONFIGURE_ENABLE=	dict
+FTP_CONFIGURE_ENABLE=	ftp
+GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libnettle.so:security/nettle
-GNUTLS_CMAKE_BOOL=	CURL_USE_GNUTLS
-
-GOPHER_CMAKE_BOOL_OFF=	CURL_DISABLE_GOPHER
-
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_BASE_CMAKE_ON=	-DCURL_USE_GSSAPI:BOOL=ON \
-			-DGSS_ROOT_DIR:STRING=${GSSAPIBASEDIR}
-
+GOPHER_CONFIGURE_ENABLE=gopher
+#GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+#GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
+#GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
+#GSSAPI_BASE_LIBS=	${GSSAPILIBS}
+#GSSAPI_BASE_USES=	gssapi
+GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_CPPFLAGS=	${GSSAPICPPFLAGS}
+GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
+GSSAPI_MIT_LIBS=	${GSSAPILIBS}
 GSSAPI_MIT_USES=	gssapi:mit
-GSSAPI_MIT_CMAKE_ON=	-DCURL_USE_GSSAPI:BOOL=ON \
-			-DGSS_ROOT_DIR:STRING=${GSSAPIBASEDIR}
-
-HTTP_CMAKE_BOOL_OFF=	CURL_DISABLE_HTTP
-
+GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
+HTTP_CONFIGURE_ENABLE=	http
+HTTP2_CONFIGURE_WITH=	nghttp2
 HTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
-HTTP2_CMAKE_BOOL=	USE_NGHTTP2
-HTTP2_IMPLIES=		HTTP
-
-HTTP3_LIB_DEPENDS=	libnghttp3.so:www/libnghttp3 \
-			libngtcp2.so:net/libngtcp2
-HTTP3_CMAKE_BOOL=	USE_NGTCP2
-HTTP3_IMPLIES=		GNUTLS
-
+HTTP2_USES=		pkgconfig
+IDN_CONFIGURE_WITH=	libidn2
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
-IDN_CMAKE_BOOL=		USE_LIBIDN2
-
-IMAP_CMAKE_BOOL_OFF=	CURL_DISABLE_IMAP
-
-IPFS_CMAKE_BOOL_OFF=	CURL_DISABLE_IPFS
-IPFS_IMPLIES=		HTTP
-
-IPV6_CMAKE_BOOL=	ENABLE_IPV6
-
+IMAP_CONFIGURE_ENABLE=	imap
+IPFS_CONFIGURE_ENABLE=	ipfs
+IPV6_CONFIGURE_ENABLE=	ipv6
+LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USES=		ldap
-LDAP_CMAKE_BOOL_OFF=	CURL_DISABLE_LDAP
-
-LDAPS_CMAKE_BOOL_OFF=	CURL_DISABLE_LDAPS
-LDAPS_IMPLIES=		LDAP
-
-LIBBACKTRACE_LIB_DEPENDS=	libbacktrace.so:devel/libbacktrace
-LIBBACKTRACE_CMAKE_BOOL=	CURL_USE_LIBBACKTRACE
-LIBBACKTRACE_IMPLIES=	DEBUG
-
+LDAPS_CONFIGURE_ENABLE=	ldaps
+LIBSSH_CONFIGURE_WITH=	libssh
 LIBSSH_LIB_DEPENDS=	libssh.so:security/libssh
-LIBSSH_CMAKE_BOOL=	CURL_USE_LIBSSH
-
+LIBSSH2_CONFIGURE_WITH=	libssh2
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
-LIBSSH2_CMAKE_BOOL=	CURL_USE_LIBSSH2
-
+LIBUV_CONFIGURE_WITH=	libuv
 LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
-LIBUV_CMAKE_BOOL=	CURL_USE_LIBUV
-LIBUV_IMPLIES=		DEBUG
-
-MANPAGES_USE=		PERL5=build
-MANPAGES_CMAKE_BOOL=	BUILD_LIBCURL_DOCS \
-			BUILD_MISC_DOCS \
-			ENABLE_CURL_MANUAL
-
-MQTT_CMAKE_BOOL_OFF=	CURL_DISABLE_MQTT
-
-NTLM_CMAKE_BOOL_OFF=	CURL_DISABLE_NTLM
-
+MQTT_CONFIGURE_ENABLE=	mqtt
+NTLM_CONFIGURE_ENABLE=	ntlm
+OPENSSL_CONFIGURE_WITH=	openssl=${OPENSSLBASE}
+OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
+OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USES=		ssl
-OPENSSL_CMAKE_BOOL=	CURL_CA_FALLBACK \
-			CURL_USE_OPENSSL
-
-POP3_CMAKE_BOOL_OFF=	CURL_DISABLE_POP3
-
-PROXY_CMAKE_BOOL_OFF=	CURL_DISABLE_PROXY
-PROXY_IMPLIES=		HTTP
-
+POP3_CONFIGURE_ENABLE=	pop3
+PROXY_CONFIGURE_ENABLE=	proxy
+PSL_CONFIGURE_WITH=	libpsl
 PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
-PSL_CMAKE_BOOL=		CURL_USE_LIBPSL
-
-RTSP_CMAKE_BOOL_OFF=	CURL_DISABLE_RTSP
-RTSP_IMPLIES=		HTTP
-
-SMB_CMAKE_BOOL_OFF=	CURL_DISABLE_SMB
-
-SMTP_CMAKE_BOOL_OFF=	CURL_DISABLE_SMTP
-
-STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
-
-TELNET_CMAKE_BOOL_OFF=	CURL_DISABLE_TELNET
-
-TFTP_CMAKE_BOOL_OFF=	CURL_DISABLE_TFTP
-
-THREADED_RESOLVER_CMAKE_BOOL=	ENABLE_THREADED_RESOLVER
-
-TLS_SRP_CMAKE_BOOL_OFF=	CURL_DISABLE_SRP
-
-WEBSOCKETS_CMAKE_BOOL_OFF=	CURL_DISABLE_WEBSOCKETS
-WEBSOCKETS_IMPLIES=	HTTP
-
+RTSP_CONFIGURE_ENABLE=	rtsp
+SMB_CONFIGURE_ENABLE=	smb
+SMTP_CONFIGURE_ENABLE=	smtp
+STATIC_CONFIGURE_ENABLE=static
+TELNET_CONFIGURE_ENABLE=telnet
+TFTP_CONFIGURE_ENABLE=	tftp
+THREADED_RESOLVER_CONFIGURE_ENABLE=	threaded-resolver
+TLS_SRP_CONFIGURE_ENABLE=	tls-srp
+WEBSOCKET_CONFIGURE_ENABLE=	websockets
+WOLFSSL_CONFIGURE_WITH=	wolfssl
 WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
-WOLFSSL_CMAKE_BOOL=	CURL_USE_WOLFSSL
-
-ZSH_USE=		PERL5=build
-ZSH_CMAKE_BOOL=		CURL_COMPLETION_ZSH
-
+ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
-ZSTD_CMAKE_BOOL=	CURL_ZSTD

 .include <bsd.port.pre.mk>

-.if ${PORT_OPTIONS:MHTTP2}
-TEST_DEPENDS+=	nghttpx:www/nghttp2
-.endif
-
-.if !defined(WITH_DEBUG) && ${PORT_OPTIONS:MLIBBACKTRACE}
-IGNORE=		LIBBACKTRACE requires port to built with WITH_DEBUG enabled
-.endif
-
 .if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP}
-IGNORE=		only supports TLS-SRP with either GnuTLS or OpenSSL
+IGNORE=		only supports TLS-SRP with either OpenSSL or GnuTLS
 .endif

 .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL}
-IGNORE=		only supports LDAPS with GnuTLS/OpenSSL/wolfSSL
+IGNORE=		only supports LDAPS with GNUTLS/OPENSSL/WOLFSSL enabled
 .endif

-post-patch:
-	@${REINPLACE_CMD} -e 's|%%CMAKE_TESTING_JOBS%%|${CMAKE_TESTING_JOBS}|g' \
-	    ${PATCH_WRKSRC}/tests/CMakeLists.txt
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
-	# .cmake files are a bit broken so skip these for now and FindCURL is
-	# a part of CMake(-core) so we still provide suitable facilities
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/cmake

 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/internals/ ${STAGEDIR}${DOCSDIR}/libcurl/
-	(cd ${WRKSRC}/docs/ && ${INSTALL_DATA} INSTALL THANKS options-in-versions *.md ${STAGEDIR}${DOCSDIR}/)
+	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} FAQ INSTALL KNOWN_BUGS THANKS TODO options-in-versions *.md ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/docs/internals/*.md ${STAGEDIR}${DOCSDIR}/internals/
-	(cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI.md libcurl.m4 *.pl symbols-in-versions ${STAGEDIR}${DOCSDIR}/libcurl/)
+	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI.md libcurl.m4 *.pl symbols-in-versions ${STAGEDIR}${DOCSDIR}/libcurl/

 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	(cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} Makefile.example README.md *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/)
-
-post-install-MANPAGES-on:
-	${RM} ${STAGEDIR}${PREFIX}/share/man/man1/mk-ca-bundle.1
+	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} Makefile.example README.md *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/

 .include <bsd.port.post.mk>
@@ -1,5 +1,3 @@
-TIMESTAMP = 1773257259
-SHA256 (curl-8.19.0.tar.xz) = 4eb41489790d19e190d7ac7e18e82857cdd68af8f4e66b292ced562d333f11df
-SIZE (curl-8.19.0.tar.xz) = 2787584
-SHA256 (53a3b2114a9b0652bb464437d38f5c8abffc708d.patch) = 595a91d280b09073a6f25482cef162e792c65c7423d56ad21a7c2386d43dae55
-SIZE (53a3b2114a9b0652bb464437d38f5c8abffc708d.patch) = 6820
+TIMESTAMP = 1762586706
+SHA256 (curl-8.17.0.tar.xz) = 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992
+SIZE (curl-8.17.0.tar.xz) = 2797000
@@ -0,0 +1,154 @@
+--- configure.orig	2024-01-29 15:53:31 UTC
+++ configure
+@@ -4198,9 +4198,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be 
+       -I*)
+         xc_bad_var_ldflags=yes
+         ;;
+-      -l* | --library=*)
+-        xc_bad_var_ldflags=yes
+-        ;;
+# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
+#      -l* | --library=*)
+#        xc_bad_var_ldflags=yes
+#        ;;
+     esac
+   done
+   if test $xc_bad_var_ldflags = yes; then
+@@ -4270,9 +4271,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use 
+   xc_bad_var_cflags=no
+   for xc_word in $CFLAGS; do
+     case "$xc_word" in
+-      -D*)
+-        xc_bad_var_cflags=yes
+-        ;;
+# Temporarily disable -D* flag check (PR/177401, PR/180944)
+#      -D*)
+#        xc_bad_var_cflags=yes
+#        ;;
+       -U*)
+         xc_bad_var_cflags=yes
+         ;;
+@@ -17400,7 +17402,7 @@ printf "%s\n" "$as_me: WARNING: failed to figure out c
+   flags_dbg_yes="unknown"
+   flags_opt_all="unknown"
+   flags_opt_yes="unknown"
+-  flags_opt_off="unknown"
+  flags_opt_off=""
+   #
+   flags_prefer_cppflags="no"
+   #
+@@ -17505,7 +17507,7 @@ printf "%s\n" "yes" >&6; }
+     flags_dbg_yes="-g2"
+     flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
+     flags_opt_yes="-O1"
+-    flags_opt_off="-O0"
+    flags_opt_off=""
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -17566,7 +17568,7 @@ printf "%s\n" "yes" >&6; }
+     flags_dbg_yes="-g"
+     flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
+     flags_opt_yes="+O2"
+-    flags_opt_off="+O0"
+    flags_opt_off=""
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -17634,7 +17636,7 @@ printf "%s\n" "yes" >&6; }
+     flags_opt_all="$flags_opt_all -qoptimize=4"
+     flags_opt_all="$flags_opt_all -qoptimize=5"
+     flags_opt_yes="-O2"
+-    flags_opt_off="-qnooptimize"
+    flags_opt_off=""
+     flags_prefer_cppflags="yes"
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -17747,13 +17749,13 @@ rm -f conftest.err conftest.i conftest.$ac_ext
+       flags_dbg_yes="-g"
+       flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+       flags_opt_yes="-O2"
+-      flags_opt_off="-O0"
+      flags_opt_off=""
+     else
+       compiler_id="INTEL_WINDOWS_C"
+       flags_dbg_yes="/Zi /Oy-"
+       flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
+       flags_opt_yes="/O2"
+-      flags_opt_off="/Od"
+      flags_opt_off=""
+     fi
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -17905,7 +17907,7 @@ printf "%s\n" "clang '$compiler_num' (raw: '$fullclang
+     flags_dbg_yes="-g"
+     flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
+     flags_opt_yes="-O2"
+-    flags_opt_off="-O0"
+    flags_opt_off=""
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -17980,7 +17982,7 @@ printf "%s\n" "gcc '$compiler_num' (raw: '$gccver')" >
+     flags_dbg_yes="-g"
+     flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast"
+     flags_opt_yes="-O2"
+-    flags_opt_off="-O0"
+    flags_opt_off=""
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -18241,7 +18243,7 @@ printf "%s\n" "yes" >&6; }
+     flags_dbg_yes="-g"
+     flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
+     flags_opt_yes="-O2"
+-    flags_opt_off="-O0"
+    flags_opt_off=""
+   else
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+@@ -18822,6 +18824,8 @@ printf "%s\n" "$honor_optimize_option" >&6; }
+     #
+     if test "$honor_optimize_option" = "yes"; then
+ 
+# Do not remove the user-supplied optimization flags in CFLAGS/CPPFLAGS (PR/150854)
+if false; then
+     ac_var_stripped=""
+   for word1 in $tmp_CFLAGS; do
+     ac_var_strip_word="no"
+@@ -18852,6 +18856,7 @@ printf "%s\n" "$honor_optimize_option" >&6; }
+   done
+     tmp_CPPFLAGS="$ac_var_stripped"
+   squeeze tmp_CPPFLAGS
+fi
+ 
+       if test "$want_optimize" = "yes"; then
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
+@@ -45884,9 +45889,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be 
+       -I*)
+         xc_bad_var_ldflags=yes
+         ;;
+-      -l* | --library=*)
+-        xc_bad_var_ldflags=yes
+-        ;;
+# Temporarily disable -l* flag check for SSP support (Mk/bsd.ssp.mk)
+#      -l* | --library=*)
+#        xc_bad_var_ldflags=yes
+#        ;;
+     esac
+   done
+   if test $xc_bad_var_ldflags = yes; then
+@@ -45956,9 +45962,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use 
+   xc_bad_var_cflags=no
+   for xc_word in $CFLAGS; do
+     case "$xc_word" in
+-      -D*)
+-        xc_bad_var_cflags=yes
+-        ;;
+# Temporarily disable -D* flag check (PR/177401, PR/180944)
+#      -D*)
+#        xc_bad_var_cflags=yes
+#        ;;
+       -U*)
+         xc_bad_var_cflags=yes
+         ;;
@@ -1,11 +0,0 @@
--- tests/CMakeLists.txt.orig	2025-11-05 21:22:19 UTC
-+++ tests/CMakeLists.txt
-@@ -125,7 +125,7 @@ curl_add_runtests(test-full      "-a -p -r")
- curl_add_runtests(test-am        "-a -am")
- curl_add_runtests(test-full      "-a -p -r")
- # ~flaky means that it ignores results of tests using the flaky keyword
-curl_add_runtests(test-nonflaky  "-a -p ~flaky ~timing-dependent")
-+curl_add_runtests(test-nonflaky  "-a -p ~flaky ~timing-dependent -j%%CMAKE_TESTING_JOBS%%")
- curl_add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r --retry=5 -j20 --buildinfo")
- curl_add_runtests(test-torture   "-a -t -j20")
- curl_add_runtests(test-event     "-a -e")