From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH 3/3] cmake: Add patch to avoid using undocumented type for CURLOPT_PROXYTYPE values
Date: Mon, 15 Sep 2025 17:47:27 +0200 [thread overview]
Message-ID: <20250915154727.2630616-3-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20250915154727.2630616-1-adolf.belka@ipfire.org>
- Update of rootfile
- With the new update of curl changes were made to CURLOPT which resulted in cmake using
an undocumented type.
- This patch has been merged in the cmake git repo and will become available in version
cmake-4.1.2 so the patch will be able to be removed when that version is released
and updated in IPFire.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
config/rootfiles/common/cmake | 12 ++++++------
lfs/cmake | 1 +
...ocumented_type_for_CURLOPT_PROXYTYPE_values.patch | 11 +++++++++++
3 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch
diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake
index 50599f3fa..69b827b02 100644
--- a/config/rootfiles/common/cmake
+++ b/config/rootfiles/common/cmake
@@ -3191,12 +3191,12 @@
#usr/share/cmake-4.1/Modules/Platform/Android/abi-x86-GNU.cmake
#usr/share/cmake-4.1/Modules/Platform/Android/abi-x86_64-Clang.cmake
#usr/share/cmake-4.1/Modules/Platform/Android/abi-x86_64-GNU.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##_shared.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c##_static.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##_shared.cmake
-#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi##_static.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++_shared.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-c++_static.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
+#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl.cmake
#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
#usr/share/cmake-4.1/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
diff --git a/lfs/cmake b/lfs/cmake
index f88ddeb36..4722705dd 100644
--- a/lfs/cmake
+++ b/lfs/cmake
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch
cd $(DIR_APP) && ./bootstrap \
--prefix=/usr \
--mandir=/share/man \
diff --git a/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch b/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch
new file mode 100644
index 000000000..c4232705f
--- /dev/null
+++ b/src/patches/cmake-4.1.1_Avoid_using_undocumented_type_for_CURLOPT_PROXYTYPE_values.patch
@@ -0,0 +1,11 @@
+--- cmake-4.1.1/Source/CTest/cmCTestCurl.h.orig 2025-08-27 18:33:28.000000000 +0200
++++ cmake-4.1.1/Source/CTest/cmCTestCurl.h 2025-09-13 15:07:02.531027863 +0200
+@@ -52,7 +52,7 @@
+ 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.51.0
prev parent reply other threads:[~2025-09-15 15:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 15:47 [PATCH 1/3] curl: Update to version 8.16.0 Adolf Belka
2025-09-15 15:47 ` [PATCH 2/3] core198: Ship curl Adolf Belka
2025-09-15 15:47 ` Adolf Belka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250915154727.2630616-3-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox