Date: Mon, 6 Oct 2025 11:20:46 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 38e06eb697a7 - main - www/ulfius: Fix build with curl 8.16.0 Message-ID: <202510061120.596BKkSa075677@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=38e06eb697a75f6ffd75dddf05cd7b5740a35583 commit 38e06eb697a75f6ffd75dddf05cd7b5740a35583 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-10-06 10:13:15 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-10-06 10:13:15 +0000 www/ulfius: Fix build with curl 8.16.0 --- www/ulfius/files/patch-curl | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/www/ulfius/files/patch-curl b/www/ulfius/files/patch-curl new file mode 100644 index 000000000000..4ac46b8d32e6 --- /dev/null +++ b/www/ulfius/files/patch-curl @@ -0,0 +1,70 @@ +--- src/u_send_request.c.orig 2023-11-14 00:40:08 UTC ++++ src/u_send_request.c +@@ -386,7 +386,7 @@ int ulfius_send_http_streaming_request_max_header(cons + + // follow redirection if set + if (copy_request->follow_redirect) { +- if (curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting follow redirection option"); + ret = U_ERROR_LIBCURL; + break; +@@ -622,21 +622,21 @@ int ulfius_send_http_streaming_request_max_header(cons + + // Disable server certificate validation if needed + if (!copy_request->check_server_certificate) { +- if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0) != CURLE_OK || curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L) != CURLE_OK || curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (4)"); + ret = U_ERROR_LIBCURL; + break; + } + } else { + if (!(copy_request->check_server_certificate_flag & U_SSL_VERIFY_PEER)) { +- if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (5)"); + ret = U_ERROR_LIBCURL; + break; + } + } + if (!(copy_request->check_server_certificate_flag & U_SSL_VERIFY_HOSTNAME)) { +- if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (6)"); + ret = U_ERROR_LIBCURL; + break; +@@ -647,21 +647,21 @@ int ulfius_send_http_streaming_request_max_header(cons + #if LIBCURL_VERSION_NUM >= 0x073400 + // Disable proxy certificate validation if needed + if (!copy_request->check_proxy_certificate) { +- if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYPEER, 0) != CURLE_OK || curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYHOST, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYPEER, 0L) != CURLE_OK || curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYHOST, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (7)"); + ret = U_ERROR_LIBCURL; + break; + } + } else { + if (!(copy_request->check_proxy_certificate_flag & U_SSL_VERIFY_PEER)) { +- if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYPEER, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYPEER, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (8)"); + ret = U_ERROR_LIBCURL; + break; + } + } + if (!(copy_request->check_proxy_certificate_flag & U_SSL_VERIFY_HOSTNAME)) { +- if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYHOST, 0) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_PROXY_SSL_VERIFYHOST, 0L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl options (9)"); + ret = U_ERROR_LIBCURL; + break; +@@ -702,7 +702,7 @@ int ulfius_send_http_streaming_request_max_header(cons + } + } + +- if (curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1) != CURLE_OK) { ++ if (curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1L) != CURLE_OK) { + y_log_message(Y_LOG_LEVEL_ERROR, "Ulfius - Error setting libcurl CURLOPT_NOSIGNAL"); + ret = U_ERROR_LIBCURL; + break;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510061120.596BKkSa075677>