From c58b209f33ea0dc6cbc412c8ef1c284c842bfc6e Mon Sep 17 00:00:00 2001
From: rgaudin <reg@rskg.org>
Date: Wed, 16 Oct 2024 09:42:03 +0000
Subject: [PATCH 1/3] Download libcurl patches from dev.kiwix.org

---
 kiwixbuild/dependencies/libcurl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwixbuild/dependencies/libcurl.py b/kiwixbuild/dependencies/libcurl.py
index 9044259b..1faa1a65 100644
--- a/kiwixbuild/dependencies/libcurl.py
+++ b/kiwixbuild/dependencies/libcurl.py
@@ -23,7 +23,7 @@ class Source(ReleaseDownload):
         meson_archive = Remotefile(
             "curl_8.4.0-2_patch.zip",
             "bbb6ae75225c36ef9bb336cface729794c7c070c623a003fff40bd416042ff6e",
-            "https://public.kymeria.fr/KIWIX/curl_8.4.0-2_patch.zip",
+            "https://dev.kiwix.org/libkiwix/curl_8.4.0-2_patch.zip",
         )
         archives = [src_archive, meson_archive]
 

From 74767e6234dc4a2b8f5ce2303bb49e9dfe76eac0 Mon Sep 17 00:00:00 2001
From: rgaudin <reg@rskg.org>
Date: Wed, 16 Oct 2024 09:52:17 +0000
Subject: [PATCH 2/3] Disable libpsl when compiling libcurl

libpsl is a lib that provides the Public Suffix List: the list
of all TLDs.
It's an optional feature of libcurl that we dont need for libkiwix.

Leaving it included causes issues when compiling for apple_all_static
on x86_64 as libpsf is installed (and thus found by libcurl's configure)
but is obviously only for x86_64.

An alternative could be to either cross-compile it first and properly
reference that version.

That sounds like too much effort for a feature we know we dont need.

https://github.com/rockdaboot/libpsl
---
 kiwixbuild/dependencies/libcurl.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kiwixbuild/dependencies/libcurl.py b/kiwixbuild/dependencies/libcurl.py
index 1faa1a65..b613593f 100644
--- a/kiwixbuild/dependencies/libcurl.py
+++ b/kiwixbuild/dependencies/libcurl.py
@@ -32,6 +32,7 @@ class Builder(MesonBuilder):
         configure_options = [
             f"-D{p}=disabled"
             for p in (
+                "psl",
                 "ssh",
                 "ssl",
                 "rtmp",

From 59778f4452bac7a09438b99374c8ab8f1a34a883 Mon Sep 17 00:00:00 2001
From: rgaudin <reg@rskg.org>
Date: Thu, 17 Oct 2024 10:50:39 +0000
Subject: [PATCH 3/3] Disable GSS-API (via Kerberos which uses it) in libcurl
 compile

---
 kiwixbuild/dependencies/libcurl.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kiwixbuild/dependencies/libcurl.py b/kiwixbuild/dependencies/libcurl.py
index b613593f..691fb7e4 100644
--- a/kiwixbuild/dependencies/libcurl.py
+++ b/kiwixbuild/dependencies/libcurl.py
@@ -33,6 +33,8 @@ class Builder(MesonBuilder):
             f"-D{p}=disabled"
             for p in (
                 "psl",
+                "kerberos-auth",
+                "gss-api",
                 "ssh",
                 "ssl",
                 "rtmp",