Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 51 insertions, 0 deletions

diff --git a/filesystems/httpdirfs/files/patch-curl b/filesystems/httpdirfs/files/patch-curl
new file mode 100644
index 000000000000..6b888715536d
--- /dev/null
+++ b/filesystems/httpdirfs/files/patch-curl
@@ -0,0 +1,51 @@
+--- src/link.c.orig	2024-11-01 20:22:40 UTC
++++ src/link.c
+@@ -66,14 +66,14 @@ static CURL *Link_to_curl(Link *link)
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+-    ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
++    ret = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+     /*
+      * for following directories without the '/'
+      */
+-    ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2);
++    ret = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 2L);
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+@@ -81,11 +81,11 @@ static CURL *Link_to_curl(Link *link)
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+-    ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1);
++    ret = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L);
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+-    ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
++    ret = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15L);
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }
+@@ -118,7 +118,7 @@ static CURL *Link_to_curl(Link *link)
+         }
+     }
+     if (CONFIG.insecure_tls) {
+-        ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
++        ret = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+         if (ret) {
+             lprintf(error, "%s", curl_easy_strerror(ret));
+         }
+@@ -197,7 +197,7 @@ static void Link_req_file_stat(Link *this_link)
+ {
+     lprintf(debug, "%s\n", this_link->f_url);
+     CURL *curl = Link_to_curl(this_link);
+-    CURLcode ret = curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
++    CURLcode ret = curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+     if (ret) {
+         lprintf(error, "%s", curl_easy_strerror(ret));
+     }