git: 337741ed8e99 - main - sysutils/bacula-libs3: allow compilation with new curl

The branch main has been updated by dvl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=337741ed8e99319b0117424c9d31e89f5745b1a1

commit 337741ed8e99319b0117424c9d31e89f5745b1a1
Author:     Andrea Venturoli <freebsd@netfence.it>
AuthorDate: 2025-06-13 16:20:10 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2025-06-13 16:22:37 +0000

    sysutils/bacula-libs3: allow compilation with new curl
    
    PR:             287234
---
 sysutils/bacula-libs3/Makefile                  |  1 +
 sysutils/bacula-libs3/files/patch-src_request.c | 83 +++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/sysutils/bacula-libs3/Makefile b/sysutils/bacula-libs3/Makefile
index 7c27637030ce..d6a95873bcdf 100644
--- a/sysutils/bacula-libs3/Makefile
+++ b/sysutils/bacula-libs3/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bacula11-libs3
 PORTVERSION=	20200523
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.bacula.org/downloads/
 DISTNAME=	libs3-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/sysutils/bacula-libs3/files/patch-src_request.c b/sysutils/bacula-libs3/files/patch-src_request.c
new file mode 100644
index 000000000000..a30399bbc4c9
--- /dev/null
+++ b/sysutils/bacula-libs3/files/patch-src_request.c
@@ -0,0 +1,83 @@
+--- src/request.c.orig	2025-06-04 08:40:48 UTC
++++ src/request.c
+@@ -1189,16 +1189,16 @@ static S3Status setup_curl(Request *request,
+ 
+     // Ask curl to parse the Last-Modified header.  This is easier than
+     // parsing it ourselves.
+-    curl_easy_setopt_safe(CURLOPT_FILETIME, 1);
++    curl_easy_setopt_safe(CURLOPT_FILETIME, 1l);
+ 
+     // Curl docs suggest that this is necessary for multithreaded code.
+     // However, it also points out that DNS timeouts will not be honored
+     // during DNS lookup, which can be worked around by using the c-ares
+     // library, which we do not do yet.
+-    curl_easy_setopt_safe(CURLOPT_NOSIGNAL, 1);
++    curl_easy_setopt_safe(CURLOPT_NOSIGNAL, 1l);
+ 
+     // Turn off Curl's built-in progress meter
+-    curl_easy_setopt_safe(CURLOPT_NOPROGRESS, 1);
++    curl_easy_setopt_safe(CURLOPT_NOPROGRESS, 1l);
+ 
+     // xxx todo - support setting the proxy for Curl to use (can't use https
+     // for proxies though)
+@@ -1207,20 +1207,20 @@ static S3Status setup_curl(Request *request,
+ 
+     // I think this is useful - we don't need interactive performance, we need
+     // to complete large operations quickly
+-    curl_easy_setopt_safe(CURLOPT_TCP_NODELAY, 1);
++    curl_easy_setopt_safe(CURLOPT_TCP_NODELAY, 1l);
+ 
+     // Don't use Curl's 'netrc' feature
+     curl_easy_setopt_safe(CURLOPT_NETRC, CURL_NETRC_IGNORED);
+ 
+     // Don't verify S3's certificate unless S3_INIT_VERIFY_PEER is set.
+     // The request_context may be set to override this
+-    curl_easy_setopt_safe(CURLOPT_SSL_VERIFYPEER, verifyPeer);
++    curl_easy_setopt_safe(CURLOPT_SSL_VERIFYPEER, (long)verifyPeer);
+ 
+     // Follow any redirection directives that S3 sends
+-    curl_easy_setopt_safe(CURLOPT_FOLLOWLOCATION, 1);
++    curl_easy_setopt_safe(CURLOPT_FOLLOWLOCATION, 1l);
+ 
+     // A safety valve in case S3 goes bananas with redirects
+-    curl_easy_setopt_safe(CURLOPT_MAXREDIRS, 10);
++    curl_easy_setopt_safe(CURLOPT_MAXREDIRS, 10l);
+ 
+     // Set the User-Agent; maybe Amazon will track these?
+     curl_easy_setopt_safe(CURLOPT_USERAGENT, userAgentG);
+@@ -1229,12 +1229,12 @@ static S3Status setup_curl(Request *request,
+     // less than 1K per second for more than 15 seconds.
+     // xxx todo - make these configurable
+     // xxx todo - allow configurable max send and receive speed
+-    curl_easy_setopt_safe(CURLOPT_LOW_SPEED_LIMIT, 1024);
+-    curl_easy_setopt_safe(CURLOPT_LOW_SPEED_TIME, 15);
++    curl_easy_setopt_safe(CURLOPT_LOW_SPEED_LIMIT, 1024l);
++    curl_easy_setopt_safe(CURLOPT_LOW_SPEED_TIME, 15l);
+ 
+ 
+     if (params->timeoutMs > 0) {
+-        curl_easy_setopt_safe(CURLOPT_TIMEOUT_MS, params->timeoutMs);
++        curl_easy_setopt_safe(CURLOPT_TIMEOUT_MS, (long)params->timeoutMs);
+     }
+ 
+ 
+@@ -1293,16 +1293,16 @@ static S3Status setup_curl(Request *request,
+     // Set request type.
+     switch (params->httpRequestType) {
+     case HttpRequestTypeHEAD:
+-        curl_easy_setopt_safe(CURLOPT_NOBODY, 1);
++        curl_easy_setopt_safe(CURLOPT_NOBODY, 1l);
+         break;
+     case HttpRequestTypePOST:
+         curl_easy_setopt_safe(CURLOPT_CUSTOMREQUEST, "POST");
+-        curl_easy_setopt_safe(CURLOPT_UPLOAD, 1);
++        curl_easy_setopt_safe(CURLOPT_UPLOAD, 1l);
+         break;
+ 
+     case HttpRequestTypePUT:
+     case HttpRequestTypeCOPY:
+-        curl_easy_setopt_safe(CURLOPT_UPLOAD, 1);
++        curl_easy_setopt_safe(CURLOPT_UPLOAD, 1l);
+         break;
+     case HttpRequestTypeDELETE:
+         curl_easy_setopt_safe(CURLOPT_CUSTOMREQUEST, "DELETE");