From patchwork Mon Sep 15 15:47:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9083 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4cQTtw4PRZz3x6k for ; Mon, 15 Sep 2025 15:47:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cQTtv4R2Cz3xC for ; Mon, 15 Sep 2025 15:47:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cQTtv0TWxz32lV for ; Mon, 15 Sep 2025 15:47:35 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cQTtr2tQhz32Vl for ; Mon, 15 Sep 2025 15:47:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cQTtr1HGqzm7; Mon, 15 Sep 2025 15:47:32 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757951252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ljVXCzlgVwit2gy7C3U7rVccUHrlQO2U2+g0rTM47ks=; b=/iv8ps01VeHgbUIVmHVQL7XYU0MgkzXf4Oal2TvbNGN2D+cFvKhe17tTULrB8Le5MaNVBI 3LM/a3H69gZ5pdBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757951252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ljVXCzlgVwit2gy7C3U7rVccUHrlQO2U2+g0rTM47ks=; b=tfzEz8P+fuCl2OVcqhAVh3MUYF9PrCvGyesCo3h8YK71ogEHwT1rW4Gh++YUfu+nOG4SqS FvjKSPsFOZOpr3fobfLYB/ovWar0iFga84DAqHNSAzna07i2nKgcaO1LDQFtMkcV/vj0ql JcElcckqga8hZeYkk2CNrOvfVyL7f6eCQlo5hep5AN9Z+NDfd/CSdoD6NtoHQbXJAT9TBF ASHB7pV7w7amikDBK1K2x00b4urlljTF3jXM+eaBGPdilDXzSL/Uhvnkw1/MwlJYcm0gcy eH885m/Df9NdQ0h5vZnvfK+69E+0BbM574g6iBqPVzcaoMG7KhDmjPCQvT419Q== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka 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 Message-ID: <20250915154727.2630616-3-adolf.belka@ipfire.org> In-Reply-To: <20250915154727.2630616-1-adolf.belka@ipfire.org> References: <20250915154727.2630616-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 --- 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 HttpHeaders; + std::string HTTPProxyAuth; + std::string HTTPProxy; +- curl_proxytype HTTPProxyType; ++ long HTTPProxyType; + bool UseHttp10 = false; + bool Quiet = false; + int TimeOutSeconds = 0;