Skip to contentSkip to conversation

cmake: Backport a patch to build with curl 8.16.0

PATCH New Peter Kjellerstedt 1 participant 2 messages Sep 18, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cmake: Backport a patch to build with curl 8.16.0

Needed to build cmake and nativesdk-cmake (cmake-native is built without curl support).

---

The patch is in 4.0.4, but not in any 4.1.x release (yet). :P

 meta/recipes-devtools/cmake/cmake.inc         |  1 +
 ...d-using-undocumented-type-for-CURLOP.patch | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
meta/recipes-devtools/cmake/cmake.inc +1 -0
index cbeeb31520..b2d3d60ef9 100644
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \
 CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
+           file://0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch \
            "
 
 SRC_URI[sha256sum] = "81ee8170028865581a8e10eaf055afb620fa4baa0beb6387241241a975033508"
meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch new file +35 -0
new file mode 100644
index 0000000000..d04d0be795
@@ -0,0 +1,35 @@
+From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001
+From: Brad King <[email protected]>
+Date: Tue, 2 Sep 2025 11:41:10 -0400
+Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for
+ CURLOPT_PROXYTYPE values
+
+Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
+enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
+are integer literals instead of `enum curl_proxytype`.  It turns out
+that `curl_easy_setopt` has always expected a `long` anyway, and that
+`curl_proxytype` is not documented for public use.
+
+Fixes: #27178
+Signed-off-by: Peter Kjellerstedt <[email protected]>
+Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/commit/c8143074cf3954b1e169904eb9d843cfbe14acc3]
+---
+ Source/CTest/cmCTestCurl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
+index 7836f4b9c7..9113890b5a 100644
+--- a/Source/CTest/cmCTestCurl.h
++++ b/Source/CTest/cmCTestCurl.h
+@@ -52,7 +52,7 @@ private:
+   std::vector<std::string> HttpHeaders;
+   std::string HTTPProxyAuth;
+   std::string HTTPProxy;
+-  curl_proxytype HTTPProxyType;
++  long HTTPProxyType;
+   bool UseHttp10 = false;
+   bool Quiet = false;
+   int TimeOutSeconds = 0;
+-- 
+2.43.0
+
#1 lore raw

PATCH 2/2 curl: Update to 8.16.0

Release notes:
https://curl.se/changes.html#8_16_0

CVE: CVE-2025-9086
CVE: CVE-2025-10148

---
 meta/recipes-support/curl/{curl_8.15.0.bb => curl_8.16.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/curl/{curl_8.15.0.bb => curl_8.16.0.bb} (98%)
meta/recipes-support/curl/curl_8.16.0.bb renamed from meta/recipes-support/curl/curl_8.15.0.bb +1 -1
similarity index 98%
rename from meta/recipes-support/curl/curl_8.15.0.bb
rename to meta/recipes-support/curl/curl_8.16.0.bb
index 809aac8bec..c226670357 100644
@@ -20,7 +20,7 @@ SRC_URI:append:class-nativesdk = " \
            file://environment.d-curl.sh \
 "
 
-SRC_URI[sha256sum] = "6cd0a8a5b126ddfda61c94dc2c3fc53481ba7a35461cf7c5ab66aa9d6775b609"
+SRC_URI[sha256sum] = "40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d"
 
 # Curl has used many names over the years...
 CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"